aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-06-09 12:58:55 -0700
committerMark Otto <[email protected]>2012-06-09 12:58:55 -0700
commitaff3694f28946a0640f15dc07591dbfb332fcbaf (patch)
tree9c9ea31814e5101b3b0c368780103b944034d9aa
parent550e375af08a5b6ad401c043f8c0d2f3b1d3b6c2 (diff)
downloadbootstrap-aff3694f28946a0640f15dc07591dbfb332fcbaf.tar.xz
bootstrap-aff3694f28946a0640f15dc07591dbfb332fcbaf.zip
remove mention of prettify from docs, fix docs subnav width when fixed
-rw-r--r--docs/assets/css/docs.css6
-rw-r--r--docs/base-css.html15
-rw-r--r--docs/templates/pages/base-css.mustache15
3 files changed, 7 insertions, 29 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index bbf8e339a..18b7f5c9f 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -346,7 +346,7 @@ hr.soften {
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */
}
.subnav-fixed .nav {
- width: 938px;
+ max-width: 780px;
margin: 0 auto;
padding: 0 1px;
}
@@ -918,7 +918,7 @@ form.bs-docs-example {
/* Jumbotron buttons */
.jumbotron .btn {
margin-bottom: 10px;
- }
+av }
/* Subnav */
.subnav {
@@ -1026,7 +1026,7 @@ form.bs-docs-example {
/* Update subnav container */
.subnav-fixed .nav {
- width: 1168px; /* 2px less to account for left/right borders being removed when in fixed mode */
+ max-width: 970px; /* 2px less to account for left/right borders being removed when in fixed mode */
}
}
diff --git a/docs/base-css.html b/docs/base-css.html
index de0363dd4..084654b27 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -424,19 +424,6 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
</pre>
<p><strong>Note:</strong> Be sure to keep code within <code>&lt;pre&gt;</code> tags as close to the left as possible; it will render all tabs.</p>
<p>You may optionally add the <code>.pre-scrollable</code> class which will set a max-height of 350px and provide a y-axis scrollbar.</p>
-
- <h2>Google Prettify</h2>
- <p>Take the same <code>&lt;pre&gt;</code> element and add two optional classes for enhanced rendering.</p>
-<pre class="prettyprint linenums" style="margin-bottom: 9px;">
-&lt;p&gt;Sample text here...&lt;/p&gt;
-</pre>
-<pre class="prettyprint linenums" style="margin-bottom: 9px;">
-&lt;pre class="prettyprint
- linenums"&gt;
- &amp;lt;p&amp;gt;Sample text here...&amp;lt;/p&amp;gt;
-&lt;/pre&gt;
-</pre>
- <p><a href="http://code.google.com/p/google-code-prettify/">Download google-code-prettify</a> and view the readme for <a href="http://google-code-prettify.googlecode.com/svn/trunk/README.html">how to use</a>.</p>
</section>
@@ -448,6 +435,8 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
<h1>Tables <small>For, you guessed it, tabular data</small></h1>
</div>
+
+
<h2>Table markup</h2>
<table class="table table-bordered table-striped">
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 9010bef7a..ee95ac755 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -355,19 +355,6 @@
</pre>
<p>{{_i}}<strong>Note:</strong> Be sure to keep code within <code>&lt;pre&gt;</code> tags as close to the left as possible; it will render all tabs.{{/i}}</p>
<p>{{_i}}You may optionally add the <code>.pre-scrollable</code> class which will set a max-height of 350px and provide a y-axis scrollbar.{{/i}}</p>
-
- <h2>Google Prettify</h2>
- <p>Take the same <code>&lt;pre&gt;</code> element and add two optional classes for enhanced rendering.</p>
-<pre class="prettyprint linenums" style="margin-bottom: 9px;">
-&lt;p&gt;{{_i}}Sample text here...{{/i}}&lt;/p&gt;
-</pre>
-<pre class="prettyprint linenums" style="margin-bottom: 9px;">
-&lt;pre class="prettyprint
- linenums"&gt;
- &amp;lt;p&amp;gt;{{_i}}Sample text here...{{/i}}&amp;lt;/p&amp;gt;
-&lt;/pre&gt;
-</pre>
- <p>{{_i}}<a href="http://code.google.com/p/google-code-prettify/">Download google-code-prettify</a> and view the readme for <a href="http://google-code-prettify.googlecode.com/svn/trunk/README.html">how to use</a>.{{/i}}</p>
</section>
@@ -379,6 +366,8 @@
<h1>{{_i}}Tables <small>For, you guessed it, tabular data</small>{{/i}}</h1>
</div>
+
+
<h2>{{_i}}Table markup{{/i}}</h2>
<table class="table table-bordered table-striped">