diff options
| author | Mark Otto <[email protected]> | 2013-12-11 22:39:03 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-11 22:39:03 -0800 |
| commit | 4fc2907723e7f7bb5b14eb5cec94d629b6834e7f (patch) | |
| tree | a9c1df41fbf5f912234f762f03668ea4ef9fd2b7 /less/jumbotron.less | |
| parent | 0e8baab34ae21c813afb9d8c24b3cb2105aebc46 (diff) | |
| parent | 9966d035cd35c510369286cbb645340bdd6ffc95 (diff) | |
| download | bootstrap-4fc2907723e7f7bb5b14eb5cec94d629b6834e7f.tar.xz bootstrap-4fc2907723e7f7bb5b14eb5cec94d629b6834e7f.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs-assets/css/docs.css
docs-assets/js/application.js
Diffstat (limited to 'less/jumbotron.less')
| -rw-r--r-- | less/jumbotron.less | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/less/jumbotron.less b/less/jumbotron.less index 22c29780a..0460b69d4 100644 --- a/less/jumbotron.less +++ b/less/jumbotron.less @@ -12,7 +12,8 @@ color: @jumbotron-color; background-color: @jumbotron-bg; - h1 { + h1, + .h1 { line-height: 1; color: @jumbotron-heading-color; } @@ -24,6 +25,10 @@ border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container } + .container { + max-width: 100%; + } + @media screen and (min-width: @screen-sm-min) { padding-top: (@jumbotron-padding * 1.6); padding-bottom: (@jumbotron-padding * 1.6); @@ -33,7 +38,8 @@ padding-right: (@jumbotron-padding * 2); } - h1 { + h1, + .h1 { font-size: (@font-size-base * 4.5); } } |