From 6b9f70797d812f5a3a90035e4e8ccc2b7cfd0f66 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 6 Mar 2012 21:12:43 -0800 Subject: adding well sizes --- docs/assets/bootstrap.zip | Bin 54951 -> 54989 bytes docs/assets/css/bootstrap.css | 12 ++++++++++++ 2 files changed, 12 insertions(+) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 3549d82cc..3cf863a88 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index ef60ecf47..9854e974c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1783,6 +1783,18 @@ table .span24 { border-color: #ddd; border-color: rgba(0, 0, 0, 0.15); } +.well-large { + padding: 24px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.well-small { + padding: 9px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} .fade { -webkit-transition: opacity 0.15s linear; -moz-transition: opacity 0.15s linear; -- cgit v1.2.3 From 69e4522a4e4c1b021f5abb3a7018926645eac2fa Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 6 Mar 2012 21:13:29 -0800 Subject: set font-family for inputs and such via basefontfamily --- docs/assets/bootstrap.zip | Bin 54989 -> 54989 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 3cf863a88..c153c6e8b 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ -- cgit v1.2.3 From 305374ab1a49a1bdfbab0e52a2be218fc42f3cc0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 10 Mar 2012 11:23:05 -0800 Subject: clear up nav variables --- docs/assets/bootstrap.zip | Bin 54989 -> 54996 bytes docs/assets/css/bootstrap.css | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index c153c6e8b..b317f2936 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9854e974c..3a79af206 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -310,8 +310,9 @@ h4, h5, h6 { margin: 0; - font-weight: bold; - color: #333333; + font-family: ''; + font-weight: normal; + color: ''; text-rendering: optimizelegibility; } h1 small, -- cgit v1.2.3 From f4e879a93612e8ec121985f075812f63c0d4f355 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 10 Mar 2012 11:27:07 -0800 Subject: fix the font-family var by using inherit instead of empty string, fix font-weight in docs for jumbotron --- docs/assets/bootstrap.zip | Bin 55115 -> 55111 bytes docs/assets/css/bootstrap.css | 4 ++-- docs/assets/css/docs.css | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index b87f61992..4200701c9 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 3a79af206..de85e2082 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -310,9 +310,9 @@ h4, h5, h6 { margin: 0; - font-family: ''; + font-family: inherit; font-weight: normal; - color: ''; + color: inherit; text-rendering: optimizelegibility; } h1 small, diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index d62ce4beb..26b47ae72 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -63,6 +63,7 @@ hr.soften { .jumbotron h1 { margin-bottom: 9px; font-size: 81px; + font-weight: bold; letter-spacing: -1px; line-height: 1; } -- cgit v1.2.3 From 5d961eaeb385373786dd1b4cb877247bdb6d5475 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 10 Mar 2012 11:29:57 -0800 Subject: rebold headings --- docs/assets/bootstrap.zip | Bin 55111 -> 55113 bytes docs/assets/css/bootstrap.css | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 4200701c9..4148e5ee9 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index de85e2082..5980f0675 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -311,7 +311,7 @@ h5, h6 { margin: 0; font-family: inherit; - font-weight: normal; + font-weight: bold; color: inherit; text-rendering: optimizelegibility; } -- cgit v1.2.3 From 9ebc6b4c9700610fbc83173c95f5464999f83bff Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 10 Mar 2012 11:37:34 -0800 Subject: simplify buttons docs section by changing a buttons to button elements --- docs/assets/bootstrap.zip | Bin 55113 -> 55113 bytes docs/components.html | 94 +++++++++++++++---------------- docs/templates/pages/components.mustache | 94 +++++++++++++++---------------- 3 files changed, 94 insertions(+), 94 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 4148e5ee9..086c8db29 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/components.html b/docs/components.html index a3a389c98..809f4d40e 100644 --- a/docs/components.html +++ b/docs/components.html @@ -134,34 +134,34 @@

Here's how the HTML looks for a standard button group built with anchor tag buttons:

- Left - Middle - Right + + + 
 <div class="btn-group">
-  <a class="btn" href="#">1</a>
-  <a class="btn" href="#">2</a>
-  <a class="btn" href="#">3</a>
+  <button class="btn">1</button>
+  <button class="btn">2</button>
+  <button class="btn">3</button>
 </div>

Toolbar example

Combine sets of <div class="btn-group"> into a <div class="btn-toolbar"> for more complex components.

- 1 - 2 - 3 - 4 + + + +
- 5 - 6 - 7 + + +
- 8 + 
@@ -198,7 +198,7 @@
       
Use any button to trigger a dropdown menu by placing it within a .btn-group and providing the proper menu markup.

       

         

-          Action 
+          
           
         

         

-          Action 
+          
           
         

         

-          Danger 
+          
           

       

         

-          Warning 
+          
           
         

         

-          Success 
+          
           
         

         

-          Info 
+          
           
         

         

-          Inverse 
+