Skip to content

Commit 4a25541

Browse files
author
Sam Kleinman
committed
merge: DOCS-839
2 parents 0b8866f + 4d45263 commit 4a25541

File tree

5 files changed

+49
-23
lines changed

5 files changed

+49
-23
lines changed

‎source/core/object-id.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ information on MongoDB's document orientation.
3636

3737
.. _core-object-id-class:
3838

39-
``ObjectId()``
40-
--------------
39+
ObjectId()
40+
----------
4141

4242
The :program:`mongo` shell provides the ``ObjectId()`` wrapper class
4343
to generate can generate a new ObjectId, and to provide the following

‎source/reference/method/cursor.readPref.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ cursor.readPref()
2727
``{ dc: 'ny', rack: 2 }``. Clients match tag sets first in the
2828
order they appear in the read preference specification. You may
2929
specify an empty tag set ``{}`` as the last element to default to
30-
any available secondary. See the:ref:`tag sets <replica-set-read-preference-tag-sets>`
30+
any available secondary. See the :ref:`tag sets <replica-set-read-preference-tag-sets>`
3131
documentation for more information.
3232

3333
.. note::

‎source/reference/method/db.currentOp.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ db.currentOp()
2222

2323
.. include:: /includes/example-filter-current-op.rst
2424

25-
.. warning:: /includes/warning-terminating-operations.rst
25+
.. include:: /includes/warning-terminating-operations.rst

‎themes/mongodb/layout.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,13 @@
100100
<div id="btnv">
101101
<ul id="btnvl">
102102
{%- if prev %}
103-
<li id="btnvpr"><a href="{{ prev.link|e }}" title="Previous Section: {{ prev.title|striptags|e }}">&larr; {{ prev.title|striptags|e }}</a></li>
103+
<li id="btnvpr"><a href="{{ prev.link|e }}" title="Previous Section: {{ prev.title|striptags|e }}">&lt; &nbsp; {{ prev.title|striptags|e }}</a></li>
104104
{%- endif %}
105105
{%- if parents %}
106-
<li id="btnvup"><a href="{{ parents[0].link|e }}" title="Parent Section: {{ parents[0].title|striptags|e }}" >&uarr; {{ parents[0].title|striptags|e }}</a></li>
106+
<li id="btnvup"><a href="{{ parents[0].link|e }}" title="Parent Section: {{ parents[0].title|striptags|e }}" >&#47;&#92;&nbsp; {{ parents[0].title|striptags|e }}</a></li>
107107
{%- endif %}
108108
{%- if next %}
109-
<li id="btnvnx"><a href="{{ next.link|e }}" title="Next Section: {{ next.title|striptags|e }}">{{ next.title|striptags|e }} &rarr;</a></li>
109+
<li id="btnvnx"><a href="{{ next.link|e }}" title="Next Section: {{ next.title|striptags|e }}">{{ next.title|striptags|e }} &nbsp;&gt;</a></li>
110110
{%- endif %}
111111
</ul>
112112
</div>

‎themes/mongodb/static/mongodb-docs.css_t

Lines changed: 42 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ div.body {
4747
}
4848

4949
div.body > div#cse-results + div.section {margin:0 1.5em;}
50+
div.body > div#cse-results + span.target + div.section {margin:0 1.5em;}
51+
div.body > div#cse-results + span.target + span.target+ div.section {margin:0 1.5em;}
5052

5153
div.footer {
5254
color:white;
@@ -201,7 +203,7 @@ div.body h1 + dl, div.body h2 + dl, div.body h3 + dl, div.body h4 + dl {padding
201203

202204
div.section h1 + p, div.section h2 + p, div.section h3 + p, div.section h4 + p,
203205
div.section h1 + ul, div.section h2 + ul, div.section h3 + ul, div.section h4 + ul,
204-
div.section h1 + dl, div.section h2 + dl, div.section h3 + dl, div.section h4 + dl {padding-top:0;margin-top:0ex;text-indent:0;}
206+
div.section h1 + dl, div.section h2 + dl, div.section h3 + dl, div.section h4 + dl {padding-top:0;margin-top:1.05em;text-indent:0;}
205207

206208
a.headerlink {
207209
color: #c60f0f;
@@ -219,7 +221,7 @@ div.body p, div.body dd {
219221
line-height: 1.8;
220222
}
221223

222-
div.body li{line-height:1.55em;}
224+
div.body li{line-height: 1.4em;}
223225

224226
div.admonition p.admonition-title + p {
225227
display: inline;
@@ -240,34 +242,37 @@ div.topic {
240242
div.admonition {
241243
margin:1.5em auto;
242244
width:auto;
243-
max-width:80%;
245+
max-width:90%;
244246
padding:0;
245247
}
246248

247249

248250
div.warning {
249-
background-color: #ffff66;
251+
background-color: #FEEFB3;
250252
padding:1ex;
251253
}
252254

253-
254255
div.note {
255256
background-color: inherit;
257+
border: 1px solid #DCDCDC;
258+
padding:1ex;
256259
}
257260

258261
div.seealso {
259262
padding-bottom: 7px;
263+
max-width:95%;
260264
}
261265

262266
div.admonition-optional {
263-
background-color: #ffffee;
264-
color: #666666;
265-
margin: 10px 25px;
267+
background-color: inherit;
268+
border: 1px solid #DCDCDC;
269+
padding:1ex;
266270
}
267271

268272
div.admonition-example {
269-
background-color: #ecf0f3;
273+
background-color: #eff0f3;
270274
color: #000000;
275+
padding:1ex;
271276
}
272277

273278
div.admonition p.admonition-title {display:inline; font-weight:900;height:100%;}
@@ -291,11 +296,14 @@ pre {
291296
}
292297

293298
tt {
294-
background-color: #ecf0f3;
299+
background-color: #eff0f3;
295300
color: #000;
296301
font-family: "Courier New", Courier, monospace;
297302
}
298303

304+
a>tt {
305+
color: #005B81;
306+
}
299307
.viewcode-back {
300308
font-family: helvetica,arial,sans-serif;
301309
}
@@ -332,6 +340,13 @@ div.highlight-javascript>div.highlight>pre>span.hll>span.nx {
332340
font-weight: bold;
333341
}
334342

343+
table.footnote {
344+
font-size: 0.95em;
345+
line-height: 1.3em;
346+
}
347+
348+
349+
335350
/* No Longer just Specific to the SQL to ... Mapping pages -- Begin */
336351

337352
div td pre {
@@ -697,7 +712,14 @@ div#etp ul li:first-child:before {content:"";}
697712
input.gsc-input {background:none;background-color: #4c3a2c;}
698713
a.reference em {font-style:normal;}
699714

700-
tt,tt span.pre {font-family:"Courier New", "Courier",monospace; ;}
715+
tt,tt span.pre {
716+
font-family:"Courier New", Courier, monospace;
717+
font-weight: bold;
718+
font-size: 0.98em;
719+
}
720+
tt.descname {
721+
font-size: 1.15em;
722+
}
701723
div.section > h1 + dl.dbcommand > dt {display:none;}
702724
div.section {cursor:default;}
703725

@@ -717,8 +739,9 @@ header: http://media.mongodb.org/back-header.png
717739
/* div.body * {font-size:12pt;font-family:Helvetica,Arial,Sans-Serif;font-weight:normal;line-height:1.0;} */
718740

719741
/* div.body p {line-height:1.6875;} */
720-
div.body p {line-height:1.55em;}
721-
div.highlight pre {background-color: #ecf0f3;}
742+
div.body p {line-height:1.4em;}
743+
div.body li>p { line-height:1.4em;}
744+
div.highlight pre {background-color: #eff0f3;}
722745

723746
div.section > h2, div.section > h3,div.section > h4 {margin-top:0;padding-top:0;line-height:1.77}
724747
/* div.admonition p {line-height:1.6875} */
@@ -728,7 +751,7 @@ dd > div.admonition {margin-left:0;}
728751
p > div.admonition {margin-left:0;}
729752
li > div.admonition {margin-left:0;}
730753

731-
div#btnv {padding-top:3em;}
754+
div#btnv {padding-top:3em;padding-bottom:3em;}
732755
div#btnv ul#btnvl {display:block;width:auto;margin:auto;;text-align:center;}
733756
/* div#btnv ul#btnvl li {border-top:solid 1pt #402817;} div#btnv ul#btnvl li {border-bottom:solid 1pt #402817;} */
734757
div#btnv ul#btnvl li {display:inline;list-item-style:none;font-size:100%;padding:1em; width:33%;margin:0;}
@@ -740,6 +763,9 @@ div.body > div.section > div.section {margin-left:0;margin-top:2em;}
740763
div.body > div.section > div.section div.section {margin-left:2pc;margin-right:2pc;}
741764
/* div.section h2 {line-height:1; margin-bottom: 0.3;} */
742765

743-
table.docutils {margin:auto}
766+
table.docutils {margin-top: 1.1em;margin-bottom: 1.1em; }
744767
table.docutils tbody tr td div.highlight pre {background-color:inherit;}
745-
table.docutils > div.admonition-example {background-color:inherit;}
768+
table.docutils > div.admonition-example {background-color:inherit;}
769+
770+
/* somehow, powershell commands starting with a directory reference does not include a div.highlight */
771+
div.highlight-powershell pre {background-color: #eff0f3;}

0 commit comments

Comments
 (0)