Merge branch 'master' into sr_friendly_hidden_content

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css

7 files changed, 24 insertions, 30 deletions

diff --git a/less/dropdowns.less b/less/dropdowns.less
index 3eb7fc05c..742c91265 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -103,9 +103,8 @@
   &:focus {
     color: @dropdown-link-disabled-color;
   }
-}
-// Nuke hover/focus effects
-.dropdown-menu > .disabled > a {
+
+  // Nuke hover/focus effects
   &:hover,
   &:focus {
     text-decoration: none;
@@ -212,4 +211,3 @@
     }
   }
 }
-
diff --git a/less/list-group.less b/less/list-group.less
index 7d857cfd3..1e62d3b94 100644
--- a/less/list-group.less
+++ b/less/list-group.less
@@ -75,7 +75,7 @@ a.list-group-item {
     background-color: @list-group-disabled-bg;
     color: @list-group-disabled-color;
     cursor: not-allowed;
-    
+
     // Force color to inherit for custom content
     .list-group-item-heading {
       color: inherit;
diff --git a/less/mixins/labels.less b/less/mixins/labels.less
index 6f9e490b8..9f7a67ee3 100644
--- a/less/mixins/labels.less
+++ b/less/mixins/labels.less
@@ -2,7 +2,7 @@
 
 .label-variant(@color) {
   background-color: @color;
-  
+
   &[href] {
     &:hover,
     &:focus {
diff --git a/less/pager.less b/less/pager.less
index 59103f445..73a660d64 100644
--- a/less/pager.less
+++ b/less/pager.less
@@ -51,5 +51,4 @@
       cursor: not-allowed;
     }
   }
-
 }
diff --git a/less/popovers.less b/less/popovers.less
index bf6af40a0..ab720f2fb 100644
--- a/less/popovers.less
+++ b/less/popovers.less
@@ -11,7 +11,11 @@
   display: none;
   max-width: @popover-max-width;
   padding: 1px;
-  text-align: left; // Reset given new insertion method
+  // Reset font and text propertes given new insertion method
+  font-size: @font-size-base;
+  font-weight: normal;
+  line-height: @line-height-base;
+  text-align: left;
   background-color: @popover-bg;
   background-clip: padding-box;
   border: 1px solid @popover-fallback-border-color;
@@ -33,8 +37,6 @@
   margin: 0; // reset heading margin
   padding: 8px 14px;
   font-size: @font-size-base;
-  font-weight: normal;
-  line-height: 18px;
   background-color: @popover-title-bg;
   border-bottom: 1px solid darken(@popover-title-bg, 5%);
   border-radius: (@border-radius-large - 1) (@border-radius-large - 1) 0 0;
@@ -129,5 +131,4 @@
       bottom: -@popover-arrow-width;
     }
   }
-
 }
diff --git a/less/print.less b/less/print.less
index 3655d0395..a5acd82d4 100644
--- a/less/print.less
+++ b/less/print.less
@@ -1,15 +1,14 @@
 //
 // Basic print styles
 // --------------------------------------------------
-// Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css
+// Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css
 
 @media print {
-
   * {
-    text-shadow: none !important;
-    color: #000 !important; // Black prints faster: h5bp.com/s
     background: transparent !important;
+    color: #000 !important; // Black prints faster: h5bp.com/s
     box-shadow: none !important;
+    text-shadow: none !important;
   }
 
   a,
@@ -25,9 +24,10 @@
     content: " (" attr(title) ")";
   }
 
-  // Don't show links for images, or javascript/internal links
-  a[href^="javascript:"]:after,
-  a[href^="#"]:after {
+  // Don't show links that are fragment identifiers,
+  // or use the `javascript:` pseudo protocol
+  a[href^="#"]:after,
+  a[href^="javascript:"]:after {
     content: "";
   }
 
@@ -72,12 +72,6 @@
   .navbar {
     display: none;
   }
-  .table {
-    td,
-    th {
-      background-color: #fff !important;
-    }
-  }
   .btn,
   .dropup > .btn {
     > .caret {
@@ -90,6 +84,11 @@
 
   .table {
     border-collapse: collapse !important;
+
+    td,
+    th {
+      background-color: #fff !important;
+    }
   }
   .table-bordered {
     th,
@@ -97,5 +96,4 @@
       border: 1px solid #ddd !important;
     }
   }
-
 }
diff --git a/less/variables.less b/less/variables.less
index 0d354d16a..48b983456 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -369,12 +369,12 @@
 
 // Inverted navbar
 // Reset inverted navbar basics
-@navbar-inverse-color:                      lighten(@gray-light, 12%);
+@navbar-inverse-color:                      lighten(@gray-light, 15%);
 @navbar-inverse-bg:                         #222;
 @navbar-inverse-border:                     darken(@navbar-inverse-bg, 10%);
 
 // Inverted navbar links
-@navbar-inverse-link-color:                 @gray-light;
+@navbar-inverse-link-color:                 lighten(@gray-light, 15%);
 @navbar-inverse-link-hover-color:           #fff;
 @navbar-inverse-link-hover-bg:              transparent;
 @navbar-inverse-link-active-color:          @navbar-inverse-link-hover-color;
@@ -528,7 +528,7 @@
 //** Popover arrow width
 @popover-arrow-width:                 10px;
 //** Popover arrow color
-@popover-arrow-color:                 #fff;
+@popover-arrow-color:                 @popover-bg;
 
 //** Popover outer arrow width
 @popover-arrow-outer-width:           (@popover-arrow-width + 1);
@@ -841,5 +841,3 @@
 @dl-horizontal-offset:        @component-offset-horizontal;
 //** Horizontal line color.
 @hr-border:                   @gray-lighter;
-
-