0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-21 18:54:30 +01:00

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

This commit is contained in:
Mark Otto 2014-01-22 21:20:06 -06:00
commit 833c208bf5
2 changed files with 8 additions and 7 deletions

View File

@ -213,9 +213,6 @@ table {
img { img {
max-width: 100% !important; max-width: 100% !important;
} }
@page {
margin: 2cm .5cm;
}
p, p,
h2, h2,
h3 { h3 {
@ -232,6 +229,10 @@ table {
.navbar { .navbar {
display: none; display: none;
} }
@page {
margin-top: 2cm;
margin-bottom: 2cm;
}
.table td, .table td,
.table th { .table th {
background-color: #fff !important; background-color: #fff !important;

View File

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