2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00

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

This commit is contained in:
Mark Otto
2013-10-13 20:04:00 -07:00
3 changed files with 6 additions and 8 deletions
+1 -1
View File
@@ -6,7 +6,7 @@
.jumbotron {
padding: @jumbotron-padding;
margin-bottom: @jumbotron-padding;
font-size: (@font-size-base * 1.5);
font-size: @jumbotron-font-size;
font-weight: 200;
line-height: (@line-height-base * 1.5);
color: @jumbotron-color;
+1 -1
View File
@@ -368,8 +368,8 @@
@jumbotron-padding: 30px;
@jumbotron-color: inherit;
@jumbotron-bg: @gray-lighter;
@jumbotron-heading-color: inherit;
@jumbotron-font-size: ceil(@font-size-base * 1.50);
// Form states and alerts