From f61fe3c4746ec09ff64756797fe6314be5f53b30 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 9 Oct 2011 21:13:26 -0700 Subject: refactor fluid layout to be more specific to not interfere with modal content while adding right sidebar option --- bootstrap.css | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index ab96f6c7c..8022cf2a0 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Tue Oct 4 01:15:08 PDT 2011 + * Date: Sun Oct 9 21:12:03 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -205,29 +205,38 @@ body { .container:after { clear: both; } -.container-fluid { +.fluid-container { position: relative; min-width: 940px; padding-left: 20px; padding-right: 20px; zoom: 1; } -.container-fluid:before, .container-fluid:after { +.fluid-container:before, .fluid-container:after { display: table; content: ""; zoom: 1; *display: inline; } -.container-fluid:after { +.fluid-container:after { clear: both; } -.container-fluid > .sidebar { - float: left; +.fluid-sidebar-left, .fluid-sidebar-right { width: 220px; } -.container-fluid > .content { +.fluid-sidebar-left { + float: left; +} +.fluid-sidebar-right { + float: right; +} +.fluid-content { margin-left: 240px; } +.fluid-container.reverse .fluid-content { + margin-left: 0; + margin-right: 240px; +} a { color: #0069d6; text-decoration: none; @@ -1142,19 +1151,12 @@ table .headerSortUp.purple, table .headerSortDown.purple { background-color: transparent; color: #ffffff; } -.topbar form { - float: left; - margin: 5px 0 0 0; +.topbar .form-search { position: relative; - filter: alpha(opacity=100); - -khtml-opacity: 1; - -moz-opacity: 1; - opacity: 1; -} -.topbar form.pull-right { - float: right; + margin-top: 5px; + margin-bottom: 0; } -.topbar input { +.topbar .form-search input { background-color: #444; background-color: rgba(255, 255, 255, 0.3); font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -1177,18 +1179,18 @@ table .headerSortUp.purple, table .headerSortDown.purple { -o-transition: none; transition: none; } -.topbar input:-moz-placeholder { +.topbar .form-search input:-moz-placeholder { color: #e6e6e6; } -.topbar input::-webkit-input-placeholder { +.topbar .form-search input::-webkit-input-placeholder { color: #e6e6e6; } -.topbar input:hover { +.topbar .form-search input:hover { background-color: #bfbfbf; background-color: rgba(255, 255, 255, 0.5); color: #ffffff; } -.topbar input:focus, .topbar input.focused { +.topbar .form-search input:focus, .topbar .form-search input.focused { outline: 0; background-color: #ffffff; color: #404040; @@ -1199,6 +1201,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); } +.topbar .pull-right { + float: right; +} .topbar-inner { background-color: #222; background-color: #222222; -- cgit v1.2.3 From dd1efdf0d5ec2469978a65c845cc5dfd16b74899 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 9 Oct 2011 21:25:28 -0700 Subject: update input prepend and append to use baseline variable --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 8022cf2a0..cd7409198 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Oct 9 21:12:03 PDT 2011 + * Date: Sun Oct 9 21:24:37 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). -- cgit v1.2.3 From 8ba005d38dd7a79ea3e90efb6efc7ac9ebcadc26 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 11 Oct 2011 09:44:51 -0700 Subject: new navbar introduced to replace topbar --- bootstrap.css | 84 ++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 36 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index cd7409198..728590ba2 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Oct 9 21:24:37 PDT 2011 + * Date: Tue Oct 11 09:43:00 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1114,26 +1114,37 @@ table .headerSortUp.purple, table .headerSortDown.purple { /* Patterns.less * Repeatable UI elements outside the base styles provided from the scaffolding * ---------------------------------------------------------------------------- */ -.topbar { +.navbar { height: 40px; - position: fixed; - top: 0; - left: 0; - right: 0; - z-index: 10000; overflow: visible; } -.topbar a { +.navbar-inner { + background-color: #222222; + background-color: #222222; + background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222)); + background-image: -moz-linear-gradient(top, #333333, #222222); + background-image: -ms-linear-gradient(top, #333333, #222222); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #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-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', 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); +} +.navbar a { color: #bfbfbf; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } -.topbar .brand a:hover, .topbar ul .active > a { - background-color: #333; +.navbar .brand a:hover, .navbar ul .active > a { + background-color: #333333; background-color: rgba(255, 255, 255, 0.05); color: #ffffff; text-decoration: none; } -.topbar .brand { +.navbar .brand { float: left; display: block; padding: 8px 20px 12px; @@ -1143,20 +1154,21 @@ table .headerSortUp.purple, table .headerSortDown.purple { font-weight: 200; line-height: 1; } -.topbar p { +.navbar p { margin: 0; line-height: 40px; } -.topbar p a:hover { +.navbar p a:hover { background-color: transparent; color: #ffffff; } -.topbar .form-search { +.navbar-search { position: relative; margin-top: 5px; margin-bottom: 0; + float: left; } -.topbar .form-search input { +.navbar-search input { background-color: #444; background-color: rgba(255, 255, 255, 0.3); font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -1179,18 +1191,18 @@ table .headerSortUp.purple, table .headerSortDown.purple { -o-transition: none; transition: none; } -.topbar .form-search input:-moz-placeholder { +.navbar-search input:-moz-placeholder { color: #e6e6e6; } -.topbar .form-search input::-webkit-input-placeholder { +.navbar-search input::-webkit-input-placeholder { color: #e6e6e6; } -.topbar .form-search input:hover { +.navbar-search input:hover { background-color: #bfbfbf; background-color: rgba(255, 255, 255, 0.5); color: #ffffff; } -.topbar .form-search input:focus, .topbar .form-search input.focused { +.navbar-search input:focus, .navbar-search input.focused { outline: 0; background-color: #ffffff; color: #404040; @@ -1201,24 +1213,24 @@ table .headerSortUp.purple, table .headerSortDown.purple { -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); } -.topbar .pull-right { - float: right; +.navbar-static { + margin-bottom: 18px; } -.topbar-inner { - background-color: #222; - background-color: #222222; - background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222)); - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #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-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', 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); +.navbar-static .navbar-inner { + margin-left: -20px; + margin-right: -20px; + padding-left: 20px; + padding-right: 20px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.navbar-fixed { + position: fixed; + top: 0; + left: 0; + right: 0; + z-index: 10000; } .nav { display: block; -- cgit v1.2.3 From b6443905411dcdcec54d7eaad2f998a582271728 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 11 Oct 2011 09:52:50 -0700 Subject: update navbar search form --- bootstrap.css | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 728590ba2..0da6a96ec 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Tue Oct 11 09:43:00 PDT 2011 + * Date: Tue Oct 11 09:52:07 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1164,11 +1164,11 @@ table .headerSortUp.purple, table .headerSortDown.purple { } .navbar-search { position: relative; - margin-top: 5px; + margin-top: 6px; margin-bottom: 0; float: left; } -.navbar-search input { +.navbar-search .search-query { background-color: #444; background-color: rgba(255, 255, 255, 0.3); font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -1179,30 +1179,27 @@ table .headerSortUp.purple, table .headerSortDown.purple { color: #ffffff; color: rgba(255, 255, 255, 0.75); border: 1px solid #111; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25); + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); -webkit-transition: none; -moz-transition: none; -ms-transition: none; -o-transition: none; transition: none; } -.navbar-search input:-moz-placeholder { +.navbar-search .search-query:-moz-placeholder { color: #e6e6e6; } -.navbar-search input::-webkit-input-placeholder { +.navbar-search .search-query::-webkit-input-placeholder { color: #e6e6e6; } -.navbar-search input:hover { +.navbar-search .search-query:hover { background-color: #bfbfbf; background-color: rgba(255, 255, 255, 0.5); color: #ffffff; } -.navbar-search input:focus, .navbar-search input.focused { +.navbar-search .search-query:focus, .navbar-search .search-query.focused { outline: 0; background-color: #ffffff; color: #404040; -- cgit v1.2.3 From fa8b1dc12dcfe993f1e4185f95ebe0981fbeb0f0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 11 Oct 2011 19:31:25 -0700 Subject: remove color scheme variables, remove font-face mixin --- bootstrap.css | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 106 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 0da6a96ec..d40c50c84 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Tue Oct 11 09:52:07 PDT 2011 + * Date: Tue Oct 11 19:31:11 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -551,6 +551,9 @@ code, pre { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } code { background-color: #fee9cc; @@ -569,6 +572,9 @@ pre { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; white-space: pre; white-space: pre-wrap; word-wrap: break-word; @@ -620,6 +626,9 @@ select, -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } /* Mini reset for unique input types */ input[type=checkbox], input[type=radio] { @@ -814,6 +823,9 @@ textarea[readonly] { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .has-error > label, .has-error span.help-inline, .has-error span.help-block { color: #9d261d; @@ -895,6 +907,9 @@ textarea[readonly] { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .input-prepend .add-on, .input-append .add-on { position: relative; @@ -916,6 +931,9 @@ textarea[readonly] { -webkit-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .input-prepend .active, .input-append .active { background: #a9dba9; @@ -931,11 +949,17 @@ textarea[readonly] { -webkit-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .input-append .add-on { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; margin-right: 0; margin-left: -1px; } @@ -943,6 +967,9 @@ textarea[readonly] { -webkit-border-radius: 14px; -moz-border-radius: 14px; border-radius: 14px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .control-group { margin-bottom: 18px; @@ -982,6 +1009,9 @@ table { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } table th, table td { padding: 10px 10px 9px; @@ -1007,21 +1037,33 @@ table tbody tr:first-child td:first-child { -webkit-border-radius: 4px 0 0 0; -moz-border-radius: 4px 0 0 0; border-radius: 4px 0 0 0; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } table tbody tr:first-child td:last-child { -webkit-border-radius: 0 4px 0 0; -moz-border-radius: 0 4px 0 0; border-radius: 0 4px 0 0; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } table tbody tr:last-child td:first-child { -webkit-border-radius: 0 0 0 4px; -moz-border-radius: 0 0 0 4px; border-radius: 0 0 0 4px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } table tbody tr:last-child td:last-child { -webkit-border-radius: 0 0 4px 0; -moz-border-radius: 0 0 4px 0; border-radius: 0 0 4px 0; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .zebra-striped tbody tr:nth-child(odd) td { background-color: #f9f9f9; @@ -1221,6 +1263,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .navbar-fixed { position: fixed; @@ -1352,6 +1397,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 0 0 6px 6px; -moz-border-radius: 0 0 6px 6px; border-radius: 0 0 6px 6px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); @@ -1446,6 +1494,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .tabs > li > a:hover { text-decoration: none; @@ -1464,6 +1515,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 0 6px 6px 6px; -moz-border-radius: 0 6px 6px 6px; border-radius: 0 6px 6px 6px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .tabs .dropdown-toggle:after { border-top-color: #999; @@ -1487,6 +1541,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 15px; -moz-border-radius: 15px; border-radius: 15px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .pills a:hover { background: #00438a; @@ -1522,6 +1579,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; -webkit-box-shadow: inset 0 1px 0 #ffffff; -moz-box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff; @@ -1544,6 +1604,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .hero-unit h1 { margin-bottom: 0; @@ -1659,6 +1722,9 @@ footer { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; -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); @@ -1728,6 +1794,9 @@ footer { -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .btn.small { padding: 7px 9px 7px; @@ -1775,6 +1844,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .btn-group .btn:first-child { margin-left: 0; @@ -1840,6 +1912,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); @@ -1915,6 +1990,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); @@ -1954,6 +2032,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); @@ -1996,6 +2077,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); @@ -2031,6 +2115,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 0 0 6px 6px; -moz-border-radius: 0 0 6px 6px; border-radius: 0 0 6px 6px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; -webkit-box-shadow: inset 0 1px 0 #ffffff; -moz-box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff; @@ -2110,6 +2197,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .twipsy-arrow { position: absolute; @@ -2170,6 +2260,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); @@ -2181,6 +2274,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 3px 3px 0 0; -moz-border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; border-bottom: 1px solid #eee; } .popover .content { @@ -2190,6 +2286,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px; -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; + -webkit-background-clip: padding-box; -moz-background-clip: padding-box; background-clip: padding-box; } @@ -2217,6 +2316,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .label.important { background-color: #c43c35; @@ -2255,6 +2357,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; -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); -- cgit v1.2.3 From f4fc56b1b3827254dd771536dcb2b711919f3867 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 12 Oct 2011 08:31:16 -0700 Subject: first pass at moving over the new tabs stuff to 2.0 --- bootstrap.css | 77 ++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 60 insertions(+), 17 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index d40c50c84..abf43ed3d 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Tue Oct 11 19:31:11 PDT 2011 + * Date: Tue Oct 11 23:51:38 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1478,13 +1478,13 @@ table .headerSortUp.purple, table .headerSortDown.purple { display: block; } .tabs { - float: left; - width: 100%; - border-bottom: 1px solid #ddd; + border-color: #ddd; + border-style: solid; + border-width: 0 0 1px; } .tabs > li { position: relative; - top: 1px; + margin-bottom: -1px; } .tabs > li > a { padding: 0 15px; @@ -1503,13 +1503,56 @@ table .headerSortUp.purple, table .headerSortDown.purple { background-color: #eee; border-color: #eee #eee #ddd; } -.tabs > li.active > a { +.tabs .active > a, .tabs .active > a:hover { color: #808080; background-color: #ffffff; border: 1px solid #ddd; border-bottom-color: transparent; + cursor: default; +} +.tabbable { + margin-bottom: 18px; +} +.tabbable .tabs { + margin-bottom: 0; + border-bottom: 0; +} +.tabbable .tab-content { + padding: 19px; + border: 1px solid #ddd; +} +.tabbable.tabs-bottom .tabs > li { + margin-top: -1px; + margin-bottom: 0; +} +.tabbable.tabs-bottom .tabs > li > a { + -webkit-border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + border-radius: 0 0 4px 4px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; +} +.tabbable.tabs-bottom .tabs > li > a:hover { + border-bottom-color: transparent; + border-top-color: #ddd; +} +.tabbable.tabs-bottom .tabs > .active > a, .tabbable.tabs-bottom .tabs > .active > a:hover { + border-color: transparent #ddd #ddd #ddd; +} +.tabbable.tabs-left .tabs { + float: left; +} +.tabbable.tabs-left .tabs > li { + float: none; +} +.tabbable.tabs-right .tabs { + float: right; +} +.tabbable.tabs-right .tabs > li { + float: none; } -.tabs .dropdown-menu { +.tabs .menu-dropdown, .tabs .dropdown-menu { top: 35px; border-width: 1px; -webkit-border-radius: 0 6px 6px 6px; @@ -1519,25 +1562,22 @@ table .headerSortUp.purple, table .headerSortDown.purple { -moz-background-clip: padding; background-clip: padding-box; } -.tabs .dropdown-toggle:after { +.tabs a.menu:after, .tabs .dropdown-toggle:after { border-top-color: #999; margin-top: 15px; margin-left: 5px; } -.tabs .open.dropdown .dropdown-toggle { +.tabs li.open.menu .menu, .tabs .open.dropdown .dropdown-toggle { border-color: #999; } -.tabs .dropdown.open .dropdown-toggle:after { +.tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after { border-top-color: #555; } -.tab-content { - clear: both; -} .pills a { margin: 5px 3px 5px 0; padding: 0 15px; - text-shadow: 0 1px 1px #ffffff; line-height: 30px; + text-shadow: 0 1px 1px #ffffff; -webkit-border-radius: 15px; -moz-border-radius: 15px; border-radius: 15px; @@ -1546,17 +1586,20 @@ table .headerSortUp.purple, table .headerSortDown.purple { background-clip: padding-box; } .pills a:hover { - background: #00438a; color: #ffffff; text-decoration: none; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); + background-color: #00438a; } .pills .active a { - background: #0069d6; color: #ffffff; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); + background-color: #0069d6; +} +.pills-vertical > li { + float: none; } -.tab-content > *, .pill-content > * { +.tab-content > .tab-pane, .pill-content > .pill-pane { display: none; } .tab-content > .active, .pill-content > .active { -- cgit v1.2.3 From fbe22f05800a3ce4ae3a880914d8e03cb1e01d1b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 15 Oct 2011 17:21:39 -0700 Subject: updated index of docs to use html5 self closing tags, add responsive shell to bootstrap file --- bootstrap.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index abf43ed3d..60cc8213f 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Tue Oct 11 23:51:38 PDT 2011 + * Date: Sat Oct 15 17:19:53 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -2416,3 +2416,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); } +/* Responsive.less + * For phone and tablet devices + * ------------------------------------------------------------- */ +@media (max-width: 480px) { + +} -- cgit v1.2.3 From 9e9109469e5c86c4232cc744639b286bcd9ef0ba Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2011 03:00:58 -0700 Subject: biiiiiig update coming for responsiveness --- bootstrap.css | 422 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 222 insertions(+), 200 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 60cc8213f..482d2878c 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sat Oct 15 17:19:53 PDT 2011 + * Date: Sun Oct 16 02:59:54 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -261,7 +261,6 @@ a:hover { } .row { zoom: 1; - margin-left: -20px; } .row:before, .row:after { display: table; @@ -277,125 +276,77 @@ a:hover { float: left; margin-left: 20px; } +.row > [class*="span"]:first-child { + margin-left: 0; +} .span1 { - width: 40px; + width: 60px; } .span2 { - width: 100px; + width: 140px; } .span3 { - width: 160px; + width: 220px; } .span4 { - width: 220px; + width: 300px; } .span5 { - width: 280px; + width: 380px; } .span6 { - width: 340px; + width: 460px; } .span7 { - width: 400px; + width: 540px; } .span8 { - width: 460px; + width: 620px; } .span9 { - width: 520px; + width: 700px; } .span10 { - width: 580px; + width: 780px; } .span11 { - width: 640px; + width: 860px; } .span12 { - width: 700px; -} -.span13 { - width: 760px; -} -.span14 { - width: 820px; -} -.span15 { - width: 880px; -} -.span16 { width: 940px; } -.span17 { - width: 1000px; -} -.span18 { - width: 1060px; -} -.span19 { - width: 1120px; -} -.span20 { - width: 1180px; -} -.span21 { - width: 1240px; -} -.span22 { - width: 1300px; -} -.span23 { - width: 1360px; -} -.span24 { - width: 1420px; -} .offset1 { - margin-left: 80px; + margin-left: 100px; } .offset2 { - margin-left: 140px; + margin-left: 180px; } .offset3 { - margin-left: 200px; + margin-left: 260px; } .offset4 { - margin-left: 260px; + margin-left: 340px; } .offset5 { - margin-left: 320px; + margin-left: 420px; } .offset6 { - margin-left: 380px; + margin-left: 500px; } .offset7 { - margin-left: 440px; + margin-left: 580px; } .offset8 { - margin-left: 500px; + margin-left: 660px; } .offset9 { - margin-left: 560px; + margin-left: 740px; } .offset10 { - margin-left: 620px; + margin-left: 820px; } .offset11 { - margin-left: 680px; -} -.offset12 { - margin-left: 740px; -} -.span-one-third { - width: 300px; -} -.span-two-thirds { - width: 620px; -} -.offset-one-third { - margin-left: 340px; -} -.offset-two-thirds { - margin-left: 660px; + margin-left: 900px; } /* Typography.less * Headings, body text, lists, code, and more for a versatile and durable typography system @@ -551,9 +502,6 @@ code, pre { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } code { background-color: #fee9cc; @@ -572,9 +520,6 @@ pre { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; white-space: pre; white-space: pre-wrap; word-wrap: break-word; @@ -626,9 +571,6 @@ select, -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } /* Mini reset for unique input types */ input[type=checkbox], input[type=radio] { @@ -713,97 +655,97 @@ input[type=file]:focus, input[type=checkbox]:focus, select:focus { input.span1, textarea.span1, select.span1 { display: inline-block; float: none; - width: 30px; + width: 50px; margin-left: 0; } input.span2, textarea.span2, select.span2 { display: inline-block; float: none; - width: 90px; + width: 150px; margin-left: 0; } input.span3, textarea.span3, select.span3 { display: inline-block; float: none; - width: 150px; + width: 250px; margin-left: 0; } input.span4, textarea.span4, select.span4 { display: inline-block; float: none; - width: 210px; + width: 350px; margin-left: 0; } input.span5, textarea.span5, select.span5 { display: inline-block; float: none; - width: 270px; + width: 450px; margin-left: 0; } input.span6, textarea.span6, select.span6 { display: inline-block; float: none; - width: 330px; + width: 550px; margin-left: 0; } input.span7, textarea.span7, select.span7 { display: inline-block; float: none; - width: 390px; + width: 650px; margin-left: 0; } input.span8, textarea.span8, select.span8 { display: inline-block; float: none; - width: 450px; + width: 750px; margin-left: 0; } input.span9, textarea.span9, select.span9 { display: inline-block; float: none; - width: 510px; + width: 850px; margin-left: 0; } input.span10, textarea.span10, select.span10 { display: inline-block; float: none; - width: 570px; + width: 950px; margin-left: 0; } input.span11, textarea.span11, select.span11 { display: inline-block; float: none; - width: 630px; + width: 1050px; margin-left: 0; } input.span12, textarea.span12, select.span12 { display: inline-block; float: none; - width: 690px; + width: 1150px; margin-left: 0; } input.span13, textarea.span13, select.span13 { display: inline-block; float: none; - width: 750px; + width: 1250px; margin-left: 0; } input.span14, textarea.span14, select.span14 { display: inline-block; float: none; - width: 810px; + width: 1350px; margin-left: 0; } input.span15, textarea.span15, select.span15 { display: inline-block; float: none; - width: 870px; + width: 1450px; margin-left: 0; } input.span16, textarea.span16, select.span16 { display: inline-block; float: none; - width: 930px; + width: 1550px; margin-left: 0; } input[disabled], @@ -823,9 +765,6 @@ textarea[readonly] { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .has-error > label, .has-error span.help-inline, .has-error span.help-block { color: #9d261d; @@ -907,9 +846,6 @@ textarea[readonly] { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .input-prepend .add-on, .input-append .add-on { position: relative; @@ -931,9 +867,6 @@ textarea[readonly] { -webkit-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .input-prepend .active, .input-append .active { background: #a9dba9; @@ -949,17 +882,11 @@ textarea[readonly] { -webkit-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .input-append .add-on { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; margin-right: 0; margin-left: -1px; } @@ -967,9 +894,6 @@ textarea[readonly] { -webkit-border-radius: 14px; -moz-border-radius: 14px; border-radius: 14px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .control-group { margin-bottom: 18px; @@ -1009,9 +933,6 @@ table { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } table th, table td { padding: 10px 10px 9px; @@ -1037,33 +958,21 @@ table tbody tr:first-child td:first-child { -webkit-border-radius: 4px 0 0 0; -moz-border-radius: 4px 0 0 0; border-radius: 4px 0 0 0; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } table tbody tr:first-child td:last-child { -webkit-border-radius: 0 4px 0 0; -moz-border-radius: 0 4px 0 0; border-radius: 0 4px 0 0; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } table tbody tr:last-child td:first-child { -webkit-border-radius: 0 0 0 4px; -moz-border-radius: 0 0 0 4px; border-radius: 0 0 0 4px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } table tbody tr:last-child td:last-child { -webkit-border-radius: 0 0 4px 0; -moz-border-radius: 0 0 4px 0; border-radius: 0 0 4px 0; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .zebra-striped tbody tr:nth-child(odd) td { background-color: #f9f9f9; @@ -1263,9 +1172,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .navbar-fixed { position: fixed; @@ -1397,9 +1303,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 0 0 6px 6px; -moz-border-radius: 0 0 6px 6px; border-radius: 0 0 6px 6px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); @@ -1494,9 +1397,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .tabs > li > a:hover { text-decoration: none; @@ -1529,9 +1429,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 0 0 4px 4px; -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .tabbable.tabs-bottom .tabs > li > a:hover { border-bottom-color: transparent; @@ -1558,9 +1455,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 0 6px 6px 6px; -moz-border-radius: 0 6px 6px 6px; border-radius: 0 6px 6px 6px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .tabs a.menu:after, .tabs .dropdown-toggle:after { border-top-color: #999; @@ -1581,9 +1475,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 15px; -moz-border-radius: 15px; border-radius: 15px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .pills a:hover { color: #ffffff; @@ -1622,9 +1513,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; -webkit-box-shadow: inset 0 1px 0 #ffffff; -moz-box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff; @@ -1647,9 +1535,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .hero-unit h1 { margin-bottom: 0; @@ -1765,9 +1650,6 @@ footer { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; -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); @@ -1837,9 +1719,6 @@ footer { -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .btn.small { padding: 7px 9px 7px; @@ -1887,9 +1766,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .btn-group .btn:first-child { margin-left: 0; @@ -1955,9 +1831,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); @@ -2033,9 +1906,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); @@ -2075,9 +1945,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); @@ -2120,9 +1987,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); @@ -2158,9 +2022,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 0 0 6px 6px; -moz-border-radius: 0 0 6px 6px; border-radius: 0 0 6px 6px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; -webkit-box-shadow: inset 0 1px 0 #ffffff; -moz-box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff; @@ -2240,9 +2101,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .twipsy-arrow { position: absolute; @@ -2303,9 +2161,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); @@ -2317,9 +2172,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 3px 3px 0 0; -moz-border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; border-bottom: 1px solid #eee; } .popover .content { @@ -2329,9 +2181,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px; -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; - -webkit-background-clip: padding-box; -moz-background-clip: padding-box; background-clip: padding-box; } @@ -2359,9 +2208,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .label.important { background-color: #c43c35; @@ -2400,9 +2246,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; -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); @@ -2420,5 +2263,184 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { * For phone and tablet devices * ------------------------------------------------------------- */ @media (max-width: 480px) { - + .container { + width: auto; + padding: 0 10px; + } + [class*="span"] { + float: none; + display: block; + width: auto; + } +} +@media (min-width: 480px) and (max-width: 768px) { + .container { + width: auto; + padding: 0 10px; + } + [class*="span"] { + float: none; + display: block; + width: auto; + margin: 0; + } +} +@media (min-width: 768px) and (max-width: 940px) { + .container { + width: 748px; + } + .span1 { + width: 28px; + } + .span2 { + width: 76px; + } + .span3 { + width: 124px; + } + .span4 { + width: 172px; + } + .span5 { + width: 220px; + } + .span6 { + width: 268px; + } + .span7 { + width: 316px; + } + .span8 { + width: 364px; + } + .span9 { + width: 412px; + } + .span10 { + width: 460px; + } + .span11 { + width: 508px; + } + .span12 { + width: 556px; + } + .offset1 { + margin-left: 68px; + } + .offset2 { + margin-left: 116px; + } + .offset3 { + margin-left: 164px; + } + .offset4 { + margin-left: 212px; + } + .offset5 { + margin-left: 260px; + } + .offset6 { + margin-left: 308px; + } + .offset7 { + margin-left: 356px; + } + .offset8 { + margin-left: 404px; + } + .offset9 { + margin-left: 452px; + } + .offset10 { + margin-left: 500px; + } + .offset11 { + margin-left: 548px; + } + .offset12 { + margin-left: 596px; + } +} +@media (min-width: 1170px) { + .container { + width: 1170px; + } + [class*="span"] { + display: inline; + float: left; + margin-left: 20px; + } + .span1 { + width: 70px; + } + .span2 { + width: 170px; + } + .span3 { + width: 270px; + } + .span4 { + width: 370px; + } + .span5 { + width: 470px; + } + .span6 { + width: 570px; + } + .span7 { + width: 670px; + } + .span8 { + width: 770px; + } + .span9 { + width: 870px; + } + .span10 { + width: 970px; + } + .span11 { + width: 1070px; + } + .span12 { + width: 1170px; + } + .offset1 { + margin-left: 130px; + } + .offset2 { + margin-left: 230px; + } + .offset3 { + margin-left: 330px; + } + .offset4 { + margin-left: 430px; + } + .offset5 { + margin-left: 530px; + } + .offset6 { + margin-left: 630px; + } + .offset7 { + margin-left: 730px; + } + .offset8 { + margin-left: 830px; + } + .offset9 { + margin-left: 930px; + } + .offset10 { + margin-left: 1030px; + } + .offset11 { + margin-left: 1130px; + } + .offset12 { + margin-left: 1230px; + } } -- cgit v1.2.3 From be926a04bc7d1fec228b9cbd4c6d0bb0c75c30cd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2011 03:08:14 -0700 Subject: fix uber size in responsive; remove @extraspace variable by changing grid to use :first-child over negative margin --- bootstrap.css | 52 +++++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 27 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 482d2878c..887dbdd01 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Oct 16 02:59:54 PDT 2011 + * Date: Sun Oct 16 03:07:49 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -316,37 +316,37 @@ a:hover { width: 940px; } .offset1 { - margin-left: 100px; + margin-left: 80px; } .offset2 { - margin-left: 180px; + margin-left: 160px; } .offset3 { - margin-left: 260px; + margin-left: 240px; } .offset4 { - margin-left: 340px; + margin-left: 320px; } .offset5 { - margin-left: 420px; + margin-left: 400px; } .offset6 { - margin-left: 500px; + margin-left: 480px; } .offset7 { - margin-left: 580px; + margin-left: 560px; } .offset8 { - margin-left: 660px; + margin-left: 640px; } .offset9 { - margin-left: 740px; + margin-left: 720px; } .offset10 { - margin-left: 820px; + margin-left: 800px; } .offset11 { - margin-left: 900px; + margin-left: 880px; } /* Typography.less * Headings, body text, lists, code, and more for a versatile and durable typography system @@ -2367,9 +2367,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { width: 1170px; } [class*="span"] { - display: inline; - float: left; - margin-left: 20px; + margin-left: 30px; } .span1 { width: 70px; @@ -2408,39 +2406,39 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { width: 1170px; } .offset1 { - margin-left: 130px; + margin-left: 100px; } .offset2 { - margin-left: 230px; + margin-left: 200px; } .offset3 { - margin-left: 330px; + margin-left: 300px; } .offset4 { - margin-left: 430px; + margin-left: 400px; } .offset5 { - margin-left: 530px; + margin-left: 500px; } .offset6 { - margin-left: 630px; + margin-left: 600px; } .offset7 { - margin-left: 730px; + margin-left: 700px; } .offset8 { - margin-left: 830px; + margin-left: 800px; } .offset9 { - margin-left: 930px; + margin-left: 900px; } .offset10 { - margin-left: 1030px; + margin-left: 1000px; } .offset11 { - margin-left: 1130px; + margin-left: 1100px; } .offset12 { - margin-left: 1230px; + margin-left: 1200px; } } -- cgit v1.2.3 From 3a4760637f3acca9cbd8af2819d163848852a23a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2011 03:15:17 -0700 Subject: tweak navbar styles for static version to not cause problems on responsive layouts --- bootstrap.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 887dbdd01..8b487fb7e 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Oct 16 03:07:49 PDT 2011 + * Date: Sun Oct 16 03:14:23 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1165,8 +1165,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { margin-bottom: 18px; } .navbar-static .navbar-inner { - margin-left: -20px; - margin-right: -20px; padding-left: 20px; padding-right: 20px; -webkit-border-radius: 4px; -- cgit v1.2.3 From 6f44a90edbfc897082dd69630983391bf6e57ba7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2011 11:35:24 -0700 Subject: tweak line-height of h2 and h3 to not be gihugeous, updated responsive to improve tablet grid and phone styles --- bootstrap.css | 74 +++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 27 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 8b487fb7e..dffa6a824 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Oct 16 03:14:23 PDT 2011 + * Date: Sun Oct 16 11:34:52 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -388,13 +388,13 @@ h1 small { } h2 { font-size: 24px; - line-height: 36px; + line-height: 27px; } h2 small { font-size: 14px; } h3 { - line-height: 36px; + line-height: 27px; font-size: 18px; } h3 small { @@ -2269,6 +2269,26 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { float: none; display: block; width: auto; + margin: 0; + } + .modal { + width: auto; + margin: 0; + } + .form-horizontal .control-group > label { + float: none; + width: auto; + padding-top: 0; + text-align: left; + } + .form-horizontal .controls { + margin-left: 0; + } + .form-horizontal .control-list { + padding-top: 0; + } + .form-horizontal .form-actions { + padding-left: 0; } } @media (min-width: 480px) and (max-width: 768px) { @@ -2288,76 +2308,76 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { width: 748px; } .span1 { - width: 28px; + width: 44px; } .span2 { - width: 76px; + width: 108px; } .span3 { - width: 124px; + width: 172px; } .span4 { - width: 172px; + width: 236px; } .span5 { - width: 220px; + width: 300px; } .span6 { - width: 268px; + width: 364px; } .span7 { - width: 316px; + width: 428px; } .span8 { - width: 364px; + width: 492px; } .span9 { - width: 412px; + width: 556px; } .span10 { - width: 460px; + width: 620px; } .span11 { - width: 508px; + width: 684px; } .span12 { - width: 556px; + width: 748px; } .offset1 { - margin-left: 68px; + margin-left: 64px; } .offset2 { - margin-left: 116px; + margin-left: 128px; } .offset3 { - margin-left: 164px; + margin-left: 192px; } .offset4 { - margin-left: 212px; + margin-left: 256px; } .offset5 { - margin-left: 260px; + margin-left: 320px; } .offset6 { - margin-left: 308px; + margin-left: 384px; } .offset7 { - margin-left: 356px; + margin-left: 448px; } .offset8 { - margin-left: 404px; + margin-left: 512px; } .offset9 { - margin-left: 452px; + margin-left: 576px; } .offset10 { - margin-left: 500px; + margin-left: 640px; } .offset11 { - margin-left: 548px; + margin-left: 704px; } .offset12 { - margin-left: 596px; + margin-left: 768px; } } @media (min-width: 1170px) { -- cgit v1.2.3 From 756e7c8739266ec8594d545e7eec2a50ea06ce08 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2011 12:11:48 -0700 Subject: more tweaks to responsive --- bootstrap.css | 127 ++++++++++++++++++++++++---------------------------------- 1 file changed, 52 insertions(+), 75 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index dffa6a824..3c344e98b 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Oct 16 11:34:52 PDT 2011 + * Date: Sun Oct 16 12:11:34 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -2380,83 +2380,60 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { margin-left: 768px; } } +/* +// LARGE DESKTOP & UP +// ------------------ + @media (min-width: 1170px) { - .container { - width: 1170px; - } - [class*="span"] { - margin-left: 30px; - } - .span1 { - width: 70px; - } - .span2 { - width: 170px; - } - .span3 { - width: 270px; - } - .span4 { - width: 370px; - } - .span5 { - width: 470px; - } - .span6 { - width: 570px; - } - .span7 { - width: 670px; - } - .span8 { - width: 770px; - } - .span9 { - width: 870px; - } - .span10 { - width: 970px; - } - .span11 { - width: 1070px; - } - .span12 { - width: 1170px; - } - .offset1 { - margin-left: 100px; - } - .offset2 { - margin-left: 200px; - } - .offset3 { - margin-left: 300px; - } - .offset4 { - margin-left: 400px; - } - .offset5 { - margin-left: 500px; - } - .offset6 { - margin-left: 600px; - } - .offset7 { - margin-left: 700px; - } - .offset8 { - margin-left: 800px; - } - .offset9 { - margin-left: 900px; + + // Reset grid variables + @gridColumns: 12; + @gridColumnWidth: 70px; + @gridGutterWidth: 30px; + @siteWidth: 1170px; + + // Bring grid mixins to recalculate widths + .columns(@columnSpan: 1) { + width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)); } - .offset10 { - margin-left: 1000px; + .offset(@columnOffset: 1) { + margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @gridGutterWidth; } - .offset11 { - margin-left: 1100px; + + .container { + width: @siteWidth; } - .offset12 { - margin-left: 1200px; + [class*="span"] { + margin-left: @gridGutterWidth; } + + // Default columns + .span1 { .columns(1); } + .span2 { .columns(2); } + .span3 { .columns(3); } + .span4 { .columns(4); } + .span5 { .columns(5); } + .span6 { .columns(6); } + .span7 { .columns(7); } + .span8 { .columns(8); } + .span9 { .columns(9); } + .span10 { .columns(10); } + .span11 { .columns(11); } + .span12 { .columns(12); } + + // Offset column options + .offset1 { .offset(1); } + .offset2 { .offset(2); } + .offset3 { .offset(3); } + .offset4 { .offset(4); } + .offset5 { .offset(5); } + .offset6 { .offset(6); } + .offset7 { .offset(7); } + .offset8 { .offset(8); } + .offset9 { .offset(9); } + .offset10 { .offset(10); } + .offset11 { .offset(11); } + .offset12 { .offset(12); } + } +*/ \ No newline at end of file -- cgit v1.2.3 From 2a82b38cff142ec86a6e1dc4f9366205260d262d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2011 18:01:05 -0700 Subject: tweak the h2s again for better spacing, adjust docs, remove white bg if possible on file input, few other tweaks --- bootstrap.css | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 3c344e98b..3af3c1be7 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Oct 16 12:11:34 PDT 2011 + * Date: Sun Oct 16 18:00:58 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -388,7 +388,7 @@ h1 small { } h2 { font-size: 24px; - line-height: 27px; + line-height: 36px; } h2 small { font-size: 14px; @@ -434,7 +434,7 @@ ol { } li { line-height: 18px; - color: #808080; + color: #404040; } ul.unstyled { list-style: none; @@ -553,9 +553,6 @@ label { margin-bottom: 5px; color: #404040; } -input[type=checkbox], input[type=radio] { - cursor: pointer; -} input, textarea, select, @@ -583,9 +580,11 @@ input[type=checkbox], input[type=radio] { line-height: normal; border: none; + cursor: pointer; } input[type=file] { background-color: #ffffff; + background-color: initial; padding: initial; border: initial; line-height: initial; -- cgit v1.2.3 From c62a0239bd30a12e9f0d8c1e45f5818460e9df90 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2011 19:12:33 -0700 Subject: update to responsive to fix new masthead --- bootstrap.css | 129 ++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 76 insertions(+), 53 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 3af3c1be7..32ffc6120 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Oct 16 18:00:58 PDT 2011 + * Date: Sun Oct 16 19:08:43 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -2379,60 +2379,83 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { margin-left: 768px; } } -/* -// LARGE DESKTOP & UP -// ------------------ - -@media (min-width: 1170px) { - - // Reset grid variables - @gridColumns: 12; - @gridColumnWidth: 70px; - @gridGutterWidth: 30px; - @siteWidth: 1170px; - - // Bring grid mixins to recalculate widths - .columns(@columnSpan: 1) { - width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)); - } - .offset(@columnOffset: 1) { - margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @gridGutterWidth; - } - +@media (min-width: 1210px) { .container { - width: @siteWidth; + width: 1170px; } [class*="span"] { - margin-left: @gridGutterWidth; + margin-left: 30px; + } + .span1 { + width: 70px; + } + .span2 { + width: 170px; + } + .span3 { + width: 270px; + } + .span4 { + width: 370px; + } + .span5 { + width: 470px; + } + .span6 { + width: 570px; + } + .span7 { + width: 670px; + } + .span8 { + width: 770px; + } + .span9 { + width: 870px; + } + .span10 { + width: 970px; + } + .span11 { + width: 1070px; + } + .span12 { + width: 1170px; + } + .offset1 { + margin-left: 100px; + } + .offset2 { + margin-left: 200px; + } + .offset3 { + margin-left: 300px; + } + .offset4 { + margin-left: 400px; + } + .offset5 { + margin-left: 500px; + } + .offset6 { + margin-left: 600px; + } + .offset7 { + margin-left: 700px; + } + .offset8 { + margin-left: 800px; + } + .offset9 { + margin-left: 900px; + } + .offset10 { + margin-left: 1000px; + } + .offset11 { + margin-left: 1100px; + } + .offset12 { + margin-left: 1200px; } - - // Default columns - .span1 { .columns(1); } - .span2 { .columns(2); } - .span3 { .columns(3); } - .span4 { .columns(4); } - .span5 { .columns(5); } - .span6 { .columns(6); } - .span7 { .columns(7); } - .span8 { .columns(8); } - .span9 { .columns(9); } - .span10 { .columns(10); } - .span11 { .columns(11); } - .span12 { .columns(12); } - - // Offset column options - .offset1 { .offset(1); } - .offset2 { .offset(2); } - .offset3 { .offset(3); } - .offset4 { .offset(4); } - .offset5 { .offset(5); } - .offset6 { .offset(6); } - .offset7 { .offset(7); } - .offset8 { .offset(8); } - .offset9 { .offset(9); } - .offset10 { .offset(10); } - .offset11 { .offset(11); } - .offset12 { .offset(12); } - } -*/ \ No newline at end of file -- cgit v1.2.3 From e7d2218b2043742f21c368d074d97a4bde275730 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2011 23:04:31 -0700 Subject: few tweaks to responsive stuff, updated docs for grid system (still needs copy editing) --- bootstrap.css | 159 +++++++++++++++++++++++++--------------------------------- 1 file changed, 67 insertions(+), 92 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 32ffc6120..89d55199e 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Oct 16 19:08:43 PDT 2011 + * Date: Sun Oct 16 23:04:03 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -260,6 +260,7 @@ a:hover { display: block; } .row { + margin-left: -20px; zoom: 1; } .row:before, .row:after { @@ -276,9 +277,6 @@ a:hover { float: left; margin-left: 20px; } -.row > [class*="span"]:first-child { - margin-left: 0; -} .span1 { width: 60px; } @@ -316,37 +314,37 @@ a:hover { width: 940px; } .offset1 { - margin-left: 80px; + margin-left: 100px; } .offset2 { - margin-left: 160px; + margin-left: 180px; } .offset3 { - margin-left: 240px; + margin-left: 260px; } .offset4 { - margin-left: 320px; + margin-left: 340px; } .offset5 { - margin-left: 400px; + margin-left: 420px; } .offset6 { - margin-left: 480px; + margin-left: 500px; } .offset7 { - margin-left: 560px; + margin-left: 580px; } .offset8 { - margin-left: 640px; + margin-left: 660px; } .offset9 { - margin-left: 720px; + margin-left: 740px; } .offset10 { - margin-left: 800px; + margin-left: 820px; } .offset11 { - margin-left: 880px; + margin-left: 900px; } /* Typography.less * Headings, body text, lists, code, and more for a versatile and durable typography system @@ -1550,14 +1548,14 @@ footer { border-top: 1px solid #eee; } .page-header { - margin-bottom: 17px; - border-bottom: 1px solid #ddd; + margin-bottom: 27px; + border-bottom: 1px solid #eee; -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); } .page-header h1 { - margin-bottom: 8px; + margin-bottom: 13.5px; } .btn.danger, .alert-message.danger, @@ -2379,83 +2377,60 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { margin-left: 768px; } } +/* +// LARGE DESKTOP & UP +// ------------------ + @media (min-width: 1210px) { - .container { - width: 1170px; - } - [class*="span"] { - margin-left: 30px; - } - .span1 { - width: 70px; - } - .span2 { - width: 170px; - } - .span3 { - width: 270px; - } - .span4 { - width: 370px; - } - .span5 { - width: 470px; - } - .span6 { - width: 570px; - } - .span7 { - width: 670px; - } - .span8 { - width: 770px; - } - .span9 { - width: 870px; - } - .span10 { - width: 970px; - } - .span11 { - width: 1070px; - } - .span12 { - width: 1170px; - } - .offset1 { - margin-left: 100px; - } - .offset2 { - margin-left: 200px; - } - .offset3 { - margin-left: 300px; - } - .offset4 { - margin-left: 400px; - } - .offset5 { - margin-left: 500px; - } - .offset6 { - margin-left: 600px; - } - .offset7 { - margin-left: 700px; - } - .offset8 { - margin-left: 800px; - } - .offset9 { - margin-left: 900px; + + // Reset grid variables + @gridColumns: 12; + @gridColumnWidth: 70px; + @gridGutterWidth: 30px; + @siteWidth: 1170px; + + // Bring grid mixins to recalculate widths + .columns(@columnSpan: 1) { + width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)); } - .offset10 { - margin-left: 1000px; + .offset(@columnOffset: 1) { + margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @gridGutterWidth; } - .offset11 { - margin-left: 1100px; + + .container { + width: @siteWidth; } - .offset12 { - margin-left: 1200px; + [class*="span"] { + margin-left: @gridGutterWidth; } + + // Default columns + .span1 { .columns(1); } + .span2 { .columns(2); } + .span3 { .columns(3); } + .span4 { .columns(4); } + .span5 { .columns(5); } + .span6 { .columns(6); } + .span7 { .columns(7); } + .span8 { .columns(8); } + .span9 { .columns(9); } + .span10 { .columns(10); } + .span11 { .columns(11); } + .span12 { .columns(12); } + + // Offset column options + .offset1 { .offset(1); } + .offset2 { .offset(2); } + .offset3 { .offset(3); } + .offset4 { .offset(4); } + .offset5 { .offset(5); } + .offset6 { .offset(6); } + .offset7 { .offset(7); } + .offset8 { .offset(8); } + .offset9 { .offset(9); } + .offset10 { .offset(10); } + .offset11 { .offset(11); } + .offset12 { .offset(12); } + } +*/ \ No newline at end of file -- cgit v1.2.3 From 6d2e39950d98dafbb82e94f00b3c99b82d0ba1c1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Oct 2011 00:03:52 -0700 Subject: updated js docs page to new 12 column layout, fix subhead jumbotron styles to match new front page --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 89d55199e..ac242d3b8 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Oct 16 23:04:03 PDT 2011 + * Date: Mon Oct 17 00:03:30 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). -- cgit v1.2.3 From f48baceeda7dc18e1fdf78f89c55b3de40a3357e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Oct 2011 12:45:09 -0700 Subject: remove bottom margin from h1 --- bootstrap.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index ac242d3b8..3731eaf0b 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Mon Oct 17 00:03:30 PDT 2011 + * Date: Mon Oct 17 12:44:52 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -377,7 +377,6 @@ h6 small { color: #bfbfbf; } h1 { - margin-bottom: 18px; font-size: 30px; line-height: 36px; } -- cgit v1.2.3 From 27cbe7f63a13fad987dc2547ef5b6f526ceb268c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Oct 2011 14:17:29 -0700 Subject: add abbr styles, overhaul type docs section to remove lots of verbose text and put emphasis on tables and more scannable content --- bootstrap.css | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 3731eaf0b..f3ff894d1 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Mon Oct 17 12:44:52 PDT 2011 + * Date: Mon Oct 17 14:16:58 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -367,6 +367,7 @@ h5, h6 { font-weight: bold; color: #404040; + text-rendering: optimizelegibility; } h1 small, h2 small, @@ -388,7 +389,7 @@ h2 { line-height: 36px; } h2 small { - font-size: 14px; + font-size: 18px; } h3 { line-height: 27px; @@ -466,6 +467,12 @@ em { .muted { color: #bfbfbf; } +abbr { + font-size: 90%; + text-transform: uppercase; + border-bottom: 1px dotted #ddd; + cursor: help; +} blockquote { margin-bottom: 18px; border-left: 5px solid #eee; -- cgit v1.2.3 From 369b9720c6090985c678076eebb59c080c0ed27c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Oct 2011 23:45:35 -0700 Subject: adding responsive stuff to docs to stub that out, updated type to make ul and ol margins match p tags --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index f3ff894d1..0f6d58ae0 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Mon Oct 17 14:16:58 PDT 2011 + * Date: Mon Oct 17 23:44:56 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -416,7 +416,7 @@ h6 { text-transform: uppercase; } ul, ol { - margin: 0 0 18px 25px; + margin: 0 0 9px 25px; } ul ul, ul ol, -- cgit v1.2.3