diff options
| author | Mark Otto <[email protected]> | 2014-01-22 21:20:06 -0600 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-22 21:20:06 -0600 |
| commit | 833c208bf5e88e438ae1eb360782b2364cd03915 (patch) | |
| tree | 64c0bfb40a88666629c0490b393896a7a50af6dd | |
| parent | e71a85a525da06100a4b3882fcb95909454c5dca (diff) | |
| parent | 1e1af8687d7cc892577c58957e929c311173c09b (diff) | |
| download | bootstrap-833c208bf5e88e438ae1eb360782b2364cd03915.tar.xz bootstrap-833c208bf5e88e438ae1eb360782b2364cd03915.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
| -rw-r--r-- | dist/css/bootstrap.css | 7 | ||||
| -rw-r--r-- | less/print.less | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 4787aac6c..a86aae0d1 100644 --- 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; diff --git a/less/print.less b/less/print.less index 07277a3ca..215808853 100644 --- 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 { |