From 3f54db9c6ac0126b071a1874cd2f5c0379a4f393 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 12:53:30 -0800 Subject: [PATCH 1/2] remake --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap.css b/bootstrap.css index 71d9424011..845598de29 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Tue Jan 24 12:27:30 PST 2012 + * Date: Tue Jan 24 12:53:25 PST 2012 */ article, aside, From fecd4ddd135a893f2c5c103d565e9d1ab110d247 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 14:25:30 -0800 Subject: [PATCH 2/2] docs updates to make the getting started section more responsive, updated the benefits to be clearer and swap x for checkmark --- bootstrap.css | 2 +- docs/assets/css/docs.css | 62 ++++++++------------------ docs/base-css.html | 4 +- docs/components.html | 2 +- docs/index.html | 68 ++++++++++++++--------------- docs/javascript.html | 2 +- docs/less.html | 2 +- docs/templates/pages/index.mustache | 68 ++++++++++++++--------------- 8 files changed, 91 insertions(+), 119 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 845598de29..fb3a3f2ab3 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Tue Jan 24 12:53:25 PST 2012 + * Date: Tue Jan 24 13:58:10 PST 2012 */ article, aside, diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 69d9dac568..b8d5bfcdc0 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -83,7 +83,7 @@ section { /* Benefits list in masthead */ .benefits { - width: 250px; + width: 280px; position: absolute; right: 0; bottom: 0; @@ -105,8 +105,6 @@ section { color: #555; } .benefits span { - position: relative; - top: -2px; padding-right: 5px; color: #999; } @@ -200,7 +198,7 @@ section { } .marketing h1 { margin: 36px 0 27px; - font-size: 36px; + font-size: 40px; font-weight: 300; text-align: center; } @@ -227,59 +225,28 @@ section { /* Quickstart section for getting le code -------------------------------------------------- */ -.getting-started { - background-color: #f5f5f5; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#f9f9f9), to(#f5f5f5)); - background-image: -moz-linear-gradient(#f9f9f9, #f5f5f5); - background-image: -ms-linear-gradient(#f9f9f9, #f5f5f5); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f9f9f9), color-stop(100%, #f5f5f5)); - background-image: -webkit-linear-gradient(#f9f9f9, #f5f5f5); - background-image: -o-linear-gradient(#f9f9f9, #f5f5f5); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0)"; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0); - background-image: linear-gradient(#f9f9f9, #f5f5f5); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.getting-started { - border-color: #eee; -} -.getting-started td { - width: 33%; - border-right: 1px solid #eee; -} -.getting-started td + td { - border-left: 1px solid #fff; -} -.getting-started td:last-child { - border-right: 0; -} -.quick-start { - padding: 17px 20px; -} -.quick-start h3, -.quick-start p { +.getting-started h3, +.getting-started p { line-height: 18px; text-align: center; margin-bottom: 9px; } -.quick-start p { +.getting-started p { color: #777; } -.quick-start .current-version, -.quick-start .current-version a { +.getting-started .current-version, +.getting-started .current-version a { color: #999; } -.quick-start form { +.getting-started form { margin-bottom: 0; } -.quick-start textarea { +.getting-started textarea { display: block; - width: 100%; + width: 95%; height: auto; - margin-bottom: 0; + margin-left: auto; + margin-right: auto; line-height: 21px; white-space: nowrap; overflow: hidden; @@ -629,6 +596,11 @@ form.well { margin-bottom: 5px; } + /* Space out the getting started sections */ + .getting-started .span4 { + margin-bottom: 18px; + } + /* Unfloat the back to top link in footer */ .footer .pull-right { float: none; diff --git a/docs/base-css.html b/docs/base-css.html index f21f25f6b3..6485d76a22 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -366,7 +366,7 @@ <pre class="prettyprint"> -

Using the google-code-prettify library, your blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.

+

Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.

<div>
   <h1>Heading</h1>
   <p>Something right here...</p>
@@ -1105,7 +1105,7 @@
     

       

         
Redesigned browser states

-        
Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in its place for :focus.

+        
Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in it's place for :focus.

         

         
Form validation

         
It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding .control-group.

diff --git a/docs/components.html b/docs/components.html
index 3a15541c4a..9d28b9e06b 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1088,7 +1088,7 @@
   

     

       
Rewritten base class

-      
With Bootstrap 2, we've simplified the base class: .alert instead of .alert-message. We've also reduced the minimum required markup—no <p> is required by default, just the outer <div>.

+      
With Bootstrap 2, we've simplified the base class: .alert instead of .alert-message. We've also reduced the minimum required markup—no <p> is required by default, just the outter <div>.

       
Single alert message

       
For a more durable component with less code, we've removed the differentiating look for block alerts, messages that come with more padding and typically more text. The class also has changed to .alert-block.

       

diff --git a/docs/index.html b/docs/index.html
index 1743676b6c..25e76cb545 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -74,13 +74,13 @@
             

               
Feature highlights

               
    
-                
  • × Built on LESS
    • 
-                
  • × Complete styleguide docs
    • 
-                
  • × Fully responsive design
    • 
-                
  • × Small footprint (7kb gzipped)
    • 
-                
  • × Support for IE7 and up
    • 
-                
  • × Custom jQuery plugins
    • 
-                
  • × Dozens of components
    • 
+                
  • ✔ Built on LESS
    • 
+                
  • ✔ Complete style guide docs
    • 
+                
  • ✔ Fully responsive design
    • 
+                
  • ✔ Small CSS footprint (10kb gzipped)
    • 
+                
  • ✔ Support for IE7 and up
    • 
+                
  • ✔ Custom jQuery plugins
    • 
+                
  • ✔ Dozens of components
    • 
               

             

           

@@ -217,33 +217,33 @@
           ================================================== -->
           
Get started in no time.

           
Quickly start using Bootstrap within your workflow and development process.

-          
-            
-              
-                
-                
-                
-              
-            
-          

-                  
Hotlink the CSS

-                  
For the quickest and easiest start, just copy this snippet into your webpage.

-                  

-                    
-                  

-                		
-                  
Use it with LESS

-                  
A fan of using LESS? No problem, just clone the repo and add these lines:

-                  

-                    
-                  

-                		
-                  
Fork on GitHub

-                  
Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.

-                  
Bootstrap on GitHub »

-                  
Currently v2.0.0

-                

+
+          

+            

+              

+                
Hotlink the CSS

+                
For the quickest and easiest start, just copy this snippet into your webpage.

+                

+                  
+                

+              
 
+              

+                
Use it with LESS.js

+                
A fan of using LESS? No problem, just download the repo and add these lines to your page:

+                

+                  
+                

+              
 
+              

+                
Fork on GitHub

+                
Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.

+                
Bootstrap on GitHub »

+                
Currently v2.0.0

+              
 
+            

+          

+
         

       

      
           
Get started in no time.

           
Quickly start using Bootstrap within your workflow and development process.

-          
-            
-              
-                
-                
-                
-              
-            
-          

-                  
Hotlink the CSS

-                  
For the quickest and easiest start, just copy this snippet into your webpage.

-                  

-                    
-                  

-                		
-                  
Use it with LESS

-                  
A fan of using LESS? No problem, just clone the repo and add these lines:

-                  

-                    
-                  

-                		
-                  
Fork on GitHub

-                  
Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.

-                  
Bootstrap on GitHub »

-                  
Currently v2.0.0

-                

+
+          

+            

+              

+                
Hotlink the CSS

+                
For the quickest and easiest start, just copy this snippet into your webpage.

+                

+                  
+                

+              
 
+              

+                
Use it with LESS.js

+                
A fan of using LESS? No problem, just download the repo and add these lines to your page:

+                

+                  
+                

+              
 
+              

+                
Fork on GitHub

+                
Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.

+                
Bootstrap on GitHub »

+                
Currently v2.0.0

+              
 
+            

+          

+
         

       
\ No newline at end of file