mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00
Code Activity

Fixes #14979: Override .jumbotron padding within .container-fluid to match .container

Browse Source
This commit is contained in:
Mark Otto
2014-11-07 23:01:20 -08:00
parent 2862c30320
commit 8fbb2bbbd1
9 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/css/bootstrap.css
Vendored
+2 -1
View File
@@ -4675,7 +4675,8 @@ a.list-group-item.active > .badge,
.jumbotron { .jumbotron {
padding: 48px 0; padding: 48px 0;
} }
.container .jumbotron { .container .jumbotron,
.container-fluid .jumbotron {
padding-right: 60px; padding-right: 60px;
padding-left: 60px; padding-left: 60px;
} }
dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/js/customize.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/js/raw-files.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.css
Vendored
+2 -1
View File
@@ -4675,7 +4675,8 @@ a.list-group-item.active > .badge,
.jumbotron { .jumbotron {
padding: 48px 0; padding: 48px 0;
} }
.container .jumbotron { .container .jumbotron,
.container-fluid .jumbotron {
padding-right: 60px; padding-right: 60px;
padding-left: 60px; padding-left: 60px;
} }
docs/dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
less/jumbotron.less
+2 -1
View File
@@ -35,7 +35,8 @@
@media screen and (min-width: @screen-sm-min) { @media screen and (min-width: @screen-sm-min) {
padding: (@jumbotron-padding * 1.6) 0; padding: (@jumbotron-padding * 1.6) 0;
.container & { .container &,
.container-fluid & {
padding-left: (@jumbotron-padding * 2); padding-left: (@jumbotron-padding * 2);
padding-right: (@jumbotron-padding * 2); padding-right: (@jumbotron-padding * 2);
} }