Merge branch 'master' of github.com:twbs/bootstrap

833c208b · Mark Otto · e71a85a5 · 1e1af868 · 833c208b · 833c208b
Commit 833c208b authored 11 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 8 additions and 7 deletions
+8 -7
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -213,9 +213,6 @@ table {
  img {
    max-width: 100% !important;
  }
-  @page {
-    margin: 2cm .5cm;
-  }
  p,
  h2,
  h3 {
@@ -232,6 +229,10 @@ table {
  .navbar {
    display: none;
  }
+  @page {
+    margin-top: 2cm;
+    margin-bottom: 2cm;
+  }
  .table td,
  .table th {
    background-color: #fff !important;

--- a/less/print.less
+++ b/less/print.less
@@ -50,10 +50,6 @@
    max-width: 100% !important;
  }

-  @page {
-    margin: 2cm .5cm;
-  }
-
  p,
  h2,
  h3 {
@@ -76,6 +72,10 @@
  .navbar {
    display: none;
  }
+  @page {
+    margin-top:    2cm;
+    margin-bottom: 2cm;
+  }
  .table {
    td,
    th {