diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 502139c251..808f3ff19c 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 74ce8db86e..a363a77598 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -324,9 +324,9 @@ h4, h5, h6 { margin: 0; - font-family: ''; - font-weight: normal; - color: ''; + font-family: inherit; + font-weight: bold; + color: inherit; text-rendering: optimizelegibility; } h1 small, @@ -1878,6 +1878,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; diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index d62ce4bebc..26b47ae724 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; } diff --git a/docs/components.html b/docs/components.html index a3a389c98f..809f4d40e9 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 
+          
           
    
             
  • Action
    • 
             
  • Another action
    • 
@@ -300,8 +300,8 @@
       
    Building on the button group styles and markup, we can easily create a split button. Split buttons feature a standard action on the left and a dropdown toggle on the right with contextual links.
    
       
    
         
    
-          Action
-          
+          
+          
           
         
    
         
    
-          Action
-          
+          
+          
           
         
    
         
    
-          Danger
-          
+          
+          
           
    
       
    
         
    
-          Warning
-          
+          
+          
           
         
    
         
    
-          Success
-          
+          
+          
           
         
    
         
    
-          Info
-          
+          
+          
           
    
       
    
         
    
-          Inverse
-          
+          
+          
           
      
             
    • Action
      • 
             
    • Another action
      • 
@@ -385,8 +385,8 @@
       
      Add .pull-right to the .dropdown-menu of any button dropdown for right aligned menus.
      
       
      
         
      
-          Right
-          
+          
+          
           
        
             
      • Action
        • 
             
      • Another action
        • 
@@ -410,10 +410,10 @@
       
        We expand on the normal button dropdowns to provide a second button action that operates as a separate dropdown trigger.
        
 
         <div class="btn-group">
-  <a class="btn" href="#">Action</a>
-  <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+  <button class="btn">Action</button>
+  <button class="btn dropdown-toggle" data-toggle="dropdown">
     <span class="caret"></span>
-  </a>
+  </button>
   <ul class="dropdown-menu">
     <!-- dropdown menu links -->
   </ul>
@@ -423,8 +423,8 @@
       
        Dropdown menus can also be toggled from the bottom up by adding a single class to the immediate parent of .dropdown-menu. It will flip the direction of the .caret and reposition the menu itself to move from the bottom up instead of top down.
        
       
        
         
        
-          Dropup
-          
+          
+          
           
         
        
         
        
-          Right dropup
-          
+          
+          
           
        
 
         <div class="btn-group dropup">
-  <a class="btn" href="#">Dropup</a>
-  <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+  <button class="btn">Dropup</button>
+  <button class="btn dropdown-toggle" data-toggle="dropdown">
     <span class="caret"></span>
-  </a>
+  </button>
   <ul class="dropdown-menu">
     <!-- dropdown menu links -->
   </ul>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index f38969567f..354c4d54df 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -58,34 +58,34 @@
       
        {{_i}}Here's how the HTML looks for a standard button group built with anchor tag buttons:{{/i}}
        
       
        
         
        
-          {{_i}}Left{{/i}}
-          {{_i}}Middle{{/i}}
-          {{_i}}Right{{/i}}
+          
+          
+          
         
        
       
        
 
         <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>
 
        
       
        {{_i}}Toolbar example{{/i}}
        
       
        {{_i}}Combine sets of <div class="btn-group"> into a <div class="btn-toolbar"> for more complex components.{{/i}}
        
       
        
         
        
-          1
-          2
-          3
-          4
+          
+          
+          
+          
         
        
         
        
-          5
-          6
-          7
+          
+          
+          
         
        
         
        
-          8
+          
         
        
       
        
 
        @@ -122,7 +122,7 @@
       
        {{_i}}Use any button to trigger a dropdown menu by placing it within a .btn-group and providing the proper menu markup.{{/i}}
        
       
        
         
        
-          {{_i}}Action{{/i}} 
+          
           
         
        
         
        
-          {{_i}}Action{{/i}} 
+          
           
         
        
         
        
-          {{_i}}Danger{{/i}} 
+          
           
        
       
        
         
        
-          {{_i}}Warning{{/i}} 
+          
           
         
        
         
        
-          {{_i}}Success{{/i}} 
+          
           
         
        
         
        
-          {{_i}}Info{{/i}} 
+          
           
         
        
         
        
-          {{_i}}Inverse{{/i}} 
+          
           
          
             
        • {{_i}}Action{{/i}}
          • 
             
        • {{_i}}Another action{{/i}}
          • 
@@ -224,8 +224,8 @@
       
          {{_i}}Building on the button group styles and markup, we can easily create a split button. Split buttons feature a standard action on the left and a dropdown toggle on the right with contextual links.{{/i}}
          
       
          
         
          
-          {{_i}}Action{{/i}}
-          
+          
+          
           
         
          
         
          
-          {{_i}}Action{{/i}}
-          
+          
+          
           
         
          
         
          
-          {{_i}}Danger{{/i}}
-          
+          
+          
           
          
       
          
         
          
-          {{_i}}Warning{{/i}}
-          
+          
+          
           
         
          
         
          
-          {{_i}}Success{{/i}}
-          
+          
+          
           
         
          
         
          
-          {{_i}}Info{{/i}}
-          
+          
+          
           
          
       
          
         
          
-          {{_i}}Inverse{{/i}}
-          
+          
+          
           
            
             
          • {{_i}}Action{{/i}}
            • 
             
          • {{_i}}Another action{{/i}}
            • 
@@ -309,8 +309,8 @@
       
            {{_i}}Add .pull-right to the .dropdown-menu of any button dropdown for right aligned menus.{{/i}}
            
       
            
         
            
-          {{_i}}Right{{/i}}
-          
+          
+          
           
              
             
            • {{_i}}Action{{/i}}
              • 
             
            • {{_i}}Another action{{/i}}
              • 
@@ -334,10 +334,10 @@
       
              {{_i}}We expand on the normal button dropdowns to provide a second button action that operates as a separate dropdown trigger.{{/i}}
              
 
               <div class="btn-group">
-  <a class="btn" href="#">{{_i}}Action{{/i}}</a>
-  <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+  <button class="btn">{{_i}}Action{{/i}}</button>
+  <button class="btn dropdown-toggle" data-toggle="dropdown">
     <span class="caret"></span>
-  </a>
+  </button>
   <ul class="dropdown-menu">
     <!-- {{_i}}dropdown menu links{{/i}} -->
   </ul>
@@ -347,8 +347,8 @@
       
              {{_i}}Dropdown menus can also be toggled from the bottom up by adding a single class to the immediate parent of .dropdown-menu. It will flip the direction of the .caret and reposition the menu itself to move from the bottom up instead of top down.{{/i}}
              
       
              
         
              
-          {{_i}}Dropup{{/i}}
-          
+          
+          
           
         
              
         
              
-          {{_i}}Right dropup{{/i}}
-          
+          
+          
           
              
 
               <div class="btn-group dropup">
-  <a class="btn" href="#">{{_i}}Dropup{{/i}}</a>
-  <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+  <button class="btn">{{_i}}Dropup{{/i}}</button>
+  <button class="btn dropdown-toggle" data-toggle="dropdown">
     <span class="caret"></span>
-  </a>
+  </button>
   <ul class="dropdown-menu">
     <!-- {{_i}}dropdown menu links{{/i}} -->
   </ul>
diff --git a/less/forms.less b/less/forms.less
index 4043e45a46..280c63d6b2 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -48,7 +48,7 @@ input,
 button,
 select,
 textarea {
-  #font > #family > .sans-serif(); // And only set font-family here for those that need it (note the missing label element)
+  font-family: @baseFontFamily; // And only set font-family here for those that need it (note the missing label element)
 }
 
 // Identify controls by their labels
diff --git a/less/navbar.less b/less/navbar.less
index 77cdf7a7a8..75ad1336de 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -233,9 +233,9 @@
 // Active nav items
 .navbar .nav .active > a,
 .navbar .nav .active > a:hover {
-  color: @navbarLinkColorHover;
+  color: @navbarLinkColorActive;
   text-decoration: none;
-  background-color: @navbarBackground;
+  background-color: @navbarLinkBackgroundActive;
 }
 
 // Dividers (basically a vertical hr)
diff --git a/less/variables.less b/less/variables.less
index 74290b7bae..fef3ee0ee5 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -50,9 +50,9 @@
 @baseLineHeight:        18px;
 @altFontFamily:         Georgia, "Times New Roman", Times, serif;
 
-@headingsFontFamily:    ''; // empty to use BS default, @baseFontFamily
-@headingsFontWeight:    normal; // instead of browser default, bold
-@headingsColor:         ''; // empty to use BS default, @textColor
+@headingsFontFamily:    inherit; // empty to use BS default, @baseFontFamily
+@headingsFontWeight:    bold;    // instead of browser default, bold
+@headingsColor:         inherit; // empty to use BS default, @textColor
 
 
 // Tables
@@ -105,10 +105,12 @@
 
 
 
+
 // COMPONENT VARIABLES
 // --------------------------------------------------
 
 // Z-index master list
+// -------------------------
 // Used for a bird's eye view of components dependent on the z-axis
 // Try to avoid customizing these :)
 @zindexDropdown:          1000;
@@ -118,32 +120,46 @@
 @zindexModalBackdrop:     1040;
 @zindexModal:             1050;
 
+
 // Sprite icons path
+// -------------------------
 @iconSpritePath:          "../img/glyphicons-halflings.png";
 @iconWhiteSpritePath:     "../img/glyphicons-halflings-white.png";
 
+
 // Input placeholder text color
+// -------------------------
 @placeholderText:         @grayLight;
 
+
 // Hr border color
+// -------------------------
 @hrBorder:                @grayLighter;
 
+
 // Navbar
+// -------------------------
 @navbarHeight:                    40px;
 @navbarBackground:                @grayDarker;
 @navbarBackgroundHighlight:       @grayDark;
-@navbarLinkBackgroundHover:       transparent;
 
 @navbarText:                      @grayLight;
 @navbarLinkColor:                 @grayLight;
 @navbarLinkColorHover:            @white;
+@navbarLinkColorActive:           @navbarLinkColorHover;
+@navbarLinkBackgroundHover:       transparent;
+@navbarLinkBackgroundActive:      @navbarBackground;
+
 
 // Hero unit
+// -------------------------
 @heroUnitBackground:              #312f2e;
 @heroUnitHeadingColor:            @white;
 @heroUnitLeadColor:               @white;
 
+
 // Form states and alerts
+// -------------------------
 @warningText:             #c09853;
 @warningBackground:       #fcf8e3;
 @warningBorder:           darken(spin(@warningBackground, -10), 3%);
@@ -162,15 +178,19 @@
 
 
 
+
 // GRID
 // --------------------------------------------------
 
 // Default 940px grid
+// -------------------------
 @gridColumns:             12;
 @gridColumnWidth:         60px;
 @gridGutterWidth:         20px;
 @gridRowWidth:            (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
 
+
 // Fluid grid
+// -------------------------
 @fluidGridColumnWidth:    6.382978723%;
 @fluidGridGutterWidth:    2.127659574%;
diff --git a/less/wells.less b/less/wells.less
index 244b8ca102..9300061a50 100644
--- a/less/wells.less
+++ b/less/wells.less
@@ -15,3 +15,13 @@
     border-color: rgba(0,0,0,.15);
   }
 }
+
+// Sizes
+.well-large {
+  padding: 24px;
+  .border-radius(6px);
+}
+.well-small {
+  padding: 9px;
+  .border-radius(3px);
+}