Merge branch 'master' into sr_friendly_hidden_content

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

1 files changed, 12 insertions, 14 deletions

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;
     }
   }
-
 }