From aff3694f28946a0640f15dc07591dbfb332fcbaf Mon Sep 17 00:00:00 2001 From: Mark Otto <markotto@twitter.com> Date: Sat, 9 Jun 2012 12:58:55 -0700 Subject: [PATCH] remove mention of prettify from docs, fix docs subnav width when fixed --- docs/assets/css/docs.css | 6 +++--- docs/base-css.html | 15 ++------------- docs/templates/pages/base-css.mustache | 15 ++------------- 3 files changed, 7 insertions(+), 29 deletions(-) diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index bbf8e339a8..18b7f5c9f1 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 de0363dd46..084654b27a 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -424,19 +424,6 @@ For example, <code>section</code> should be wrapped as inline. </pre> <p><strong>Note:</strong> Be sure to keep code within <code><pre></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><pre></code> element and add two optional classes for enhanced rendering.</p> -<pre class="prettyprint linenums" style="margin-bottom: 9px;"> -<p>Sample text here...</p> -</pre> -<pre class="prettyprint linenums" style="margin-bottom: 9px;"> -<pre class="prettyprint - linenums"> - &lt;p&gt;Sample text here...&lt;/p&gt; -</pre> -</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, <code>section</code> 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 9010bef7a0..ee95ac755d 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><pre></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><pre></code> element and add two optional classes for enhanced rendering.</p> -<pre class="prettyprint linenums" style="margin-bottom: 9px;"> -<p>{{_i}}Sample text here...{{/i}}</p> -</pre> -<pre class="prettyprint linenums" style="margin-bottom: 9px;"> -<pre class="prettyprint - linenums"> - &lt;p&gt;{{_i}}Sample text here...{{/i}}&lt;/p&gt; -</pre> -</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"> -- GitLab