diff options
| author | Mark Otto <[email protected]> | 2013-12-04 21:23:09 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-04 21:23:09 -0800 |
| commit | cf81cb60ef9e29fd5b97c7a7d213dbf80cad0be6 (patch) | |
| tree | 9d05ca6eb1fb77bb9b854d37c7ed5d178c02d0a9 /dist/css/bootstrap.css | |
| parent | 3f1e4b92eefaee617115973eba98fc7cc0905ab8 (diff) | |
| parent | 8c5dc542a553d93d4ee26db176e515f5164be8a7 (diff) | |
| download | bootstrap-cf81cb60ef9e29fd5b97c7a7d213dbf80cad0be6.tar.xz bootstrap-cf81cb60ef9e29fd5b97c7a7d213dbf80cad0be6.zip | |
Merge branch 'master' into gradient-prefix-cleanup
Conflicts:
dist/css/bootstrap.min.css
docs-assets/js/raw-files.js
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 79 |
1 files changed, 76 insertions, 3 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index da5ca4c7b..377dff300 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2622,8 +2622,7 @@ fieldset[disabled] .btn-link:focus { border-radius: 6px; } -.btn-sm, -.btn-xs { +.btn-sm { padding: 5px 10px; font-size: 12px; line-height: 1.5; @@ -2632,6 +2631,9 @@ fieldset[disabled] .btn-link:focus { .btn-xs { padding: 1px 5px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; } .btn-block { @@ -3754,7 +3756,6 @@ input[type="button"].btn-block { } .btn-group-xs > .btn { - padding: 5px 10px; padding: 1px 5px; font-size: 12px; line-height: 1.5; @@ -5709,6 +5710,11 @@ a.list-group-item.active:focus .list-group-item-text { border-bottom: 0; } +.panel > .table-responsive { + margin-bottom: 0; + border: 0; +} + .panel-heading { padding: 10px 15px; border-bottom: 1px solid transparent; @@ -6597,6 +6603,9 @@ td.visible-xs { .visible-xs { display: block !important; } + table.visible-xs { + display: table; + } tr.visible-xs { display: table-row !important; } @@ -6610,6 +6619,9 @@ td.visible-xs { .visible-xs.visible-sm { display: block !important; } + table.visible-xs.visible-sm { + display: table; + } tr.visible-xs.visible-sm { display: table-row !important; } @@ -6623,6 +6635,9 @@ td.visible-xs { .visible-xs.visible-md { display: block !important; } + table.visible-xs.visible-md { + display: table; + } tr.visible-xs.visible-md { display: table-row !important; } @@ -6636,6 +6651,9 @@ td.visible-xs { .visible-xs.visible-lg { display: block !important; } + table.visible-xs.visible-lg { + display: table; + } tr.visible-xs.visible-lg { display: table-row !important; } @@ -6656,6 +6674,9 @@ td.visible-sm { .visible-sm.visible-xs { display: block !important; } + table.visible-sm.visible-xs { + display: table; + } tr.visible-sm.visible-xs { display: table-row !important; } @@ -6669,6 +6690,9 @@ td.visible-sm { .visible-sm { display: block !important; } + table.visible-sm { + display: table; + } tr.visible-sm { display: table-row !important; } @@ -6682,6 +6706,9 @@ td.visible-sm { .visible-sm.visible-md { display: block !important; } + table.visible-sm.visible-md { + display: table; + } tr.visible-sm.visible-md { display: table-row !important; } @@ -6695,6 +6722,9 @@ td.visible-sm { .visible-sm.visible-lg { display: block !important; } + table.visible-sm.visible-lg { + display: table; + } tr.visible-sm.visible-lg { display: table-row !important; } @@ -6715,6 +6745,9 @@ td.visible-md { .visible-md.visible-xs { display: block !important; } + table.visible-md.visible-xs { + display: table; + } tr.visible-md.visible-xs { display: table-row !important; } @@ -6728,6 +6761,9 @@ td.visible-md { .visible-md.visible-sm { display: block !important; } + table.visible-md.visible-sm { + display: table; + } tr.visible-md.visible-sm { display: table-row !important; } @@ -6741,6 +6777,9 @@ td.visible-md { .visible-md { display: block !important; } + table.visible-md { + display: table; + } tr.visible-md { display: table-row !important; } @@ -6754,6 +6793,9 @@ td.visible-md { .visible-md.visible-lg { display: block !important; } + table.visible-md.visible-lg { + display: table; + } tr.visible-md.visible-lg { display: table-row !important; } @@ -6774,6 +6816,9 @@ td.visible-lg { .visible-lg.visible-xs { display: block !important; } + table.visible-lg.visible-xs { + display: table; + } tr.visible-lg.visible-xs { display: table-row !important; } @@ -6787,6 +6832,9 @@ td.visible-lg { .visible-lg.visible-sm { display: block !important; } + table.visible-lg.visible-sm { + display: table; + } tr.visible-lg.visible-sm { display: table-row !important; } @@ -6800,6 +6848,9 @@ td.visible-lg { .visible-lg.visible-md { display: block !important; } + table.visible-lg.visible-md { + display: table; + } tr.visible-lg.visible-md { display: table-row !important; } @@ -6813,6 +6864,9 @@ td.visible-lg { .visible-lg { display: block !important; } + table.visible-lg { + display: table; + } tr.visible-lg { display: table-row !important; } @@ -6826,6 +6880,10 @@ td.visible-lg { display: block !important; } +table.hidden-xs { + display: table; +} + tr.hidden-xs { display: table-row !important; } @@ -6875,6 +6933,10 @@ td.hidden-xs { display: block !important; } +table.hidden-sm { + display: table; +} + tr.hidden-sm { display: table-row !important; } @@ -6924,6 +6986,10 @@ td.hidden-sm { display: block !important; } +table.hidden-md { + display: table; +} + tr.hidden-md { display: table-row !important; } @@ -6973,6 +7039,10 @@ td.hidden-md { display: block !important; } +table.hidden-lg { + display: table; +} + tr.hidden-lg { display: table-row !important; } @@ -7029,6 +7099,9 @@ td.visible-print { .visible-print { display: block !important; } + table.visible-print { + display: table; + } tr.visible-print { display: table-row !important; } |
