]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
compy edits to docs
authorMark Otto <markotto@twitter.com>
Sun, 19 Aug 2012 19:04:41 +0000 (12:04 -0700)
committerMark Otto <markotto@twitter.com>
Sun, 19 Aug 2012 19:04:41 +0000 (12:04 -0700)
docs/assets/css/docs.css
docs/getting-started.html
docs/scaffolding.html
docs/templates/pages/getting-started.mustache
docs/templates/pages/scaffolding.mustache

index 02fd34c5112899c92847f8f948a80ba5399979d0..2150baede46c86f6756554e1a8b377fcd6954715 100644 (file)
@@ -776,7 +776,6 @@ form.bs-docs-example {
   display: block;
   *width: 190px;
   margin: 0 0 -1px;
-  font-size: 14px;
   padding: 8px 14px;
   border: 1px solid #e5e5e5;
 }
@@ -879,7 +878,7 @@ form.bs-docs-example {
     width: 166px;
   }
   .bs-docs-sidenav.affix {
-    top: 0px;
+    top: 0;
   }
 }
 
index 0eecd59e672f700b978fef7db184dc63aee203f3..6323f2cfa0818931c1eefba80b9ebc06eacbfe3e 100644 (file)
@@ -85,7 +85,7 @@
     ================================================== -->
     <div class="row">
       <div class="span3 bs-docs-sidebar">
-        <ul class="nav nav-list bs-docs-sidenav" >
+        <ul class="nav nav-list bs-docs-sidenav">
           <li><a href="#download-bootstrap"><i class="icon-chevron-right"></i> Download</a></li>
           <li><a href="#file-structure"><i class="icon-chevron-right"></i> File structure</a></li>
           <li><a href="#contents"><i class="icon-chevron-right"></i> What's included</a></li>
           </div>
           <p class="lead">Before downloading, be sure to have a code editor (we recommend <a href="http://sublimetext.com/2">Sublime Text 2</a>) and some working knowledge of HTML and CSS. We won't walk through the source files here, but they are available for download. We'll focus on getting started with our the compiled Bootstrap files.</p>
 
-          <div class="row">
-            <div class="span4">
+          <div class="row-fluid">
+            <div class="span6">
               <h2>Download compiled</h2>
               <p><strong>Fastest way to get started:</strong> get the compiled and minified versions of our CSS, JS, and images. No docs or original source files.</p>
               <p><a class="btn btn-large btn-primary" href="assets/bootstrap.zip" >Download Bootstrap</a></p>
             </div>
-            <div class="span4">
+            <div class="span6">
               <h2>Download source</h2>
               <p>Get the original files for all CSS and Javasript, along with a local copy of the docs by downloading the latest version directly from GitHub.</p>
               <p><a class="btn btn-large" href="https://github.com/twitter/bootstrap/zipball/master" >Download Bootstrap source</a></p>
index ff59a17776c6a46884aa22f8b1a802a23f434651..b8b663a7c1b64cd160f9842ea231ce522e5b0034 100644 (file)
         ================================================== -->
         <section id="global">
           <div class="page-header">
-            <h1>Global styles <small>for CSS reset, typography, and links</small></h1>
+            <h1>Global styles</h1>
           </div>
 
           <h3>Requires HTML5 doctype</h3>
         ================================================== -->
         <section id="gridSystem">
           <div class="page-header">
-            <h1>Default grid system <small>12 columns with a responsive twist</small></h1>
+            <h1>Default grid system</h1>
           </div>
 
           <h2>Live grid example</h2>
         ================================================== -->
         <section id="fluidGridSystem">
           <div class="page-header">
-            <h1>Fluid grid system <small>12 responsive, percent-based columns</small></h1>
+            <h1>Fluid grid system</h1>
           </div>
 
           <h2>Live fluid grid example</h2>
         ================================================== -->
         <section id="layouts">
           <div class="page-header">
-            <h1>Layouts <small>Basic templates to create webpages</small></h1>
+            <h1>Layouts</h1>
           </div>
 
           <h2>Fixed layout</h2>
         ================================================== -->
         <section id="responsive">
           <div class="page-header">
-            <h1>Responsive design <small>Media queries for various devices and resolutions</small></h1>
+            <h1>Responsive design</h1>
           </div>
 
           <h2>Enabling responsive features</h2>
index 4a5adc1b0a5e9d7271f2ba679bee97f9f353a152..b89a8c62911ef90996a0d3bb7a91642aaff30c14 100644 (file)
@@ -14,7 +14,7 @@
     ================================================== -->
     <div class="row">
       <div class="span3 bs-docs-sidebar">
-        <ul class="nav nav-list bs-docs-sidenav" >
+        <ul class="nav nav-list bs-docs-sidenav">
           <li><a href="#download-bootstrap"><i class="icon-chevron-right"></i> {{_i}}Download{{/i}}</a></li>
           <li><a href="#file-structure"><i class="icon-chevron-right"></i> {{_i}}File structure{{/i}}</a></li>
           <li><a href="#contents"><i class="icon-chevron-right"></i> {{_i}}What's included{{/i}}</a></li>
           </div>
           <p class="lead">{{_i}}Before downloading, be sure to have a code editor (we recommend <a href="http://sublimetext.com/2">Sublime Text 2</a>) and some working knowledge of HTML and CSS. We won't walk through the source files here, but they are available for download. We'll focus on getting started with our the compiled Bootstrap files.{{/i}}</p>
 
-          <div class="row">
-            <div class="span4">
+          <div class="row-fluid">
+            <div class="span6">
               <h2>Download compiled</h2>
               <p><strong>Fastest way to get started:</strong> get the compiled and minified versions of our CSS, JS, and images. No docs or original source files.</p>
               <p><a class="btn btn-large btn-primary" href="assets/bootstrap.zip" {{#production}}onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download compiled']);"{{/production}}>Download Bootstrap</a></p>
             </div>
-            <div class="span4">
+            <div class="span6">
               <h2>Download source</h2>
               <p>Get the original files for all CSS and Javasript, along with a local copy of the docs by downloading the latest version directly from GitHub.</p>
               <p><a class="btn btn-large" href="https://github.com/twitter/bootstrap/zipball/master" {{#production}}onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download source']);"{{/production}}>Download Bootstrap source</a></p>
index b22b1b4e9641829898a1ecf06c790d9f2d1fc440..c1147805c4e604999ce0464d14d2c03c4297d8aa 100644 (file)
@@ -29,7 +29,7 @@
         ================================================== -->
         <section id="global">
           <div class="page-header">
-            <h1>{{_i}}Global styles <small>for CSS reset, typography, and links</small>{{/i}}</h1>
+            <h1>{{_i}}Global styles{{/i}}</h1>
           </div>
 
           <h3>{{_i}}Requires HTML5 doctype{{/i}}</h3>
@@ -63,7 +63,7 @@
         ================================================== -->
         <section id="gridSystem">
           <div class="page-header">
-            <h1>{{_i}}Default grid system <small>12 columns with a responsive twist</small>{{/i}}</h1>
+            <h1>{{_i}}Default grid system{{/i}}</h1>
           </div>
 
           <h2>{{_i}}Live grid example{{/i}}</h2>
         ================================================== -->
         <section id="fluidGridSystem">
           <div class="page-header">
-            <h1>{{_i}}Fluid grid system <small>12 responsive, percent-based columns</small>{{/i}}</h1>
+            <h1>{{_i}}Fluid grid system{{/i}}</h1>
           </div>
 
           <h2>{{_i}}Live fluid grid example{{/i}}</h2>
         ================================================== -->
         <section id="layouts">
           <div class="page-header">
-            <h1>{{_i}}Layouts <small>Basic templates to create webpages</small>{{/i}}</h1>
+            <h1>{{_i}}Layouts{{/i}}</h1>
           </div>
 
           <h2>{{_i}}Fixed layout{{/i}}</h2>
         ================================================== -->
         <section id="responsive">
           <div class="page-header">
-            <h1>{{_i}}Responsive design <small>Media queries for various devices and resolutions</small>{{/i}}</h1>
+            <h1>{{_i}}Responsive design{{/i}}</h1>
           </div>
 
           {{! Enabling }}