Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip

7 files changed, 49 insertions, 24 deletions

diff --git a/less/pager.less b/less/pager.less
index a4030c4ab..04585a3a7 100644
--- a/less/pager.less
+++ b/less/pager.less
@@ -17,7 +17,7 @@
       padding: 5px 14px;
       background-color: @pagination-bg;
       border: 1px solid @pagination-border;
-      border-radius: 15px;
+      border-radius: @pager-border-radius;
     }
 
     > a:hover,
@@ -46,7 +46,7 @@
     > a:hover,
     > a:focus,
     > span {
-      color: @gray-light;
+      color: @pager-disabled-color;
       background-color: @pagination-bg;
       cursor: not-allowed;
     }
diff --git a/less/pagination.less b/less/pagination.less
index dcab667b4..83b72e47e 100644
--- a/less/pagination.less
+++ b/less/pagination.less
@@ -42,7 +42,7 @@
   }
   > .active > a,
   > .active > span {
-    color: @gray-light;
+    color: @pagination-active-color;
     cursor: default;
   }
   
@@ -51,7 +51,7 @@
     > a,
     > a:hover,
     > a:focus {
-      color: @gray-light;
+      color: @pagination-disabled-color;
       background-color: @pagination-bg;
       cursor: not-allowed;
     }
diff --git a/less/popovers.less b/less/popovers.less
index 33488e885..c07350f95 100644
--- a/less/popovers.less
+++ b/less/popovers.less
@@ -9,16 +9,16 @@
   left: 0;
   z-index: @zindex-popover;
   display: none;
-  max-width: 276px;
+  max-width: @popover-max-width;
   padding: 1px;
   text-align: left; // Reset given new insertion method
   background-color: @popover-bg;
   -webkit-bg-clip: padding-box;
      -moz-bg-clip: padding;
   background-clip: padding-box;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0,0,0,.2);
-  border-radius: 6px;
+  border: 1px solid @popover-fallback-border-color;
+  border: 1px solid @popover-border-color;
+  border-radius: @border-radius-large;
   .box-shadow(0 5px 10px rgba(0,0,0,.2));
 
   // Overrides for proper insertion
@@ -74,7 +74,7 @@
     left: 50%;
     margin-left: -@popover-arrow-outer-width;
     border-bottom-width: 0;
-    border-top-color: #999; // IE8 fallback
+    border-top-color: @popover-arrow-outer-fallback-color; // IE8 fallback
     border-top-color: @popover-arrow-outer-color;
     bottom: -@popover-arrow-outer-width;
     &:after {
@@ -90,7 +90,7 @@
     left: -@popover-arrow-outer-width;
     margin-top: -@popover-arrow-outer-width;
     border-left-width: 0;
-    border-right-color: #999; // IE8 fallback
+    border-right-color: @popover-arrow-outer-fallback-color; // IE8 fallback
     border-right-color: @popover-arrow-outer-color;
     &:after {
       content: " ";
@@ -104,7 +104,7 @@
     left: 50%;
     margin-left: -@popover-arrow-outer-width;
     border-top-width: 0;
-    border-bottom-color: #999; // IE8 fallback
+    border-bottom-color: @popover-arrow-outer-fallback-color; // IE8 fallback
     border-bottom-color: @popover-arrow-outer-color;
     top: -@popover-arrow-outer-width;
     &:after {
@@ -121,7 +121,7 @@
     right: -@popover-arrow-outer-width;
     margin-top: -@popover-arrow-outer-width;
     border-right-width: 0;
-    border-left-color: #999; // IE8 fallback
+    border-left-color: @popover-arrow-outer-fallback-color; // IE8 fallback
     border-left-color: @popover-arrow-outer-color;
     &:after {
       content: " ";
diff --git a/less/progress-bars.less b/less/progress-bars.less
index 59f81048f..6e059e934 100644
--- a/less/progress-bars.less
+++ b/less/progress-bars.less
@@ -57,9 +57,9 @@
   width: 0%;
   height: 100%;
   font-size: @font-size-small;
-  color: #fff;
+  color: @progress-bar-color;
   text-align: center;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+  text-shadow: @progress-bar-text-shadow;
   background-color: @progress-bar-bg;
   .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
   .transition(width .6s ease);
diff --git a/less/tooltip.less b/less/tooltip.less
index fef430900..819b9dffd 100644
--- a/less/tooltip.less
+++ b/less/tooltip.less
@@ -22,7 +22,7 @@
 
 // Wrapper for the tooltip content
 .tooltip-inner {
-  max-width: 200px;
+  max-width: @tooltip-max-width;
   padding: 3px 8px;
   color: @tooltip-color;
   text-align: center;
diff --git a/less/type.less b/less/type.less
index bf7ec7ec9..5c5dc5cc6 100644
--- a/less/type.less
+++ b/less/type.less
@@ -27,7 +27,7 @@ small   { font-size: 85%; }
 cite    { font-style: normal; }
 
 // Contextual emphasis
-.text-muted          { color: @gray-light; }
+.text-muted          { color: @text-muted; }
 .text-primary        { color: @brand-primary; }
 .text-warning        { color: @state-warning-text; }
 .text-danger         { color: @state-danger-text; }
@@ -51,7 +51,7 @@ h1, h2, h3, h4, h5, h6,
   small {
     font-weight: normal;
     line-height: 1;
-    color: @gray-light;
+    color: @headings-small-color;
   }
 }
 
@@ -87,7 +87,7 @@ h4 small, .h4 small { font-size: @font-size-base; }
 .page-header {
   padding-bottom: ((@line-height-computed / 2) - 1);
   margin: (@line-height-computed * 2) 0 @line-height-computed;
-  border-bottom: 1px solid @gray-lighter;
+  border-bottom: 1px solid @page-header-border-color;
 }
 
 
@@ -160,7 +160,7 @@ abbr[title],
 // Added data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
 abbr[data-original-title] {
   cursor: help;
-  border-bottom: 1px dotted @gray-light;
+  border-bottom: 1px dotted @abbr-border-color;
 }
 abbr.initialism {
   font-size: 90%;
@@ -171,7 +171,7 @@ abbr.initialism {
 blockquote {
   padding: (@line-height-computed / 2) @line-height-computed;
   margin: 0 0 @line-height-computed;
-  border-left: 5px solid @gray-lighter;
+  border-left: 5px solid @blockquote-border-color;
   p {
     font-size: (@font-size-base * 1.25);
     font-weight: 300;
@@ -183,7 +183,7 @@ blockquote {
   small {
     display: block;
     line-height: @line-height-base;
-    color: @gray-light;
+    color: @blockquote-small-color;
     &:before {
       content: '\2014 \00A0';// EM DASH, NBSP
     }
@@ -194,7 +194,7 @@ blockquote {
     float: right;
     padding-right: 15px;
     padding-left: 0;
-    border-right: 5px solid @gray-lighter;
+    border-right: 5px solid @blockquote-border-color;
     border-left: 0;
     p,
     small {
diff --git a/less/variables.less b/less/variables.less
index 2d93aceed..1be593701 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -272,6 +272,14 @@
 @pagination-bg:                        #fff;
 @pagination-border:                    #ddd;
 @pagination-active-bg:                 #f5f5f5;
+@pagination-active-color:              @gray-light;
+@pagination-disabled-color:            @gray-light;
+
+// Pager
+// -------------------------
+
+@pager-border-radius:                  15px;
+@pager-disabled-color:                 @gray-light;
 
 
 // Jumbotron
@@ -309,14 +317,21 @@
 @tooltip-arrow-width:         5px;
 @tooltip-arrow-color:         @tooltip-bg;
 
+@tooltip-max-width:           200px;
+
 @popover-bg:                  #fff;
 @popover-arrow-width:         10px;
 @popover-arrow-color:         #fff;
 @popover-title-bg:            darken(@popover-bg, 3%);
 
 // Special enhancement for popovers
-@popover-arrow-outer-width:   (@popover-arrow-width + 1);
-@popover-arrow-outer-color:   rgba(0,0,0,.25);
+@popover-arrow-outer-width:                  (@popover-arrow-width + 1);
+@popover-arrow-outer-color:                  rgba(0,0,0,.25);
+@popover-arrow-outer-fallback-color:         #999; 
+
+@popover-max-width:                 276px;
+@popover-border-color:              rgba(0,0,0,.2)
+@popover-fallback-border-color:     #ccc;
 
 
 // Labels
@@ -374,6 +389,8 @@
 @progress-bar-warning-bg:     @brand-warning;
 @progress-bar-danger-bg:      @brand-danger;
 @progress-bar-info-bg:        @brand-info;
+@progress-bar-color:          #fff;
+@progress-bar-text-shadow:    0 -1px 0 rgba(0,0,0,.25);
 
 
 // List group
@@ -481,6 +498,14 @@
 @pre-bg:                      #f5f5f5;
 @pre-border-color:            #ccc;
 
+// Type
+// ------------------------
+@text-muted:                  @gray-light;
+@abbr-border-color:           @gray-light;
+@headings-small-color:        @gray-light;
+@blockquote-small-color:      @gray-light;
+@blockquote-border-color:     @gray-lighter;
+@page-header-border-color:    @gray-lighter;
 
 // Miscellaneous
 // -------------------------