]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
docs fixes
authorMark Otto <markdotto@gmail.com>
Wed, 25 Jan 2012 21:56:44 +0000 (13:56 -0800)
committerMark Otto <markdotto@gmail.com>
Wed, 25 Jan 2012 21:56:44 +0000 (13:56 -0800)
docs/assets/css/docs.css
docs/download.html
docs/index.html
docs/templates/pages/download.mustache
docs/templates/pages/index.mustache

index 739ae1fc4d50ce6eba8c9da6daa2665e63a1f2e7..b70b039f20f004881a33ca1d1235e42bf3cb0f91 100644 (file)
@@ -266,12 +266,12 @@ section {
 .marketing p {
   margin-right: 10px;
 }
-.marketing .icon {
+.marketing .bs-icon {
   float: left;
   margin: 7px 10px 0 0;
   opacity: .8;
 }
-.marketing .small-icon {
+.marketing .small-bs-icon {
   float: left;
   margin: 4px 5px 0 0;
 }
@@ -497,7 +497,7 @@ section {
 
 /* Giant download button */
 .download-btn {
-  margin: 36px 0 108px;
+  margin: 36px 0 108px.i;
 }
 .download p,
 .download h4 {
index d4c31ed4dfbb3448c389a5f31617d96bd511be34..7b045ae8ef77a01d08d10fe4331a074363241da0 100644 (file)
@@ -76,7 +76,7 @@
       <li><a href="#components">1. Select components</a></li>
       <li><a href="#variables">2. Modify variables</a></li>
       <li><a href="#plugins">3. Select jQuery plugins</a></li>
-      <li><a href="#download">4. Build and download</a></li>
+      <li><a href="#download">4. Customize and download</a></li>
     </ul>
   </div>
 </header>
     </h1>
   </div>
   <div class="download-btn">
-    <a class="btn xlarge primary" href="#">Build and Download</a>
+    <a class="btn xlarge primary" href="#">Customize and Download</a>
     <h4>What's included?</h4>
     <p>Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.</p>
   </div>
index 0835c464723fdce9c90b2b5b630eb563fef91bba..b866da87c6ca10cac82f522f45490265be825ecd 100644 (file)
@@ -71,8 +71,8 @@
             <h1>Bootstrap,<br> from Twitter</h1>
             <p class="lead">Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, featuring HTML, CSS, and JS for dozens of base elements and common design components.</p>
             <p class="download-info">
-              <a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">Download on GitHub</a>
-              <a href="./scaffolding.html" class="btn btn-large">Get started &rarr;</a>
+              <a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">View on GitHub</a>
+              <a href="./download.html" class="btn btn-large">Customize and Download</a>
             </p>
 
             <div class="benefits">
           <p class="marketing-byline">Need reasons to love Bootstrap? Look no further.</p>
           <div class="row">
             <div class="span4">
-              <img class="icon" src="assets/img/glyphicons/glyphicons_042_group.png">
+              <img class="bs-icon" src="assets/img/glyphicons/glyphicons_042_group.png">
               <h2>Built for and by nerds</h2>
               <p>Like you, we love building awesome products on the web. We love it so much, we decided to help people just like us do it easier, better, and faster. Bootstrap is built for you.</p>
             </div>
             <div class="span4">
-              <img class="icon" src="assets/img/glyphicons/glyphicons_079_podium.png">
+              <img class="bs-icon" src="assets/img/glyphicons/glyphicons_079_podium.png">
               <h2>For all skill levels</h2>
               <p>Bootstrap is designed to help people of all skill level&mdash;designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.</p>
             </div>
             <div class="span4">
-              <img class="icon" src="assets/img/glyphicons/glyphicons_163_iphone.png">
+              <img class="bs-icon" src="assets/img/glyphicons/glyphicons_163_iphone.png">
               <h2>Cross-everything</h2>
               <p>Originally built with only modern browsers in mind, Bootstrap has evolved to include support for all major browsers (even IE7!) and, with Bootstrap 2, tablets and smartphones, too.</p>
             </div>
           </div><!--/row-->
           <div class="row">
             <div class="span4">
-              <img class="icon" src="assets/img/glyphicons/glyphicons_155_show_thumbnails.png">
+              <img class="bs-icon" src="assets/img/glyphicons/glyphicons_155_show_thumbnails.png">
               <h2>12-column grid</h2>
               <p>Grid systems aren't everything, but having a durable and flexible one at the core of your work can make development much simpler. Use our built-in grid classes or roll your own.</p>
             </div>
             <div class="span4">
-              <img class="icon" src="assets/img/glyphicons/glyphicons_214_resize_small.png">
+              <img class="bs-icon" src="assets/img/glyphicons/glyphicons_214_resize_small.png">
               <h2>Responsive design</h2>
               <p>With Bootstrap 2, we've gone fully responsive. Our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.</p>
             </div>
             <div class="span4">
-              <img class="icon" src="assets/img/glyphicons/glyphicons_266_book_open.png">
+              <img class="bs-icon" src="assets/img/glyphicons/glyphicons_266_book_open.png">
               <h2>Styleguide docs</h2>
               <p>Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.</p>
             </div>
           </div><!--/row-->
           <div class="row">
             <div class="span4">
-              <img class="icon" src="assets/img/glyphicons/glyphicons_082_roundabout.png">
+              <img class="bs-icon" src="assets/img/glyphicons/glyphicons_082_roundabout.png">
               <h2>Growing library</h2>
               <p>Despite being only 10kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.</p>
             </div>
             <div class="span4">
-              <img class="icon" src="assets/img/glyphicons/glyphicons_009_magic.png">
+              <img class="bs-icon" src="assets/img/glyphicons/glyphicons_009_magic.png">
               <h2>Custom jQuery plugins</h2>
               <p>What good is an awesome design component without easy-to-use, proper, and extensible interactions? With Bootstrap, you get custom-built jQuery plugins to bring your projects to life.</p>
             </div>
             <div class="span4">
-              <img class="icon" src="assets/img/less-small.png">
+              <img class="bs-icon" src="assets/img/less-small.png">
               <h2>Built on LESS</h2>
               <p>Where vanilla CSS falters, LESS excels. Variables, nesting, operations, and mixins in LESS makes coding CSS faster and more efficient with minimal overhead.</p>
             </div>
           </div><!--/row-->
           <div class="row">
             <div class="span3">
-              <img class="small-icon" src="assets/img/icon-html5.png">
+              <img class="small-bs-iconn" src="assets/img/icon-html5.png">
               <h3>HTML5</h3>
               <p>Built to support new HTML5 elements and syntax.</p>
             </div>
             <div class="span3">
-              <img class="small-icon" src="assets/img/icon-css3.png">
+              <img class="small-bs-iconn" src="assets/img/icon-css3.png">
               <h3>CSS3</h3>
               <p>Progressively enhanced components for ultimate style.</p>
             </div>
             <div class="span3">
-              <img class="small-icon" src="assets/img/icon-github.png">
+              <img class="small-bs-iconn" src="assets/img/icon-github.png">
               <h3>Open-source</h3>
               <p>Built for and maintained by the community via <a href="https://github.com">GitHub</a>.</p>
             </div>
             <div class="span3">
-              <img class="small-icon" src="assets/img/icon-twitter.png">
+              <img class="small-bs-iconn" src="assets/img/icon-twitter.png">
               <h3>Made at Twitter</h3>
               <p>Brought to you by an experienced <a href="http://twitter.com/fat">engineer</a> and <a href="http://twitter.com/mdo">designer</a>.</p>
             </div>
index 216098bad049a439a9b34987ede619f517280fce..f5964dc352070122b0c0a2450b4a807bd60a2071 100644 (file)
@@ -12,7 +12,7 @@
       <li><a href="#components">{{_i}}1. Select components{{/i}}</a></li>
       <li><a href="#variables">{{_i}}2. Modify variables{{/i}}</a></li>
       <li><a href="#plugins">{{_i}}3. Select jQuery plugins{{/i}}</a></li>
-      <li><a href="#download">{{_i}}4. Build and download{{/i}}</a></li>
+      <li><a href="#download">{{_i}}4. Customize and download{{/i}}</a></li>
     </ul>
   </div>
 </header>
     </h1>
   </div>
   <div class="download-btn">
-    <a class="btn xlarge primary" href="#">Build and Download</a>
+    <a class="btn xlarge primary" href="#">Customize and Download</a>
     <h4>What's included?</h4>
     <p>Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.</p>
   </div>
index c3f725a05d31f5544d4ed86085725d96ec194a9e..ff486bc7b966d247a04c274da500e45caa478052 100644 (file)
@@ -7,8 +7,8 @@
             <h1>{{_i}}Bootstrap,<br> from Twitter{{/i}}</h1>
             <p class="lead">{{_i}}Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, featuring HTML, CSS, and JS for dozens of base elements and common design components.{{/i}}</p>
             <p class="download-info">
-              <a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">{{_i}}Download on GitHub{{/i}}</a>
-              <a href="./scaffolding.html" class="btn btn-large">{{_i}}Get started &rarr;{{/i}}</a>
+              <a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">{{_i}}View on GitHub{{/i}}</a>
+              <a href="./download.html" class="btn btn-large">{{_i}}Customize and Download{{/i}}</a>
             </p>
 
             <div class="benefits">
           <p class="marketing-byline">{{_i}}Need reasons to love Bootstrap? Look no further.{{/i}}</p>
           <div class="row">
             <div class="span4">
-              <img class="icon" src="assets/img/glyphicons/glyphicons_042_group.png">
+              <img class="bs-icon" src="assets/img/glyphicons/glyphicons_042_group.png">
               <h2>{{_i}}Built for and by nerds{{/i}}</h2>
               <p>{{_i}}Like you, we love building awesome products on the web. We love it so much, we decided to help people just like us do it easier, better, and faster. Bootstrap is built for you.{{/i}}</p>
             </div>
             <div class="span4">
-              <img class="icon" src="assets/img/glyphicons/glyphicons_079_podium.png">
+              <img class="bs-icon" src="assets/img/glyphicons/glyphicons_079_podium.png">
               <h2>{{_i}}For all skill levels{{/i}}</h2>
               <p>{{_i}}Bootstrap is designed to help people of all skill level&mdash;designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.{{/i}}</p>
             </div>
             <div class="span4">
-              <img class="icon" src="assets/img/glyphicons/glyphicons_163_iphone.png">
+              <img class="bs-icon" src="assets/img/glyphicons/glyphicons_163_iphone.png">
               <h2>{{_i}}Cross-everything{{/i}}</h2>
               <p>{{_i}}Originally built with only modern browsers in mind, Bootstrap has evolved to include support for all major browsers (even IE7!) and, with Bootstrap 2, tablets and smartphones, too.{{/i}}</p>
             </div>
           </div><!--/row-->
           <div class="row">
             <div class="span4">
-              <img class="icon" src="assets/img/glyphicons/glyphicons_155_show_thumbnails.png">
+              <img class="bs-icon" src="assets/img/glyphicons/glyphicons_155_show_thumbnails.png">
               <h2>{{_i}}12-column grid{{/i}}</h2>
               <p>{{_i}}Grid systems aren't everything, but having a durable and flexible one at the core of your work can make development much simpler. Use our built-in grid classes or roll your own.{{/i}}</p>
             </div>
             <div class="span4">
-              <img class="icon" src="assets/img/glyphicons/glyphicons_214_resize_small.png">
+              <img class="bs-icon" src="assets/img/glyphicons/glyphicons_214_resize_small.png">
               <h2>{{_i}}Responsive design{{/i}}</h2>
               <p>{{_i}}With Bootstrap 2, we've gone fully responsive. Our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.{{/i}}</p>
             </div>
             <div class="span4">
-              <img class="icon" src="assets/img/glyphicons/glyphicons_266_book_open.png">
+              <img class="bs-icon" src="assets/img/glyphicons/glyphicons_266_book_open.png">
               <h2>{{_i}}Styleguide docs{{/i}}</h2>
               <p>{{_i}}Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.{{/i}}</p>
             </div>
           </div><!--/row-->
           <div class="row">
             <div class="span4">
-              <img class="icon" src="assets/img/glyphicons/glyphicons_082_roundabout.png">
+              <img class="bs-icon" src="assets/img/glyphicons/glyphicons_082_roundabout.png">
               <h2>{{_i}}Growing library{{/i}}</h2>
               <p>{{_i}}Despite being only 10kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.{{/i}}</p>
             </div>
             <div class="span4">
-              <img class="icon" src="assets/img/glyphicons/glyphicons_009_magic.png">
+              <img class="bs-icon" src="assets/img/glyphicons/glyphicons_009_magic.png">
               <h2>{{_i}}Custom jQuery plugins{{/i}}</h2>
               <p>{{_i}}What good is an awesome design component without easy-to-use, proper, and extensible interactions? With Bootstrap, you get custom-built jQuery plugins to bring your projects to life.{{/i}}</p>
             </div>
             <div class="span4">
-              <img class="icon" src="assets/img/less-small.png">
+              <img class="bs-icon" src="assets/img/less-small.png">
               <h2>{{_i}}Built on LESS{{/i}}</h2>
               <p>{{_i}}Where vanilla CSS falters, LESS excels. Variables, nesting, operations, and mixins in LESS makes coding CSS faster and more efficient with minimal overhead.{{/i}}</p>
             </div>
           </div><!--/row-->
           <div class="row">
             <div class="span3">
-              <img class="small-icon" src="assets/img/icon-html5.png">
+              <img class="small-bs-iconn" src="assets/img/icon-html5.png">
               <h3>HTML5</h3>
               <p>{{_i}}Built to support new HTML5 elements and syntax.{{/i}}</p>
             </div>
             <div class="span3">
-              <img class="small-icon" src="assets/img/icon-css3.png">
+              <img class="small-bs-iconn" src="assets/img/icon-css3.png">
               <h3>CSS3</h3>
               <p>{{_i}}Progressively enhanced components for ultimate style.{{/i}}</p>
             </div>
             <div class="span3">
-              <img class="small-icon" src="assets/img/icon-github.png">
+              <img class="small-bs-iconn" src="assets/img/icon-github.png">
               <h3>{{_i}}Open-source{{/i}}</h3>
               <p>{{_i}}Built for and maintained by the community via <a href="https://github.com">GitHub</a>.{{/i}}</p>
             </div>
             <div class="span3">
-              <img class="small-icon" src="assets/img/icon-twitter.png">
+              <img class="small-bs-iconn" src="assets/img/icon-twitter.png">
               <h3>{{_i}}Made at Twitter{{/i}}</h3>
               <p>{{_i}}Brought to you by an experienced <a href="http://twitter.com/fat">engineer</a> and <a href="http://twitter.com/mdo">designer</a>.{{/i}}</p>
             </div>