From 70e81e6f55ad77f3777e87c4edd646a2f5ac8bee Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 1 Jul 2012 08:42:09 -0700 Subject: new jumbotron --- docs/assets/css/bootstrap.css | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f0f7dd77c..e4787ae1c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -130,6 +130,7 @@ textarea { .clearfix:before, .clearfix:after { display: table; + line-height: 0; content: ""; } @@ -181,6 +182,7 @@ a:hover { .row:before, .row:after { display: table; + line-height: 0; content: ""; } @@ -303,6 +305,7 @@ a:hover { .row-fluid:before, .row-fluid:after { display: table; + line-height: 0; content: ""; } @@ -515,6 +518,7 @@ a:hover { .container:before, .container:after { display: table; + line-height: 0; content: ""; } @@ -531,6 +535,7 @@ a:hover { .container-fluid:before, .container-fluid:after { display: table; + line-height: 0; content: ""; } @@ -1331,6 +1336,7 @@ select:focus:required:invalid:focus { .form-actions:before, .form-actions:after { display: table; + line-height: 0; content: ""; } @@ -1600,6 +1606,7 @@ legend + .control-group { .form-horizontal .control-group:before, .form-horizontal .control-group:after { display: table; + line-height: 0; content: ""; } @@ -2758,9 +2765,9 @@ button.close { filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); *zoom: 1; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn:hover, @@ -2807,9 +2814,9 @@ button.close { background-color: #d9d9d9 \9; background-image: none; outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn.disabled, @@ -3029,17 +3036,17 @@ button.close { } .btn-inverse { - background-color: #414141; + background-color: #363636; *background-color: #222222; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); - background-image: -webkit-linear-gradient(top, #555555, #222222); - background-image: -o-linear-gradient(top, #555555, #222222); - background-image: linear-gradient(top, #555555, #222222); - background-image: -moz-linear-gradient(top, #555555, #222222); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222)); + background-image: -webkit-linear-gradient(top, #444444, #222222); + background-image: -o-linear-gradient(top, #444444, #222222); + background-image: linear-gradient(top, #444444, #222222); + background-image: -moz-linear-gradient(top, #444444, #222222); background-repeat: repeat-x; border-color: #222222 #222222 #000000; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff555555', endColorstr='#ff222222', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); } @@ -3468,6 +3475,7 @@ input[type="submit"].btn.btn-mini { .nav-tabs:after, .nav-pills:after { display: table; + line-height: 0; content: ""; } @@ -3641,6 +3649,7 @@ input[type="submit"].btn.btn-mini { .tabbable:before, .tabbable:after { display: table; + line-height: 0; content: ""; } @@ -3845,6 +3854,7 @@ input[type="submit"].btn.btn-mini { .navbar-form:before, .navbar-form:after { display: table; + line-height: 0; content: ""; } @@ -4373,6 +4383,7 @@ input[type="submit"].btn.btn-mini { .pager:before, .pager:after { display: table; + line-height: 0; content: ""; } @@ -4522,6 +4533,7 @@ input[type="submit"].btn.btn-mini { .modal-footer:before, .modal-footer:after { display: table; + line-height: 0; content: ""; } @@ -4814,6 +4826,7 @@ input[type="submit"].btn.btn-mini { .thumbnails:before, .thumbnails:after { display: table; + line-height: 0; content: ""; } -- cgit v1.2.3 From 62c386259b7fbd1ef665fc6baf4458c8e05ad1f8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 4 Jul 2012 23:31:30 -0700 Subject: rewrite docs homepage, new graphics --- docs/assets/css/bootstrap.css | 102 +++++++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 47 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e4787ae1c..7520a3b04 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2765,9 +2765,9 @@ button.close { filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); *zoom: 1; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn:hover, @@ -2891,17 +2891,17 @@ button.close { } .btn-primary { - background-color: #0074cc; - *background-color: #0055cc; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc)); - background-image: -webkit-linear-gradient(top, #0088cc, #0055cc); - background-image: -o-linear-gradient(top, #0088cc, #0055cc); - background-image: linear-gradient(top, #0088cc, #0055cc); - background-image: -moz-linear-gradient(top, #0088cc, #0055cc); + background-color: #006dcc; + *background-color: #0044cc; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); + background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); + background-image: -o-linear-gradient(top, #0088cc, #0044cc); + background-image: linear-gradient(top, #0088cc, #0044cc); + background-image: -moz-linear-gradient(top, #0088cc, #0044cc); background-repeat: repeat-x; - border-color: #0055cc #0055cc #003580; + border-color: #0044cc #0044cc #002a80; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0055cc', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); } @@ -2910,13 +2910,13 @@ button.close { .btn-primary.active, .btn-primary.disabled, .btn-primary[disabled] { - background-color: #0055cc; - *background-color: #004ab3; + background-color: #0044cc; + *background-color: #003bb3; } .btn-primary:active, .btn-primary.active { - background-color: #004099 \9; + background-color: #003399 \9; } .btn-warning { @@ -3233,7 +3233,7 @@ input[type="submit"].btn.btn-mini { } .btn-group.open .btn-primary.dropdown-toggle { - background-color: #0055cc; + background-color: #0044cc; } .btn-group.open .btn-warning.dropdown-toggle { @@ -3781,17 +3781,17 @@ input[type="submit"].btn.btn-mini { min-height: 40px; padding-right: 20px; padding-left: 20px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); + background-color: #1b1b1b; + background-image: -moz-linear-gradient(top, #222222, #111111); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); + background-image: -webkit-linear-gradient(top, #222222, #111111); + background-image: -o-linear-gradient(top, #222222, #111111); + background-image: linear-gradient(top, #222222, #111111); background-repeat: repeat-x; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff333333', endColorstr='#ff222222', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); @@ -3906,8 +3906,8 @@ input[type="submit"].btn.btn-mini { font-weight: normal; line-height: 1; color: #ffffff; - background-color: #626262; - border: 1px solid #151515; + background-color: #515151; + border: 1px solid #040404; -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); @@ -4032,7 +4032,7 @@ input[type="submit"].btn.btn-mini { .navbar .nav .active > a:focus { color: #ffffff; text-decoration: none; - background-color: #222222; + background-color: #111111; } .navbar .divider-vertical { @@ -4040,8 +4040,8 @@ input[type="submit"].btn.btn-mini { height: 40px; margin: 0 9px; overflow: hidden; - background-color: #222222; - border-right: 1px solid #333333; + background-color: #111111; + border-right: 1px solid #222222; } .navbar .nav.pull-right { @@ -4055,17 +4055,17 @@ input[type="submit"].btn.btn-mini { padding: 7px 10px; margin-right: 5px; margin-left: 5px; - background-color: #1f1f1f; - *background-color: #151515; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#262626), to(#151515)); - background-image: -webkit-linear-gradient(top, #262626, #151515); - background-image: -o-linear-gradient(top, #262626, #151515); - background-image: linear-gradient(top, #262626, #151515); - background-image: -moz-linear-gradient(top, #262626, #151515); + background-color: #0e0e0e; + *background-color: #040404; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); + background-image: -webkit-linear-gradient(top, #151515, #040404); + background-image: -o-linear-gradient(top, #151515, #040404); + background-image: linear-gradient(top, #151515, #040404); + background-image: -moz-linear-gradient(top, #151515, #040404); background-repeat: repeat-x; - border-color: #151515 #151515 #000000; + border-color: #040404 #040404 #000000; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff262626', endColorstr='#ff151515', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); @@ -4077,8 +4077,8 @@ input[type="submit"].btn.btn-mini { .navbar .btn-navbar.active, .navbar .btn-navbar.disabled, .navbar .btn-navbar[disabled] { - background-color: #151515; - *background-color: #080808; + background-color: #040404; + *background-color: #000000; } .navbar .btn-navbar:active, @@ -4186,20 +4186,25 @@ input[type="submit"].btn.btn-mini { .navbar-subnav .navbar-inner { padding: 0; - background-color: #f6f6f6; - background-image: -moz-linear-gradient(top, #f9f9f9, #f1f1f1); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f9f9f9), to(#f1f1f1)); - background-image: -webkit-linear-gradient(top, #f9f9f9, #f1f1f1); - background-image: -o-linear-gradient(top, #f9f9f9, #f1f1f1); - background-image: linear-gradient(top, #f9f9f9, #f1f1f1); + background-color: #f9f9f9; + background-image: -moz-linear-gradient(top, #ffffff, #f1f1f1); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f1f1f1)); + background-image: -webkit-linear-gradient(top, #ffffff, #f1f1f1); + background-image: -o-linear-gradient(top, #ffffff, #f1f1f1); + background-image: linear-gradient(top, #ffffff, #f1f1f1); background-repeat: repeat-x; border: 1px solid #e5e5e5; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff9f9f9', endColorstr='#fff1f1f1', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff1f1f1', GradientType=0); -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; } +.navbar-subnav .divider-vertical { + background-color: #f1f1f1; + border-right-color: #ffffff; +} + .navbar-subnav .nav > li > a { color: #0088cc; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); @@ -4212,7 +4217,10 @@ input[type="submit"].btn.btn-mini { .navbar-subnav .nav > .active > a, .navbar-subnav .nav > .active > a:hover { color: #777; - background-color: #e5e5e5; + background-color: #eee; + -webkit-box-shadow: -1px 0 0 rgba(255, 255, 255, 0.5), 1px 0 0 rgba(255, 255, 255, 0.5); + -moz-box-shadow: -1px 0 0 rgba(255, 255, 255, 0.5), 1px 0 0 rgba(255, 255, 255, 0.5); + box-shadow: -1px 0 0 rgba(255, 255, 255, 0.5), 1px 0 0 rgba(255, 255, 255, 0.5); } .navbar-subnav .nav li.dropdown .dropdown-toggle .caret, -- cgit v1.2.3 From a645664e503475af2b8ed6f81f6860aad188f327 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jul 2012 10:12:15 -0700 Subject: update thumbnails to fix display issues and refine aesthetics --- docs/assets/css/bootstrap.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7520a3b04..74f7094d3 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4855,14 +4855,14 @@ input[type="submit"].btn.btn-mini { .thumbnail { display: block; padding: 4px; - line-height: 1; + line-height: 20px; border: 1px solid #ddd; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); } a.thumbnail:hover { @@ -4881,6 +4881,7 @@ a.thumbnail:hover { .thumbnail .caption { padding: 9px; + color: #555555; } .label, -- cgit v1.2.3 From c6ee96c02587aeea0da52018325c100bfd45127a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jul 2012 10:37:23 -0700 Subject: fix up subnav styles, add subnav search form styles, add some basic docs for subnav --- docs/assets/css/bootstrap.css | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 74f7094d3..28a4b8467 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4185,13 +4185,12 @@ input[type="submit"].btn.btn-mini { -------------------------------------------------- */ .navbar-subnav .navbar-inner { - padding: 0; background-color: #f9f9f9; - background-image: -moz-linear-gradient(top, #ffffff, #f1f1f1); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f1f1f1)); background-image: -webkit-linear-gradient(top, #ffffff, #f1f1f1); background-image: -o-linear-gradient(top, #ffffff, #f1f1f1); background-image: linear-gradient(top, #ffffff, #f1f1f1); + background-image: -moz-linear-gradient(top, #ffffff, #f1f1f1); background-repeat: repeat-x; border: 1px solid #e5e5e5; filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff1f1f1', GradientType=0); @@ -4229,6 +4228,23 @@ input[type="submit"].btn.btn-mini { border-bottom-color: #0088cc; } +.navbar-subnav .search-query { + background-color: #fff; + border-color: #ccc; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.25); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.25); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.25); +} + +.navbar-subnav .search-query:focus, +.navbar-subnav .search-query.focused { + padding: 4px 9px; + border: 1px solid rgba(82, 168, 236, 0.8); + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); +} + .navbar-subnav .nav .open > a { color: #005580; } -- cgit v1.2.3 From 3c07eaa251b73e6c5eff4b56e074c54708a4b4ba Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jul 2012 15:11:54 -0700 Subject: updates to type scale --- docs/assets/css/bootstrap.css | 219 ++++++++++++++++++++---------------------- 1 file changed, 105 insertions(+), 114 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 28a4b8467..4ec240ba5 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -158,8 +158,8 @@ textarea { body { margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; + font-size: 14px; + line-height: 20px; color: #333333; background-color: #ffffff; } @@ -544,19 +544,19 @@ a:hover { } p { - margin: 0 0 9px; + margin: 0 0 10px; } p small { - font-size: 11px; + font-size: 12px; color: #999999; } .lead { - margin-bottom: 18px; + margin-bottom: 20px; font-size: 20px; font-weight: 200; - line-height: 27px; + line-height: 30px; } h1, @@ -565,9 +565,10 @@ h3, h4, h5, h6 { - margin: 0; + margin: 10px 0; font-family: inherit; font-weight: bold; + line-height: 1; color: inherit; text-rendering: optimizelegibility; } @@ -583,70 +584,60 @@ h6 small { } h1 { - font-size: 30px; - line-height: 36px; -} - -h1 small { - font-size: 18px; + font-size: 36px; + line-height: 40px; } h2 { - font-size: 24px; - line-height: 36px; + font-size: 30px; + line-height: 40px; } -h2 small { - font-size: 18px; +h3 { + font-size: 24px; + line-height: 40px; } -h3 { +h4 { font-size: 18px; - line-height: 27px; + line-height: 20px; } -h3 small { +h5 { font-size: 14px; + line-height: 20px; } -h4, -h5, h6 { - line-height: 18px; + font-size: 12px; + line-height: 20px; } -h4 { - font-size: 14px; +h1 small { + font-size: 24px; } -h4 small { - font-size: 12px; +h2 small { + font-size: 18px; } -h5 { - font-size: 12px; +h3 small { + font-size: 14px; } -h6 { - font-size: 11px; - color: #999999; - text-transform: uppercase; +h4 small { + font-size: 14px; } .page-header { - padding-bottom: 17px; - margin: 18px 0; + margin: 20px 0 19px; border-bottom: 1px solid #eeeeee; } -.page-header h1 { - line-height: 1; -} - ul, ol { padding: 0; - margin: 0 0 9px 25px; + margin: 0 0 10px 25px; } ul ul, @@ -665,7 +656,7 @@ ol { } li { - line-height: 18px; + line-height: 20px; } ul.unstyled, @@ -675,12 +666,12 @@ ol.unstyled { } dl { - margin-bottom: 18px; + margin-bottom: 20px; } dt, dd { - line-height: 18px; + line-height: 20px; } dt { @@ -688,7 +679,7 @@ dt { } dd { - margin-left: 9px; + margin-left: 10px; } .dl-horizontal dt { @@ -706,7 +697,7 @@ dd { } hr { - margin: 18px 0; + margin: 20px 0; border: 0; border-top: 1px solid #eeeeee; border-bottom: 1px solid #ffffff; @@ -736,7 +727,7 @@ abbr.initialism { blockquote { padding: 0 0 0 15px; - margin: 0 0 18px; + margin: 0 0 20px; border-left: 5px solid #eeeeee; } @@ -744,12 +735,12 @@ blockquote p { margin-bottom: 0; font-size: 16px; font-weight: 300; - line-height: 22.5px; + line-height: 25px; } blockquote small { display: block; - line-height: 18px; + line-height: 20px; color: #999999; } @@ -779,9 +770,9 @@ blockquote:after { address { display: block; - margin-bottom: 18px; + margin-bottom: 20px; font-style: normal; - line-height: 18px; + line-height: 20px; } small { @@ -796,7 +787,7 @@ code, pre { padding: 0 3px 2px; font-family: Menlo, Monaco, Consolas, "Courier New", monospace; - font-size: 12px; + font-size: 13px; color: #333333; -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -812,10 +803,10 @@ code { pre { display: block; - padding: 8.5px; - margin: 0 0 9px; - font-size: 12.025px; - line-height: 18px; + padding: 9.5px; + margin: 0 0 10px; + font-size: 12.950000000000001px; + line-height: 20px; word-break: break-all; word-wrap: break-word; white-space: pre; @@ -829,7 +820,7 @@ pre { } pre.prettyprint { - margin-bottom: 18px; + margin-bottom: 20px; } pre code { @@ -845,7 +836,7 @@ pre code { } form { - margin: 0 0 18px; + margin: 0 0 20px; } fieldset { @@ -858,16 +849,16 @@ legend { display: block; width: 100%; padding: 0; - margin-bottom: 27px; - font-size: 19.5px; - line-height: 36px; + margin-bottom: 30px; + font-size: 21px; + line-height: 40px; color: #333333; border: 0; border-bottom: 1px solid #e5e5e5; } legend small { - font-size: 13.5px; + font-size: 15px; color: #999999; } @@ -876,9 +867,9 @@ input, button, select, textarea { - font-size: 13px; + font-size: 14px; font-weight: normal; - line-height: 18px; + line-height: 20px; } input, @@ -911,11 +902,11 @@ input[type="tel"], input[type="color"], .uneditable-input { display: inline-block; - height: 18px; + height: 20px; padding: 4px; margin-bottom: 9px; - font-size: 13px; - line-height: 18px; + font-size: 14px; + line-height: 20px; color: #555555; -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -1325,9 +1316,9 @@ select:focus:required:invalid:focus { } .form-actions { - padding: 17px 20px 18px; - margin-top: 18px; - margin-bottom: 18px; + padding: 19px 20px 20px; + margin-top: 20px; + margin-bottom: 20px; background-color: #f5f5f5; border-top: 1px solid #e5e5e5; *zoom: 1; @@ -1377,7 +1368,7 @@ textarea::-webkit-input-placeholder { .help-block { display: block; - margin-bottom: 9px; + margin-bottom: 10px; } .help-inline { @@ -1403,7 +1394,7 @@ textarea::-webkit-input-placeholder { position: relative; margin-bottom: 0; *margin-left: 0; - font-size: 13px; + font-size: 14px; vertical-align: middle; -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; @@ -1428,12 +1419,12 @@ textarea::-webkit-input-placeholder { .input-append .add-on { display: inline-block; width: auto; - height: 18px; + height: 20px; min-width: 16px; padding: 4px 5px; - font-size: 13px; + font-size: 14px; font-weight: normal; - line-height: 18px; + line-height: 20px; text-align: center; text-shadow: 0 1px 0 #ffffff; vertical-align: middle; @@ -1590,16 +1581,16 @@ input.search-query { } .control-group { - margin-bottom: 9px; + margin-bottom: 10px; } legend + .control-group { - margin-top: 18px; + margin-top: 20px; -webkit-margin-top-collapse: separate; } .form-horizontal .control-group { - margin-bottom: 18px; + margin-bottom: 20px; *zoom: 1; } @@ -1633,7 +1624,7 @@ legend + .control-group { } .form-horizontal .help-block { - margin-top: 9px; + margin-top: 10px; margin-bottom: 0; } @@ -1650,13 +1641,13 @@ table { .table { width: 100%; - margin-bottom: 18px; + margin-bottom: 20px; } .table th, .table td { padding: 8px; - line-height: 18px; + line-height: 20px; text-align: left; vertical-align: top; border-top: 1px solid #dddddd; @@ -2569,7 +2560,7 @@ table .span24 { .dropdown-menu .divider { *width: 100%; height: 1px; - margin: 8px 1px; + margin: 9px 1px; *margin: -5px 0 5px; overflow: hidden; background-color: #e5e5e5; @@ -2581,7 +2572,7 @@ table .span24 { padding: 3px 15px; clear: both; font-weight: normal; - line-height: 18px; + line-height: 20px; color: #333333; white-space: nowrap; } @@ -2709,7 +2700,7 @@ table .span24 { float: right; font-size: 20px; font-weight: bold; - line-height: 18px; + line-height: 20px; color: #000000; text-shadow: 0 1px 0 #ffffff; opacity: 0.2; @@ -2738,8 +2729,8 @@ button.close { padding: 4px 10px 4px; margin-bottom: 0; *margin-left: .3em; - font-size: 13px; - line-height: 18px; + font-size: 14px; + line-height: 20px; *line-height: 20px; color: #333333; text-align: center; @@ -2833,7 +2824,7 @@ button.close { .btn-large { padding: 9px 14px; - font-size: 15px; + font-size: 16px; line-height: normal; -webkit-border-radius: 5px; -moz-border-radius: 5px; @@ -2846,8 +2837,8 @@ button.close { .btn-small { padding: 5px 9px; - font-size: 11px; - line-height: 16px; + font-size: 12px; + line-height: 18px; } .btn-small [class^="icon-"] { @@ -2856,8 +2847,8 @@ button.close { .btn-mini { padding: 2px 6px; - font-size: 11px; - line-height: 14px; + font-size: 12px; + line-height: 16px; } .btn-primary, @@ -3110,8 +3101,8 @@ input[type="submit"].btn.btn-mini { } .btn-toolbar { - margin-top: 9px; - margin-bottom: 9px; + margin-top: 10px; + margin-bottom: 10px; } .btn-toolbar .btn-group { @@ -3132,16 +3123,16 @@ input[type="submit"].btn.btn-mini { .btn-group > .btn, .btn-group > .dropdown-menu { - font-size: 13px; + font-size: 14px; } .btn-group > .btn-mini, .btn-group > .btn-small { - font-size: 11px; + font-size: 12px; } .btn-group > .btn-large { - font-size: 15px; + font-size: 16px; } .btn-group > .btn:first-child { @@ -3343,7 +3334,7 @@ input[type="submit"].btn.btn-mini { .alert { padding: 8px 35px 8px 14px; - margin-bottom: 18px; + margin-bottom: 20px; color: #c09853; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); background-color: #fcf8e3; @@ -3357,7 +3348,7 @@ input[type="submit"].btn.btn-mini { position: relative; top: -2px; right: -21px; - line-height: 18px; + line-height: 20px; } .alert-success { @@ -3394,7 +3385,7 @@ input[type="submit"].btn.btn-mini { } .nav { - margin-bottom: 18px; + margin-bottom: 20px; margin-left: 0; list-style: none; } @@ -3417,7 +3408,7 @@ input[type="submit"].btn.btn-mini { padding: 3px 15px; font-size: 11px; font-weight: bold; - line-height: 18px; + line-height: 20px; color: #999999; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); text-transform: uppercase; @@ -3458,7 +3449,7 @@ input[type="submit"].btn.btn-mini { .nav-list .divider { *width: 100%; height: 1px; - margin: 8px 1px; + margin: 9px 1px; *margin: -5px 0 5px; overflow: hidden; background-color: #e5e5e5; @@ -3508,7 +3499,7 @@ input[type="submit"].btn.btn-mini { .nav-tabs > li > a { padding-top: 8px; padding-bottom: 8px; - line-height: 18px; + line-height: 20px; border: 1px solid transparent; -webkit-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; @@ -3773,7 +3764,7 @@ input[type="submit"].btn.btn-mini { .navbar { *position: relative; *z-index: 2; - margin-bottom: 18px; + margin-bottom: 20px; overflow: visible; } @@ -3997,7 +3988,7 @@ input[type="submit"].btn.btn-mini { .navbar .nav > li > a { float: none; - padding: 10px 12px 11px; + padding: 10px 15px 11px; line-height: 19px; color: #999999; text-decoration: none; @@ -4012,7 +4003,7 @@ input[type="submit"].btn.btn-mini { display: inline-block; padding: 4px 10px 4px; margin: 5px 5px 6px; - line-height: 18px; + line-height: 20px; } .navbar .btn-group { @@ -4285,7 +4276,7 @@ input[type="submit"].btn.btn-mini { .breadcrumb { padding: 7px 14px; - margin: 0 0 18px; + margin: 0 0 20px; list-style: none; background-color: #fbfbfb; background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); @@ -4321,8 +4312,8 @@ input[type="submit"].btn.btn-mini { } .pagination { - height: 36px; - margin: 18px 0; + height: 40px; + margin: 20px 0; } .pagination ul { @@ -4347,7 +4338,7 @@ input[type="submit"].btn.btn-mini { .pagination span { float: left; padding: 0 14px; - line-height: 34px; + line-height: 38px; text-decoration: none; border: 1px solid #ddd; border-left-width: 0; @@ -4397,7 +4388,7 @@ input[type="submit"].btn.btn-mini { } .pager { - margin-bottom: 18px; + margin-bottom: 20px; margin-left: 0; text-align: center; list-style: none; @@ -4864,7 +4855,7 @@ input[type="submit"].btn.btn-mini { .thumbnails > li { float: left; - margin-bottom: 18px; + margin-bottom: 20px; margin-left: 20px; } @@ -4902,7 +4893,7 @@ a.thumbnail:hover { .label, .badge { - font-size: 10.998px; + font-size: 11.844px; font-weight: bold; line-height: 14px; color: #ffffff; @@ -5177,7 +5168,7 @@ a.badge:hover { } .accordion { - margin-bottom: 18px; + margin-bottom: 20px; } .accordion-group { @@ -5208,7 +5199,7 @@ a.badge:hover { .carousel { position: relative; - margin-bottom: 18px; + margin-bottom: 20px; line-height: 1; } @@ -5338,7 +5329,7 @@ a.badge:hover { .hero-unit p { font-size: 18px; font-weight: 200; - line-height: 27px; + line-height: 30px; color: inherit; } -- cgit v1.2.3 From 68146db00454b46493545aff34d06cf2c11e0f6d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jul 2012 15:15:57 -0700 Subject: buttons and pre updates for font-size --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 4ec240ba5..329618b05 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -786,7 +786,7 @@ cite { code, pre { padding: 0 3px 2px; - font-family: Menlo, Monaco, Consolas, "Courier New", monospace; + font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 13px; color: #333333; -webkit-border-radius: 3px; @@ -2726,7 +2726,7 @@ button.close { .btn { display: inline-block; *display: inline; - padding: 4px 10px 4px; + padding: 4px 14px 4px; margin-bottom: 0; *margin-left: .3em; font-size: 14px; -- cgit v1.2.3