From ec8619a9808b9b6e721334af8e6b5248ccbea8b5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Sep 2011 17:21:43 -0700 Subject: update docs to remove old stuff, update to all new classes; no more backwards compatibility --- bootstrap.css | 90 ++++++++++++++--------------------------------------------- 1 file changed, 21 insertions(+), 69 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 8b6fe3eb4..6d3c15390 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: Fri Sep 16 14:07:03 PDT 2011 + * Date: Sat Sep 17 17:21:25 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). @@ -1238,16 +1238,13 @@ table .headerSortUp.purple, table .headerSortDown.purple { color: #bfbfbf; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } -.topbar h3 a:hover, .topbar .brand a:hover, .topbar ul .active > a { +.topbar .brand a:hover, .topbar ul .active > a { background-color: #333; background-color: rgba(255, 255, 255, 0.05); color: #ffffff; text-decoration: none; } -.topbar h3 { - position: relative; -} -.topbar h3 a, .topbar .brand { +.topbar .brand { float: left; display: block; padding: 8px 20px 12px; @@ -1322,7 +1319,7 @@ 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-inner, .topbar .fill { +.topbar-inner { background-color: #222; background-color: #222222; background-repeat: repeat-x; @@ -1338,92 +1335,59 @@ table .headerSortUp.purple, table .headerSortDown.purple { -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); } -.topbar div > ul, .nav { +.nav { display: block; float: left; margin: 0 10px 0 0; position: relative; left: 0; } -.topbar div > ul > li, .nav > li { +.nav > li { display: block; float: left; } -.topbar div > ul a, .nav a { +.nav a { display: block; float: none; padding: 10px 10px 11px; line-height: 19px; text-decoration: none; } -.topbar div > ul a:hover, .nav a:hover { +.nav a:hover { color: #ffffff; text-decoration: none; } -.topbar div > ul .active > a, .nav .active > a { +.nav .active > a { background-color: #222; background-color: rgba(0, 0, 0, 0.5); } -.topbar div > ul.secondary-nav, .nav.secondary-nav { +.nav.secondary-nav { float: right; margin-left: 10px; margin-right: 0; } -.topbar div > ul.secondary-nav .menu-dropdown, -.nav.secondary-nav .menu-dropdown, -.topbar div > ul.secondary-nav .dropdown-menu, .nav.secondary-nav .dropdown-menu { right: 0; border: 0; } -.topbar div > ul a.menu:hover, -.nav a.menu:hover, -.topbar div > ul li.open .menu, -.nav li.open .menu, -.topbar div > ul .dropdown-toggle:hover, -.nav .dropdown-toggle:hover, -.topbar div > ul .dropdown.open .dropdown-toggle, -.nav .dropdown.open .dropdown-toggle { +.nav .dropdown-toggle:hover, .nav .dropdown.open .dropdown-toggle { background: #444; background: rgba(255, 255, 255, 0.05); } -.topbar div > ul .menu-dropdown, -.nav .menu-dropdown, -.topbar div > ul .dropdown-menu, .nav .dropdown-menu { background-color: #333; } -.topbar div > ul .menu-dropdown a.menu, -.nav .menu-dropdown a.menu, -.topbar div > ul .dropdown-menu a.menu, -.nav .dropdown-menu a.menu, -.topbar div > ul .menu-dropdown .dropdown-toggle, -.nav .menu-dropdown .dropdown-toggle, -.topbar div > ul .dropdown-menu .dropdown-toggle, .nav .dropdown-menu .dropdown-toggle { color: #ffffff; } -.topbar div > ul .menu-dropdown a.menu.open, -.nav .menu-dropdown a.menu.open, -.topbar div > ul .dropdown-menu a.menu.open, -.nav .dropdown-menu a.menu.open, -.topbar div > ul .menu-dropdown .dropdown-toggle.open, -.nav .menu-dropdown .dropdown-toggle.open, -.topbar div > ul .dropdown-menu .dropdown-toggle.open, .nav .dropdown-menu .dropdown-toggle.open { background: #444; background: rgba(255, 255, 255, 0.05); } -.topbar div > ul .menu-dropdown li a, -.nav .menu-dropdown li a, -.topbar div > ul .dropdown-menu li a, .nav .dropdown-menu li a { color: #999; text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); } -.topbar div > ul .menu-dropdown li a:hover, -.nav .menu-dropdown li a:hover, -.topbar div > ul .dropdown-menu li a:hover, .nav .dropdown-menu li a:hover { background-color: #191919; background-repeat: repeat-x; @@ -1437,26 +1401,20 @@ table .headerSortUp.purple, table .headerSortDown.purple { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#292929', endColorstr='#191919', GradientType=0); color: #ffffff; } -.topbar div > ul .menu-dropdown .active a, -.nav .menu-dropdown .active a, -.topbar div > ul .dropdown-menu .active a, .nav .dropdown-menu .active a { color: #ffffff; } -.topbar div > ul .menu-dropdown .divider, -.nav .menu-dropdown .divider, -.topbar div > ul .dropdown-menu .divider, .nav .dropdown-menu .divider { background-color: #222; border-color: #444; } -.topbar ul .menu-dropdown li a, .topbar ul .dropdown-menu li a { +.topbar ul .dropdown-menu li a { padding: 4px 15px; } -li.menu, .dropdown { +.dropdown { position: relative; } -a.menu:after, .dropdown-toggle:after { +.dropdown-toggle:after { width: 0; height: 0; display: inline-block; @@ -1473,7 +1431,7 @@ a.menu:after, .dropdown-toggle:after { -moz-opacity: 0.5; opacity: 0.5; } -.menu-dropdown, .dropdown-menu { +.dropdown-menu { background-color: #ffffff; float: left; display: none; @@ -1501,12 +1459,12 @@ a.menu:after, .dropdown-toggle:after { -moz-background-clip: padding-box; background-clip: padding-box; } -.menu-dropdown li, .dropdown-menu li { +.dropdown-menu li { float: none; display: block; background-color: none; } -.menu-dropdown .divider, .dropdown-menu .divider { +.dropdown-menu .divider { height: 1px; margin: 5px 0; overflow: hidden; @@ -1539,17 +1497,11 @@ a.menu:after, .dropdown-toggle:after { -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); } -.open .menu, -.dropdown.open .menu, -.open .dropdown-toggle, .dropdown.open .dropdown-toggle { color: #ffffff; background: #ccc; background: rgba(0, 0, 0, 0.3); } -.open .menu-dropdown, -.dropdown.open .menu-dropdown, -.open .dropdown-menu, .dropdown.open .dropdown-menu { display: block; } @@ -1606,22 +1558,22 @@ a.menu:after, .dropdown-toggle:after { border: 1px solid #ddd; border-bottom-color: transparent; } -.tabs .menu-dropdown, .tabs .dropdown-menu { +.tabs .dropdown-menu { top: 35px; border-width: 1px; -webkit-border-radius: 0 6px 6px 6px; -moz-border-radius: 0 6px 6px 6px; border-radius: 0 6px 6px 6px; } -.tabs a.menu:after, .tabs .dropdown-toggle:after { +.tabs .dropdown-toggle:after { border-top-color: #999; margin-top: 15px; margin-left: 5px; } -.tabs li.open.menu .menu, .tabs .open.dropdown .dropdown-toggle { +.tabs .open.dropdown .dropdown-toggle { border-color: #999; } -.tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after { +.tabs .dropdown.open .dropdown-toggle:after { border-top-color: #555; } .tab-content { -- cgit v1.2.3 From 6d541a6066d46bff19833707deeca8f41279b180 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Sep 2011 19:06:10 -0700 Subject: pulling out more stuff and fixing file name at top of file --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 6d3c15390..babe50a21 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 Sep 17 17:21:25 PDT 2011 + * Date: Wed Sep 28 19:05: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). @@ -173,7 +173,7 @@ textarea { /* Variables.less * Variables to customize the look and feel of Bootstrap * ----------------------------------------------------- */ -/* Variables.less +/* Mixins.less * Snippets of reusable CSS to develop faster and keep code readable * ----------------------------------------------------------------- */ /* -- cgit v1.2.3 From 1b21d5e321ec77c6381becae2e2d7d1c4ab14d9a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Sep 2011 19:15:31 -0700 Subject: updated forms.less to have better comments while pulling out all the old classes for input elements --- bootstrap.css | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index babe50a21..993533e11 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: Wed Sep 28 19:05:53 PDT 2011 + * Date: Wed Sep 28 19:14: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). @@ -747,45 +747,24 @@ form div.clearfix.error .input-prepend span.add-on, form div.clearfix.error .inp border-color: #c87872; color: #b9554d; } -.input-mini, -input.mini, -textarea.mini, -select.mini { +.input-mini { width: 60px; } -.input-small, -input.small, -textarea.small, -select.small { +.input-small { width: 90px; } -.input-medium, -input.medium, -textarea.medium, -select.medium { +.input-medium { width: 150px; } -.input-large, -input.large, -textarea.large, -select.large { +.input-large { width: 210px; } -.input-xlarge, -input.xlarge, -textarea.xlarge, -select.xlarge { +.input-xlarge { width: 270px; } -.input-xxlarge, -input.xxlarge, -textarea.xxlarge, -select.xxlarge { +.input-xxlarge { width: 530px; } -textarea.xxlarge { - overflow-y: auto; -} input.span1, textarea.span1, select.span1 { display: inline-block; float: none; -- cgit v1.2.3 From f919f6f94f3e8405d7653a5f16f8b3d587c47f4c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Sep 2011 01:40:27 -0700 Subject: huge update to forms, docs for the new forms, added a new link for js example to tabs/pills, add some new mixins --- bootstrap.css | 342 +++++++++++++++++++++------------------------------------- 1 file changed, 124 insertions(+), 218 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 993533e11..d3bb942cd 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,10 +6,10 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Wed Sep 28 19:14:58 PDT 2011 + * Date: Thu Sep 29 01:39:48 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). + * 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). * ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */ html, body { margin: 0; @@ -189,7 +189,7 @@ body { font-size: 13px; font-weight: normal; line-height: 18px; - color: #404040; + color: #333333; } .container { width: 940px; @@ -400,7 +400,7 @@ p { } p small { font-size: 11px; - color: #bfbfbf; + color: #777777; } h1, h2, @@ -409,7 +409,7 @@ h4, h5, h6 { font-weight: bold; - color: #404040; + color: #333333; } h1 small, h2 small, @@ -417,7 +417,7 @@ h3 small, h4 small, h5 small, h6 small { - color: #bfbfbf; + color: #777777; } h1 { margin-bottom: 18px; @@ -434,18 +434,16 @@ h2 { h2 small { font-size: 14px; } -h3, -h4, -h5, -h6 { - line-height: 36px; -} h3 { + line-height: 36px; font-size: 18px; } h3 small { font-size: 14px; } +h4, h5, h6 { + line-height: 18px; +} h4 { font-size: 16px; } @@ -457,7 +455,7 @@ h5 { } h6 { font-size: 13px; - color: #bfbfbf; + color: #777777; text-transform: uppercase; } ul, ol { @@ -477,7 +475,7 @@ ol { } li { line-height: 18px; - color: #808080; + color: #555555; } ul.unstyled { list-style: none; @@ -510,7 +508,7 @@ em { line-height: inherit; } .muted { - color: #bfbfbf; + color: #777777; } blockquote { margin-bottom: 18px; @@ -528,7 +526,7 @@ blockquote small { font-size: 12px; font-weight: 300; line-height: 18px; - color: #bfbfbf; + color: #777777; } blockquote small:before { content: '\2014 \00A0'; @@ -573,35 +571,14 @@ pre { form { margin-bottom: 18px; } -fieldset { - margin-bottom: 18px; - padding-top: 18px; -} -fieldset legend { +legend { display: block; - padding-left: 150px; + width: 100%; + margin-bottom: 27px; font-size: 19.5px; - line-height: 1; - color: #404040; - *padding: 0 0 5px 145px; - /* IE6-7 */ - - *line-height: 1.5; - /* IE6-7 */ - -} -form .clearfix { - margin-bottom: 18px; - zoom: 1; -} -form .clearfix:before, form .clearfix:after { - display: table; - content: ""; - zoom: 1; - *display: inline; -} -form .clearfix:after { - clear: both; + line-height: 36px; + color: #333333; + border-bottom: 1px solid #eee; } label, input, @@ -610,19 +587,12 @@ textarea { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; - line-height: normal; -} -label { - padding-top: 6px; - font-size: 13px; line-height: 18px; - float: left; - width: 130px; - text-align: right; - color: #404040; } -form .input { - margin-left: 150px; +label { + display: block; + margin-bottom: 5px; + color: #333333; } input[type=checkbox], input[type=radio] { cursor: pointer; @@ -637,13 +607,13 @@ select, padding: 4px; font-size: 13px; line-height: 18px; - color: #808080; + color: #555555; border: 1px solid #ccc; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } -/* mini reset for non-html5 file types */ +/* Mini reset for unique input types */ input[type=checkbox], input[type=radio] { width: auto; height: auto; @@ -681,21 +651,6 @@ select[multiple] { textarea { height: auto; } -.uneditable-input { - background-color: #ffffff; - display: block; - border-color: #eee; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - cursor: not-allowed; -} -:-moz-placeholder { - color: #bfbfbf; -} -::-webkit-input-placeholder { - color: #bfbfbf; -} input, textarea { -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; -moz-transition: border linear 0.2s, box-shadow linear 0.2s; @@ -719,34 +674,6 @@ input[type=file]:focus, input[type=checkbox]:focus, select:focus { box-shadow: none; outline: 1px dotted #666; } -form div.clearfix.error { - background: #fae5e3; - padding: 10px 0; - margin: -10px 0 10px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -form div.clearfix.error > label, form div.clearfix.error span.help-inline, form div.clearfix.error span.help-block { - color: #9d261d; -} -form div.clearfix.error input, form div.clearfix.error textarea { - border-color: #c87872; - -webkit-box-shadow: 0 0 3px rgba(171, 41, 32, 0.25); - -moz-box-shadow: 0 0 3px rgba(171, 41, 32, 0.25); - box-shadow: 0 0 3px rgba(171, 41, 32, 0.25); -} -form div.clearfix.error input:focus, form div.clearfix.error textarea:focus { - border-color: #b9554d; - -webkit-box-shadow: 0 0 6px rgba(171, 41, 32, 0.5); - -moz-box-shadow: 0 0 6px rgba(171, 41, 32, 0.5); - box-shadow: 0 0 6px rgba(171, 41, 32, 0.5); -} -form div.clearfix.error .input-prepend span.add-on, form div.clearfix.error .input-append span.add-on { - background: #f4c8c5; - border-color: #c87872; - color: #b9554d; -} .input-mini { width: 60px; } @@ -871,31 +798,63 @@ textarea[readonly] { border-color: #ddd; cursor: not-allowed; } -.actions { - background: #f5f5f5; +.has-error { + background: #f8dcda; + padding: 9px 0; + margin: -10px 0 10px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.has-error > label, .has-error span.help-inline, .has-error span.help-block { + color: #9d261d; +} +.has-error input, .has-error textarea, .has-error select { + border-color: #c87872; + -webkit-box-shadow: 0 0 3px rgba(171, 41, 32, 0.25); + -moz-box-shadow: 0 0 3px rgba(171, 41, 32, 0.25); + box-shadow: 0 0 3px rgba(171, 41, 32, 0.25); +} +.has-error input:focus, .has-error textarea:focus, .has-error select:focus { + border-color: #b9554d; + -webkit-box-shadow: 0 0 6px rgba(171, 41, 32, 0.5); + -moz-box-shadow: 0 0 6px rgba(171, 41, 32, 0.5); + box-shadow: 0 0 6px rgba(171, 41, 32, 0.5); +} +.has-error .input-prepend span.add-on, .has-error .input-append span.add-on { + background: #f4c8c5; + border-color: #c87872; + color: #b9554d; +} +.form-actions { + padding: 17px 20px 18px; margin-top: 18px; margin-bottom: 18px; - padding: 17px 20px 18px 150px; + background-color: #f5f5f5; border-top: 1px solid #ddd; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; } -.actions .secondary-action { - float: right; +.uneditable-input { + background-color: #ffffff; + display: block; + border-color: #eee; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + cursor: not-allowed; } -.actions .secondary-action a { - line-height: 30px; +:-moz-placeholder { + color: #777777; } -.actions .secondary-action a:hover { - text-decoration: underline; +::-webkit-input-placeholder { + color: #777777; } -.help-inline, .help-block { - font-size: 11px; - line-height: 18px; - color: #bfbfbf; +.help-text { + margin-top: 5px; + margin-bottom: 0; + color: #777777; } .help-inline { + display: inline; padding-left: 5px; *position: relative; /* IE6-7 */ @@ -909,7 +868,7 @@ textarea[readonly] { max-width: 600px; } .inline-inputs { - color: #808080; + color: #555555; } .inline-inputs span, .inline-inputs input { display: inline-block; @@ -942,7 +901,7 @@ textarea[readonly] { margin-right: -1px; font-weight: normal; line-height: 18px; - color: #bfbfbf; + color: #777777; text-align: center; text-shadow: 0 1px 0 #ffffff; -webkit-border-radius: 3px 0 0 3px; @@ -971,89 +930,36 @@ textarea[readonly] { margin-right: 0; margin-left: -1px; } -.inputs-list { - margin: 0 0 5px; - width: 100%; -} -.inputs-list li { - display: block; - padding: 0; - width: 100%; -} -.inputs-list label { - display: block; - float: none; - width: auto; - padding: 0; - line-height: 18px; - text-align: left; - white-space: normal; -} -.inputs-list label strong { - color: #808080; -} -.inputs-list label small { - font-size: 11px; - font-weight: normal; -} -.inputs-list .inputs-list { - margin-left: 25px; - margin-bottom: 10px; - padding-top: 0; -} -.inputs-list:first-child { - padding-top: 6px; -} -.inputs-list li + li { - padding-top: 2px; -} -.inputs-list input[type=radio], .inputs-list input[type=checkbox] { - margin-bottom: 0; -} -.form-stacked { - padding-left: 20px; -} -.form-stacked fieldset { - padding-top: 9px; -} -.form-stacked legend { - padding-left: 0; +.control-group { + margin-bottom: 18px; } -.form-stacked label { - display: block; - float: none; - width: auto; +.control-group > label { font-weight: bold; - text-align: left; - line-height: 20px; - padding-top: 0; -} -.form-stacked .clearfix { - margin-bottom: 9px; } -.form-stacked .clearfix div.input { - margin-left: 0; -} -.form-stacked .inputs-list { - margin-bottom: 0; +.form-horizontal .control-group > label { + float: left; + width: 130px; + padding-top: 5px; + text-align: right; } -.form-stacked .inputs-list li { - padding-top: 0; +.form-horizontal .controls { + margin-left: 150px; } -.form-stacked .inputs-list li label { - font-weight: normal; - padding-top: 0; +.form-horizontal .control-list { + padding-top: 6px; } -.form-stacked div.clearfix.error { - padding-top: 10px; - padding-bottom: 10px; - padding-left: 10px; - margin-top: 0; - margin-left: -10px; +.form-horizontal .form-actions { + padding-left: 150px; } -.form-stacked .actions { - margin-left: -20px; - padding-left: 20px; +.radial-test { + background-color: #009900; + background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(#990000), to(#009900)); + background-image: -webkit-radial-gradient(circle, #990000, #009900); + background-image: -moz-radial-gradient(circle, #990000, #009900); + background-image: -ms-radial-gradient(circle, #990000, #009900); + background-repeat: no-repeat; + width: 100%; + height: 940px; } /* * Tables.less @@ -1214,7 +1120,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { overflow: visible; } .topbar a { - color: #bfbfbf; + color: #777777; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } .topbar .brand a:hover, .topbar ul .active > a { @@ -1277,20 +1183,20 @@ table .headerSortUp.purple, table .headerSortDown.purple { transition: none; } .topbar input:-moz-placeholder { - color: #e6e6e6; + color: #cccccc; } .topbar input::-webkit-input-placeholder { - color: #e6e6e6; + color: #cccccc; } .topbar input:hover { - background-color: #bfbfbf; + background-color: #777777; background-color: rgba(255, 255, 255, 0.5); color: #ffffff; } .topbar input:focus, .topbar input.focused { outline: 0; background-color: #ffffff; - color: #404040; + color: #333333; text-shadow: 0 1px 0 #ffffff; border: 0; padding: 5px 10px; @@ -1301,7 +1207,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { .topbar-inner { background-color: #222; background-color: #222222; - background-repeat: repeat-x; 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); @@ -1309,6 +1214,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { 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); @@ -1369,7 +1275,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { } .nav .dropdown-menu li a:hover { background-color: #191919; - background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919)); background-image: -moz-linear-gradient(top, #292929, #191919); background-image: -ms-linear-gradient(top, #292929, #191919); @@ -1377,6 +1282,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { background-image: -webkit-linear-gradient(top, #292929, #191919); background-image: -o-linear-gradient(top, #292929, #191919); background-image: linear-gradient(top, #292929, #191919); + background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#292929', endColorstr='#191919', GradientType=0); color: #ffffff; } @@ -1456,12 +1362,11 @@ table .headerSortUp.purple, table .headerSortDown.purple { clear: both; font-weight: normal; line-height: 18px; - color: #808080; + color: #555555; text-shadow: 0 1px 0 #ffffff; } .topbar .dropdown-menu a:hover, .dropdown-menu a:hover { background-color: #dddddd; - background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd)); background-image: -moz-linear-gradient(top, #eeeeee, #dddddd); background-image: -ms-linear-gradient(top, #eeeeee, #dddddd); @@ -1469,8 +1374,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { background-image: -webkit-linear-gradient(top, #eeeeee, #dddddd); background-image: -o-linear-gradient(top, #eeeeee, #dddddd); background-image: linear-gradient(top, #eeeeee, #dddddd); + background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0); - color: #404040; + color: #333333; text-decoration: none; -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); @@ -1532,7 +1438,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { border-color: #eee #eee #ddd; } .tabs > li.active > a { - color: #808080; + color: #555555; background-color: #ffffff; border: 1px solid #ddd; border-bottom-color: transparent; @@ -1588,7 +1494,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { margin: 0 0 18px; padding: 7px 14px; background-color: #f5f5f5; - background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5)); background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); @@ -1596,6 +1501,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); background-image: linear-gradient(top, #ffffff, #f5f5f5); + background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); border: 1px solid #ddd; -webkit-border-radius: 3px; @@ -1611,10 +1517,10 @@ table .headerSortUp.purple, table .headerSortDown.purple { } .breadcrumb .divider { padding: 0 5px; - color: #bfbfbf; + color: #777777; } .breadcrumb .active a { - color: #404040; + color: #333333; } .hero-unit { background-color: #f5f5f5; @@ -1673,7 +1579,6 @@ footer { .btn.error, .alert-message.error { background-color: #c43c35; - background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35)); background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); @@ -1681,6 +1586,7 @@ footer { background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); background-image: linear-gradient(top, #ee5f5b, #c43c35); + background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); border-color: #c43c35 #c43c35 #882a25; @@ -1688,7 +1594,6 @@ footer { } .btn.success, .alert-message.success { background-color: #57a957; - background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); background-image: -moz-linear-gradient(top, #62c462, #57a957); background-image: -ms-linear-gradient(top, #62c462, #57a957); @@ -1696,6 +1601,7 @@ footer { background-image: -webkit-linear-gradient(top, #62c462, #57a957); background-image: -o-linear-gradient(top, #62c462, #57a957); background-image: linear-gradient(top, #62c462, #57a957); + background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); border-color: #57a957 #57a957 #3d773d; @@ -1703,7 +1609,6 @@ footer { } .btn.info, .alert-message.info { background-color: #339bb9; - background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); @@ -1711,6 +1616,7 @@ footer { background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); background-image: -o-linear-gradient(top, #5bc0de, #339bb9); background-image: linear-gradient(top, #5bc0de, #339bb9); + background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); border-color: #339bb9 #339bb9 #22697d; @@ -1720,13 +1626,13 @@ footer { cursor: pointer; display: inline-block; background-color: #e6e6e6; - background-repeat: no-repeat; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-repeat: no-repeat; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); padding: 5px 14px 6px; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); @@ -1758,7 +1664,6 @@ footer { .btn.primary { color: #ffffff; background-color: #0064cd; - background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd)); background-image: -moz-linear-gradient(top, #049cdb, #0064cd); background-image: -ms-linear-gradient(top, #049cdb, #0064cd); @@ -1766,6 +1671,7 @@ footer { background-image: -webkit-linear-gradient(top, #049cdb, #0064cd); background-image: -o-linear-gradient(top, #049cdb, #0064cd); background-image: linear-gradient(top, #049cdb, #0064cd); + background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); border-color: #0064cd #0064cd #003f81; @@ -1843,9 +1749,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { position: relative; padding: 7px 15px; margin-bottom: 18px; - color: #404040; + color: #333333; background-color: #eedc94; - background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94)); background-image: -moz-linear-gradient(top, #fceec1, #eedc94); background-image: -ms-linear-gradient(top, #fceec1, #eedc94); @@ -1853,6 +1758,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { background-image: -webkit-linear-gradient(top, #fceec1, #eedc94); background-image: -o-linear-gradient(top, #fceec1, #eedc94); background-image: linear-gradient(top, #fceec1, #eedc94); + background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); border-color: #eedc94 #eedc94 #e4c652; @@ -1905,13 +1811,13 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { margin-bottom: 0; } .alert-message.block-message li { - color: #404040; + color: #333333; } .alert-message.block-message .alert-actions { margin-top: 5px; } .alert-message.block-message.error, .alert-message.block-message.success, .alert-message.block-message.info { - color: #404040; + color: #333333; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); } .alert-message.block-message.error { @@ -1962,7 +1868,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .pagination .disabled a, .pagination .disabled a:hover { background-color: transparent; - color: #bfbfbf; + color: #777777; } .pagination .next a { border: 0; @@ -2232,7 +2138,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .label { padding: 1px 3px 2px; - background-color: #bfbfbf; + background-color: #777777; font-size: 9.75px; font-weight: bold; color: #ffffff; -- cgit v1.2.3 From 4e9849966d0f7b18cd4b8a22f6ef98c6900a2099 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Sep 2011 01:43:14 -0700 Subject: update topbar dropdown arrow to match link and hover colors --- bootstrap.css | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index d3bb942cd..33cc011f9 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: Thu Sep 29 01:39:48 PDT 2011 + * Date: Thu Sep 29 01:42: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). @@ -951,16 +951,6 @@ textarea[readonly] { .form-horizontal .form-actions { padding-left: 150px; } -.radial-test { - background-color: #009900; - background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(#990000), to(#009900)); - background-image: -webkit-radial-gradient(circle, #990000, #009900); - background-image: -moz-radial-gradient(circle, #990000, #009900); - background-image: -ms-radial-gradient(circle, #990000, #009900); - background-repeat: no-repeat; - width: 100%; - height: 940px; -} /* * Tables.less * Tables for, you guessed it, tabular data @@ -1307,14 +1297,20 @@ table .headerSortUp.purple, table .headerSortDown.purple { text-indent: -99999px; vertical-align: top; margin-top: 8px; - margin-left: 4px; + margin-left: 6px; border-left: 4px solid transparent; border-right: 4px solid transparent; border-top: 4px solid #ffffff; - filter: alpha(opacity=50); - -khtml-opacity: 0.5; - -moz-opacity: 0.5; - opacity: 0.5; + filter: alpha(opacity=30); + -khtml-opacity: 0.3; + -moz-opacity: 0.3; + opacity: 0.3; +} +.dropdown:hover .dropdown-toggle:after { + filter: alpha(opacity=100); + -khtml-opacity: 1; + -moz-opacity: 1; + opacity: 1; } .dropdown-menu { background-color: #ffffff; -- cgit v1.2.3 From 00204a80cf1c45cb9d7d80986756401d304a3944 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Sep 2011 01:44:51 -0700 Subject: change h4 back to lineheight * 2 --- bootstrap.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 33cc011f9..acc05c717 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: Thu Sep 29 01:42:34 PDT 2011 + * Date: Thu Sep 29 01:44:42 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). @@ -441,20 +441,20 @@ h3 { h3 small { font-size: 14px; } -h4, h5, h6 { - line-height: 18px; -} h4 { font-size: 16px; + line-height: 36px; } h4 small { font-size: 12px; } h5 { font-size: 14px; + line-height: 18px; } h6 { font-size: 13px; + line-height: 18px; color: #777777; text-transform: uppercase; } -- cgit v1.2.3 From f54568fa31396556a0df7bf8e2b180885e2b1c3f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Sep 2011 01:47:55 -0700 Subject: round the corners on the search form inputs like a boss --- bootstrap.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index acc05c717..6758ea7eb 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: Thu Sep 29 01:44:42 PDT 2011 + * Date: Thu Sep 29 01:47:26 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). @@ -930,6 +930,11 @@ textarea[readonly] { margin-right: 0; margin-left: -1px; } +.form-search .search-query { + -webkit-border-radius: 14px; + -moz-border-radius: 14px; + border-radius: 14px; +} .control-group { margin-bottom: 18px; } -- cgit v1.2.3 From 0a6d8c30db0600ab8d33e14ead0ff120cd03ac9d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Sep 2011 02:21:02 -0700 Subject: adding button groups and toolbars like a boss --- bootstrap.css | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 6758ea7eb..92da336f6 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: Thu Sep 29 01:47:26 PDT 2011 + * Date: Thu Sep 29 02:20: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). @@ -1726,6 +1726,62 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { padding: 0; border: 0; } +.btn-toolbar { + zoom: 1; +} +.btn-toolbar:before, .btn-toolbar:after { + display: table; + content: ""; + zoom: 1; + *display: inline; +} +.btn-toolbar:after { + clear: both; +} +.btn-toolbar .btn-group { + float: left; + margin-right: 10px; +} +.btn-group { + zoom: 1; +} +.btn-group:before, .btn-group:after { + display: table; + content: ""; + zoom: 1; + *display: inline; +} +.btn-group:after { + clear: both; +} +.btn-group .btn { + position: relative; + float: left; + margin-left: -1px; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.btn-group .btn:first-child { + margin-left: 0; + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; +} +.btn-group .btn:last-child { + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; +} +.btn-group .btn:hover, .btn-group .btn:focus, .btn-group .btn:active { + z-index: 2; +} .close { float: right; color: #000000; -- cgit v1.2.3 From 96dd7a2903aa5213ddb364b385660e26396dc670 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 4 Oct 2011 00:20:38 -0700 Subject: update variables to inlude @baseFontSize, @baseFontFamily, @baseLineHeight for easier customization; added placeholder for @primaryButtonColor, but didn't implement --- bootstrap.css | 69 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 34 insertions(+), 35 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 92da336f6..75928c749 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: Thu Sep 29 02:20:34 PDT 2011 + * Date: Tue Oct 4 00:16:55 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). @@ -187,9 +187,8 @@ body { margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; - font-weight: normal; line-height: 18px; - color: #333333; + color: #404040; } .container { width: 940px; @@ -393,14 +392,14 @@ a:hover { * Headings, body text, lists, code, and more for a versatile and durable typography system * ---------------------------------------------------------------------------------------- */ p { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; - font-weight: normal; line-height: 18px; margin-bottom: 9px; } p small { font-size: 11px; - color: #777777; + color: #bfbfbf; } h1, h2, @@ -409,7 +408,7 @@ h4, h5, h6 { font-weight: bold; - color: #333333; + color: #404040; } h1 small, h2 small, @@ -417,7 +416,7 @@ h3 small, h4 small, h5 small, h6 small { - color: #777777; + color: #bfbfbf; } h1 { margin-bottom: 18px; @@ -455,7 +454,7 @@ h5 { h6 { font-size: 13px; line-height: 18px; - color: #777777; + color: #bfbfbf; text-transform: uppercase; } ul, ol { @@ -475,7 +474,7 @@ ol { } li { line-height: 18px; - color: #555555; + color: #808080; } ul.unstyled { list-style: none; @@ -508,7 +507,7 @@ em { line-height: inherit; } .muted { - color: #777777; + color: #bfbfbf; } blockquote { margin-bottom: 18px; @@ -526,7 +525,7 @@ blockquote small { font-size: 12px; font-weight: 300; line-height: 18px; - color: #777777; + color: #bfbfbf; } blockquote small:before { content: '\2014 \00A0'; @@ -538,7 +537,7 @@ address { } code, pre { padding: 0 3px 2px; - font-family: Monaco, Andale Mono, Courier New, monospace; + font-family: Menlo, Monaco, Andale Mono, Courier New, monospace; font-size: 12px; -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -577,7 +576,7 @@ legend { margin-bottom: 27px; font-size: 19.5px; line-height: 36px; - color: #333333; + color: #404040; border-bottom: 1px solid #eee; } label, @@ -592,7 +591,7 @@ textarea { label { display: block; margin-bottom: 5px; - color: #333333; + color: #404040; } input[type=checkbox], input[type=radio] { cursor: pointer; @@ -607,7 +606,7 @@ select, padding: 4px; font-size: 13px; line-height: 18px; - color: #555555; + color: #808080; border: 1px solid #ccc; -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -843,15 +842,15 @@ textarea[readonly] { cursor: not-allowed; } :-moz-placeholder { - color: #777777; + color: #bfbfbf; } ::-webkit-input-placeholder { - color: #777777; + color: #bfbfbf; } .help-text { margin-top: 5px; margin-bottom: 0; - color: #777777; + color: #bfbfbf; } .help-inline { display: inline; @@ -868,7 +867,7 @@ textarea[readonly] { max-width: 600px; } .inline-inputs { - color: #555555; + color: #808080; } .inline-inputs span, .inline-inputs input { display: inline-block; @@ -901,7 +900,7 @@ textarea[readonly] { margin-right: -1px; font-weight: normal; line-height: 18px; - color: #777777; + color: #bfbfbf; text-align: center; text-shadow: 0 1px 0 #ffffff; -webkit-border-radius: 3px 0 0 3px; @@ -1115,7 +1114,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { overflow: visible; } .topbar a { - color: #777777; + color: #bfbfbf; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } .topbar .brand a:hover, .topbar ul .active > a { @@ -1178,20 +1177,20 @@ table .headerSortUp.purple, table .headerSortDown.purple { transition: none; } .topbar input:-moz-placeholder { - color: #cccccc; + color: #e6e6e6; } .topbar input::-webkit-input-placeholder { - color: #cccccc; + color: #e6e6e6; } .topbar input:hover { - background-color: #777777; + background-color: #bfbfbf; background-color: rgba(255, 255, 255, 0.5); color: #ffffff; } .topbar input:focus, .topbar input.focused { outline: 0; background-color: #ffffff; - color: #333333; + color: #404040; text-shadow: 0 1px 0 #ffffff; border: 0; padding: 5px 10px; @@ -1363,7 +1362,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { clear: both; font-weight: normal; line-height: 18px; - color: #555555; + color: #808080; text-shadow: 0 1px 0 #ffffff; } .topbar .dropdown-menu a:hover, .dropdown-menu a:hover { @@ -1377,7 +1376,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { background-image: linear-gradient(top, #eeeeee, #dddddd); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0); - color: #333333; + color: #404040; text-decoration: none; -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); @@ -1439,7 +1438,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { border-color: #eee #eee #ddd; } .tabs > li.active > a { - color: #555555; + color: #808080; background-color: #ffffff; border: 1px solid #ddd; border-bottom-color: transparent; @@ -1518,10 +1517,10 @@ table .headerSortUp.purple, table .headerSortDown.purple { } .breadcrumb .divider { padding: 0 5px; - color: #777777; + color: #bfbfbf; } .breadcrumb .active a { - color: #333333; + color: #404040; } .hero-unit { background-color: #f5f5f5; @@ -1806,7 +1805,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { position: relative; padding: 7px 15px; margin-bottom: 18px; - color: #333333; + color: #404040; background-color: #eedc94; background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94)); background-image: -moz-linear-gradient(top, #fceec1, #eedc94); @@ -1868,13 +1867,13 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { margin-bottom: 0; } .alert-message.block-message li { - color: #333333; + color: #404040; } .alert-message.block-message .alert-actions { margin-top: 5px; } .alert-message.block-message.error, .alert-message.block-message.success, .alert-message.block-message.info { - color: #333333; + color: #404040; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); } .alert-message.block-message.error { @@ -1925,7 +1924,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .pagination .disabled a, .pagination .disabled a:hover { background-color: transparent; - color: #777777; + color: #bfbfbf; } .pagination .next a { border: 0; @@ -2195,7 +2194,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .label { padding: 1px 3px 2px; - background-color: #777777; + background-color: #bfbfbf; font-size: 9.75px; font-weight: bold; color: #ffffff; -- cgit v1.2.3 From cde17c94919ef26093145e5412c6d425d3199d9f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 4 Oct 2011 00:48:31 -0700 Subject: adding placeholder font-face mixin which doesn't work yet --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 75928c749..2b0e88c86 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 00:16:55 PDT 2011 + * Date: Tue Oct 4 00:48:20 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 913338f930736a1b186178469c6eafb55c1dbea8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 4 Oct 2011 01:15:31 -0700 Subject: fixing multi select on chromium ubuntu by setting background color explicitly --- bootstrap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 2b0e88c86..ab96f6c7c 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 00:48:20 PDT 2011 + * Date: Tue Oct 4 01:15:08 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). @@ -645,6 +645,7 @@ select, input[type=file] { } select[multiple] { + background-color: #ffffff; height: inherit; } textarea { -- cgit v1.2.3 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 From 2c0a60a777d85c9223abf245be56308b8c62804c Mon Sep 17 00:00:00 2001 From: Jeff Adams Date: Fri, 21 Oct 2011 11:56:13 -0500 Subject: remove negative margin on .row so we don't hang off the left edge of the screen --- bootstrap.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 0f6d58ae0..7eef72fee 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 23:44:56 PDT 2011 + * Date: Fri Oct 21 11:54:44 CDT 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). @@ -2268,6 +2268,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { width: auto; padding: 0 10px; } + .row { + margin-left: 0; + } [class*="span"] { float: none; display: block; @@ -2299,6 +2302,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { width: auto; padding: 0 10px; } + .row { + margin-left: 0; + } [class*="span"] { float: none; display: block; -- cgit v1.2.3 From d4675bf4ef8019fc80e3b6816d3597c07cde81df Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 22 Oct 2011 15:49:42 -0700 Subject: updating the docs to include more responsive fixes, adding rows to the responsive changes as well to undo negative margin --- bootstrap.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 0f6d58ae0..256ab096b 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 23:44:56 PDT 2011 + * Date: Sat Oct 22 15:49:12 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). @@ -2268,6 +2268,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { width: auto; padding: 0 10px; } + .row { + margin-left: 0; + } [class*="span"] { float: none; display: block; @@ -2299,6 +2302,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { width: auto; padding: 0 10px; } + .row { + margin-left: 0; + } [class*="span"] { float: none; display: block; -- cgit v1.2.3 From b4c0d2a6b2fe1bc92c3635cda71b63ee08a05be4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 22 Oct 2011 22:49:37 -0700 Subject: tweaks to the responsive layout to improve type --- bootstrap.css | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index aebabeecc..c055a79c9 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,11 +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. -<<<<<<< HEAD - * Date: Sat Oct 22 15:49:12 PDT 2011 -======= - * Date: Fri Oct 21 11:54:44 CDT 2011 ->>>>>>> 2e09ffe3832106fab60dc01cc3159c13029bdf68 + * Date: Sat Oct 22 22:49:01 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). @@ -520,7 +516,7 @@ pre { background-color: #f5f5f5; display: block; padding: 8.5px; - margin: 0 0 18px; + margin: 0 0 9px; line-height: 18px; font-size: 12px; border: 1px solid #ccc; @@ -530,7 +526,7 @@ pre { border-radius: 3px; white-space: pre; white-space: pre-wrap; - word-wrap: break-word; + word-break: break-all; } /* Forms.less * Base styles for various input types, form layouts, and states @@ -2270,7 +2266,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { @media (max-width: 480px) { .container { width: auto; - padding: 0 10px; + padding: 0 15px; } .row { margin-left: 0; -- cgit v1.2.3 From e616026d678239104b93cafca9a77ea74a4c0ddf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 26 Oct 2011 21:04:14 -0700 Subject: update to docs to cleanup pagination for smartphones, fix some pagination inconsistencies --- bootstrap.css | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index c055a79c9..0baa88d11 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 22 22:49:01 PDT 2011 + * Date: Wed Oct 26 21:03: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). @@ -479,15 +479,13 @@ blockquote { padding-left: 15px; } blockquote p { - font-size: 14px; + font-size: 16px; font-weight: 300; - line-height: 18px; + line-height: 22.5px; margin-bottom: 0; } blockquote small { display: block; - font-size: 12px; - font-weight: 300; line-height: 18px; color: #bfbfbf; } -- cgit v1.2.3 From f3128d0fa1f1f14104b7c4ffab54f083b99a108e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Oct 2011 23:00:09 -0700 Subject: overhauled the front page to feel a bit more marketing-like, added the awesome glyphicons to bring some life to the docs --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 0baa88d11..ed0556b3d 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: Wed Oct 26 21:03:54 PDT 2011 + * Date: Thu Oct 27 12:48:41 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 2764cfda6dbda56b4a50561fb8cd2a8be86dc096 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 28 Oct 2011 18:38:06 -0700 Subject: remove html from body background --- bootstrap.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index ed0556b3d..ec9217a21 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: Thu Oct 27 12:48:41 PDT 2011 + * Date: Fri Oct 28 18:37:59 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). @@ -180,10 +180,8 @@ textarea { * Scaffolding * Basic and global styles for generating a grid system, structural layout, and page templates * ------------------------------------------------------------------------------------------- */ -html, body { - background-color: #ffffff; -} body { + background-color: #ffffff; margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; -- cgit v1.2.3 From 3f512adf953da3a3fbbfca18b138fb6659f2b77f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 30 Oct 2011 20:14:27 -0700 Subject: updated docs and type styles for blockquotes and a few fixes for type --- bootstrap.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index ec9217a21..ca2bfe0b1 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: Fri Oct 28 18:37:59 PDT 2011 + * Date: Sun Oct 30 20:12: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). @@ -490,6 +490,12 @@ blockquote small { blockquote small:before { content: '\2014 \00A0'; } +blockquote.pull-right { + float: right; +} +blockquote.pull-right p, blockquote.pull-right small { + text-align: right; +} address { display: block; line-height: 18px; -- cgit v1.2.3 From 02bf27592c8eec51795ac806390bc57db501926d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 31 Oct 2011 19:37:10 -0700 Subject: overhaul the table styles and update those everywhere in the docs, update the button docs, spec out the forms docs --- bootstrap.css | 109 +++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 82 insertions(+), 27 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index ca2bfe0b1..2795e4251 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 30 20:12:53 PDT 2011 + * Date: Mon Oct 31 19:36:50 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). @@ -927,17 +927,10 @@ textarea[readonly] { * ---------------------------------------- */ table { width: 100%; - margin-bottom: 18px; padding: 0; - border-collapse: separate; - *border-collapse: collapse; - /* IE7, collapse table to remove spacing */ - + margin-bottom: 18px; font-size: 13px; - border: 1px solid #ddd; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + border-collapse: collapse; } table th, table td { padding: 10px 10px 9px; @@ -948,47 +941,109 @@ table th { padding-top: 9px; font-weight: bold; vertical-align: middle; - border-bottom: 1px solid #ddd; } table td { vertical-align: top; + border-top: 1px solid #ddd; } -table th + th, table td + td { - border-left: 1px solid #ddd; -} -table tr + tr td { +table tbody th { border-top: 1px solid #ddd; + vertical-align: top; +} +.condensed-table th, .condensed-table td { + padding: 5px 5px 4px; +} +.bordered-table { + border: 1px solid #ddd; + border-collapse: separate; + *border-collapse: collapse; + /* IE7, collapse table to remove spacing */ + + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } -table tbody tr:first-child td:first-child { +.bordered-table th + th, .bordered-table td + td, .bordered-table th + td { + border-left: 1px solid #ddd; +} +.bordered-table thead:first-child tr:first-child th:first-child, .bordered-table tbody:first-child 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; } -table tbody tr:first-child td:last-child { +.bordered-table thead:first-child tr:first-child th:last-child, .bordered-table tbody:first-child 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; } -table tbody tr:last-child td:first-child { +.bordered-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; } -table tbody tr:last-child td:last-child { +.bordered-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; } -.zebra-striped tbody tr:nth-child(odd) td { +table .span1 { + width: 40px; +} +table .span2 { + width: 120px; +} +table .span3 { + width: 200px; +} +table .span4 { + width: 280px; +} +table .span5 { + width: 360px; +} +table .span6 { + width: 440px; +} +table .span7 { + width: 520px; +} +table .span8 { + width: 600px; +} +table .span9 { + width: 680px; +} +table .span10 { + width: 760px; +} +table .span11 { + width: 840px; +} +table .span12 { + width: 920px; +} +table .span13 { + width: 1000px; +} +table .span14 { + width: 1080px; +} +table .span15 { + width: 1160px; +} +table .span16 { + width: 1240px; +} +.striped-table tbody tr:nth-child(odd) td, .striped-table tbody tr:nth-child(odd) th { background-color: #f9f9f9; } -.zebra-striped tbody tr:hover td { +.striped-table tbody tr:hover td, .striped-table tbody tr:hover th { background-color: #f5f5f5; } -.zebra-striped .header { +table .header { cursor: pointer; } -.zebra-striped .header:after { +table .header:after { content: ""; float: right; margin-top: 7px; @@ -997,21 +1052,21 @@ table tbody tr:last-child td:last-child { border-color: #000 transparent; visibility: hidden; } -.zebra-striped .headerSortUp, .zebra-striped .headerSortDown { +table .headerSortUp, table .headerSortDown { background-color: rgba(141, 192, 219, 0.25); text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); } -.zebra-striped .header:hover:after { +table .header:hover:after { visibility: visible; } -.zebra-striped .headerSortDown:after, .zebra-striped .headerSortDown:hover:after { +table .headerSortDown:after, table .headerSortDown:hover:after { visibility: visible; filter: alpha(opacity=60); -khtml-opacity: 0.6; -moz-opacity: 0.6; opacity: 0.6; } -.zebra-striped .headerSortUp:after { +table .headerSortUp:after { border-bottom: none; border-left: 4px solid transparent; border-right: 4px solid transparent; -- cgit v1.2.3 From 31ea00304626ea68b758def41769606d4c049671 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 31 Oct 2011 21:45:46 -0700 Subject: remove alt tab styles for now, too complicated to accomplish both static and tabble; fix up CSS a bit --- bootstrap.css | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 3 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 2795e4251..163ee6bcd 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 31 19:36:50 PDT 2011 + * Date: Mon Oct 31 21:45:06 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). @@ -1495,17 +1495,77 @@ table .headerSortUp.purple, table .headerSortDown.purple { .tabbable.tabs-bottom .tabs > .active > a, .tabbable.tabs-bottom .tabs > .active > a:hover { border-color: transparent #ddd #ddd #ddd; } +.tabbable.tabs-left, .tabbable.tabs-right { + zoom: 1; +} +.tabbable.tabs-left:before, +.tabbable.tabs-right:before, +.tabbable.tabs-left:after, +.tabbable.tabs-right:after { + display: table; + content: ""; + zoom: 1; + *display: inline; +} +.tabbable.tabs-left:after, .tabbable.tabs-right:after { + clear: both; +} +.tabbable.tabs-left .tabs, .tabbable.tabs-right .tabs { + width: 100px; +} +.tabbable.tabs-left .tabs > li, .tabbable.tabs-right .tabs > li { + float: none; + margin-bottom: -1px; +} +.tabbable.tabs-left .tabs > li > a, .tabbable.tabs-right .tabs > li > a { + margin-bottom: 2px; +} +.tabbable.tabs-left .tabs > li > a:hover, .tabbable.tabs-right .tabs > li > a:hover { + border-color: transparent; +} +.tabbable.tabs-left .tab-content { + margin-left: 100px; +} .tabbable.tabs-left .tabs { float: left; } .tabbable.tabs-left .tabs > li { - float: none; + margin-right: -1px; +} +.tabbable.tabs-left .tabs > li > a { + margin-right: 0; + -webkit-border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; +} +.tabbable.tabs-left .tabs > li > a:hover { + border-right-color: #ddd; +} +.tabbable.tabs-left .tabs .active > a, .tabbable.tabs-left .tabs .active > a:hover { + border-color: #ddd; + border-right-color: transparent; +} +.tabbable.tabs-right .tab-content { + margin-right: 100px; } .tabbable.tabs-right .tabs { float: right; } .tabbable.tabs-right .tabs > li { - float: none; + margin-left: -1px; +} +.tabbable.tabs-right .tabs > li > a { + margin-left: 0; + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; +} +.tabbable.tabs-right .tabs > li > a:hover { + border-left-color: #ddd; +} +.tabbable.tabs-right .tabs .active > a, .tabbable.tabs-right .tabs .active > a:hover { + border-color: #ddd; + border-left-color: transparent; } .tabs .menu-dropdown, .tabs .dropdown-menu { top: 35px; -- cgit v1.2.3 From f459f826af827735f8bfea2e850dba1151b19efc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 31 Oct 2011 21:46:45 -0700 Subject: recompiling and pushing just to be sure --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 163ee6bcd..2c35362d0 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 31 21:45:06 PDT 2011 + * Date: Mon Oct 31 21:46: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). -- cgit v1.2.3 From 1fb98bed91977b710ae321443d0819939a1a8cc7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 12 Nov 2011 00:46:02 -0800 Subject: updated docs pages (still wip), adding misc css classes, added form styles from 1.4, added github buttons to homepage --- bootstrap.css | 80 +++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 24 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 2c35362d0..71712829f 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 31 21:46:38 PDT 2011 + * Date: Mon Nov 7 21:14:04 PST 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). @@ -763,33 +763,59 @@ textarea[readonly] { border-color: #ddd; cursor: not-allowed; } -.has-error { - background: #f8dcda; - padding: 9px 0; - margin: -10px 0 10px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; +form .clearfix.error > label, form .clearfix.error .help-block, form .clearfix.error .help-inline { + color: #b94a48; } -.has-error > label, .has-error span.help-inline, .has-error span.help-block { - color: #9d261d; +form .clearfix.error input, form .clearfix.error textarea { + color: #b94a48; + border-color: #ee5f5b; +} +form .clearfix.error input:focus, form .clearfix.error textarea:focus { + border-color: #e9322d; + -webkit-box-shadow: 0 0 6px #f8b9b7; + -moz-box-shadow: 0 0 6px #f8b9b7; + box-shadow: 0 0 6px #f8b9b7; +} +form .clearfix.error .input-prepend .add-on, form .clearfix.error .input-append .add-on { + color: #b94a48; + background-color: #fce6e6; + border-color: #b94a48; +} +form .clearfix.warning > label, form .clearfix.warning .help-block, form .clearfix.warning .help-inline { + color: #c09853; +} +form .clearfix.warning input, form .clearfix.warning textarea { + color: #c09853; + border-color: #ccae64; +} +form .clearfix.warning input:focus, form .clearfix.warning textarea:focus { + border-color: #be9a3f; + -webkit-box-shadow: 0 0 6px #e5d6b1; + -moz-box-shadow: 0 0 6px #e5d6b1; + box-shadow: 0 0 6px #e5d6b1; } -.has-error input, .has-error textarea, .has-error select { - border-color: #c87872; - -webkit-box-shadow: 0 0 3px rgba(171, 41, 32, 0.25); - -moz-box-shadow: 0 0 3px rgba(171, 41, 32, 0.25); - box-shadow: 0 0 3px rgba(171, 41, 32, 0.25); +form .clearfix.warning .input-prepend .add-on, form .clearfix.warning .input-append .add-on { + color: #c09853; + background-color: #d2b877; + border-color: #c09853; } -.has-error input:focus, .has-error textarea:focus, .has-error select:focus { - border-color: #b9554d; - -webkit-box-shadow: 0 0 6px rgba(171, 41, 32, 0.5); - -moz-box-shadow: 0 0 6px rgba(171, 41, 32, 0.5); - box-shadow: 0 0 6px rgba(171, 41, 32, 0.5); +form .clearfix.success > label, form .clearfix.success .help-block, form .clearfix.success .help-inline { + color: #468847; } -.has-error .input-prepend span.add-on, .has-error .input-append span.add-on { - background: #f4c8c5; - border-color: #c87872; - color: #b9554d; +form .clearfix.success input, form .clearfix.success textarea { + color: #468847; + border-color: #57a957; +} +form .clearfix.success input:focus, form .clearfix.success textarea:focus { + border-color: #458845; + -webkit-box-shadow: 0 0 6px #9acc9a; + -moz-box-shadow: 0 0 6px #9acc9a; + box-shadow: 0 0 6px #9acc9a; +} +form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-append .add-on { + color: #468847; + background-color: #bcddbc; + border-color: #468847; } .form-actions { padding: 17px 20px 18px; @@ -2377,6 +2403,12 @@ 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); } +.pull-right { + float: right; +} +.pull-left { + float: left; +} /* Responsive.less * For phone and tablet devices * ------------------------------------------------------------- */ -- cgit v1.2.3 From a0179322854a9d1e2b9363447c9884e40733d04f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 16 Nov 2011 23:58:36 -0800 Subject: start breaking down patterns.less into more distinct files, update docs for forms to use correct classes --- bootstrap.css | 604 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 302 insertions(+), 302 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 71712829f..c59d49954 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 Nov 7 21:14:04 PST 2011 + * Date: Wed Nov 16 23:58:14 PST 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). @@ -1440,238 +1440,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { .dropdown.open .dropdown-menu { display: block; } -.tabs, .pills { - margin: 0 0 20px; - padding: 0; - list-style: none; - zoom: 1; -} -.tabs:before, -.pills:before, -.tabs:after, -.pills:after { - display: table; - content: ""; - zoom: 1; - *display: inline; -} -.tabs:after, .pills:after { - clear: both; -} -.tabs > li, .pills > li { - float: left; -} -.tabs > li > a, .pills > li > a { - display: block; -} -.tabs { - border-color: #ddd; - border-style: solid; - border-width: 0 0 1px; -} -.tabs > li { - position: relative; - margin-bottom: -1px; -} -.tabs > li > a { - padding: 0 15px; - margin-right: 2px; - line-height: 36px; - border: 1px solid transparent; - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} -.tabs > li > a:hover { - text-decoration: none; - background-color: #eee; - border-color: #eee #eee #ddd; -} -.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; -} -.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, .tabbable.tabs-right { - zoom: 1; -} -.tabbable.tabs-left:before, -.tabbable.tabs-right:before, -.tabbable.tabs-left:after, -.tabbable.tabs-right:after { - display: table; - content: ""; - zoom: 1; - *display: inline; -} -.tabbable.tabs-left:after, .tabbable.tabs-right:after { - clear: both; -} -.tabbable.tabs-left .tabs, .tabbable.tabs-right .tabs { - width: 100px; -} -.tabbable.tabs-left .tabs > li, .tabbable.tabs-right .tabs > li { - float: none; - margin-bottom: -1px; -} -.tabbable.tabs-left .tabs > li > a, .tabbable.tabs-right .tabs > li > a { - margin-bottom: 2px; -} -.tabbable.tabs-left .tabs > li > a:hover, .tabbable.tabs-right .tabs > li > a:hover { - border-color: transparent; -} -.tabbable.tabs-left .tab-content { - margin-left: 100px; -} -.tabbable.tabs-left .tabs { - float: left; -} -.tabbable.tabs-left .tabs > li { - margin-right: -1px; -} -.tabbable.tabs-left .tabs > li > a { - margin-right: 0; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} -.tabbable.tabs-left .tabs > li > a:hover { - border-right-color: #ddd; -} -.tabbable.tabs-left .tabs .active > a, .tabbable.tabs-left .tabs .active > a:hover { - border-color: #ddd; - border-right-color: transparent; -} -.tabbable.tabs-right .tab-content { - margin-right: 100px; -} -.tabbable.tabs-right .tabs { - float: right; -} -.tabbable.tabs-right .tabs > li { - margin-left: -1px; -} -.tabbable.tabs-right .tabs > li > a { - margin-left: 0; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} -.tabbable.tabs-right .tabs > li > a:hover { - border-left-color: #ddd; -} -.tabbable.tabs-right .tabs .active > a, .tabbable.tabs-right .tabs .active > a:hover { - border-color: #ddd; - border-left-color: transparent; -} -.tabs .menu-dropdown, .tabs .dropdown-menu { - top: 35px; - border-width: 1px; - -webkit-border-radius: 0 6px 6px 6px; - -moz-border-radius: 0 6px 6px 6px; - border-radius: 0 6px 6px 6px; -} -.tabs a.menu:after, .tabs .dropdown-toggle:after { - border-top-color: #999; - margin-top: 15px; - margin-left: 5px; -} -.tabs li.open.menu .menu, .tabs .open.dropdown .dropdown-toggle { - border-color: #999; -} -.tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after { - border-top-color: #555; -} -.pills a { - margin: 5px 3px 5px 0; - padding: 0 15px; - line-height: 30px; - text-shadow: 0 1px 1px #ffffff; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} -.pills a:hover { - color: #ffffff; - text-decoration: none; - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); - background-color: #00438a; -} -.pills .active a { - color: #ffffff; - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); - background-color: #0069d6; -} -.pills-vertical > li { - float: none; -} -.tab-content > .tab-pane, .pill-content > .pill-pane { - display: none; -} -.tab-content > .active, .pill-content > .active { - display: block; -} -.breadcrumb { - margin: 0 0 18px; - padding: 7px 14px; - background-color: #f5f5f5; - background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5)); - background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5)); - background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); - background-image: linear-gradient(top, #ffffff, #f5f5f5); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); - border: 1px solid #ddd; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; -} -.breadcrumb li { - display: inline; - text-shadow: 0 1px 0 #ffffff; -} -.breadcrumb .divider { - padding: 0 5px; - color: #bfbfbf; -} -.breadcrumb .active a { - color: #404040; -} .hero-unit { background-color: #f5f5f5; margin-bottom: 30px; @@ -2038,18 +1806,308 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { background-color: #ddf4fb; border-color: #c6edf9; } -.pagination { - height: 36px; - margin: 18px 0; +.well { + background-color: #f5f5f5; + margin-bottom: 20px; + padding: 19px; + min-height: 20px; + border: 1px solid #eee; + border: 1px solid rgba(0, 0, 0, 0.05); + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -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); } -.pagination ul { - float: left; - margin: 0; - border: 1px solid #ddd; - border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; +.well blockquote { + border-color: #ddd; + border-color: rgba(0, 0, 0, 0.15); +} +.fade { + -webkit-transition: opacity 0.15s linear; + -moz-transition: opacity 0.15s linear; + -ms-transition: opacity 0.15s linear; + -o-transition: opacity 0.15s linear; + transition: opacity 0.15s linear; + opacity: 0; +} +.fade.in { + opacity: 1; +} +.label { + padding: 1px 3px 2px; + background-color: #bfbfbf; + font-size: 9.75px; + font-weight: bold; + color: #ffffff; + text-transform: uppercase; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +.label.important { + background-color: #c43c35; +} +.label.warning { + background-color: #f89406; +} +.label.success { + background-color: #46a546; +} +.label.notice { + background-color: #62cffc; +} +.pull-right { + float: right; +} +.pull-left { + float: left; +} +.tabs, .pills { + margin: 0 0 20px; + padding: 0; + list-style: none; + zoom: 1; +} +.tabs:before, +.pills:before, +.tabs:after, +.pills:after { + display: table; + content: ""; + zoom: 1; + *display: inline; +} +.tabs:after, .pills:after { + clear: both; +} +.tabs > li, .pills > li { + float: left; +} +.tabs > li > a, .pills > li > a { + display: block; +} +.tabs { + border-color: #ddd; + border-style: solid; + border-width: 0 0 1px; +} +.tabs > li { + position: relative; + margin-bottom: -1px; +} +.tabs > li > a { + padding: 0 15px; + margin-right: 2px; + line-height: 36px; + border: 1px solid transparent; + -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; +} +.tabs > li > a:hover { + text-decoration: none; + background-color: #eee; + border-color: #eee #eee #ddd; +} +.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; +} +.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, .tabbable.tabs-right { + zoom: 1; +} +.tabbable.tabs-left:before, +.tabbable.tabs-right:before, +.tabbable.tabs-left:after, +.tabbable.tabs-right:after { + display: table; + content: ""; + zoom: 1; + *display: inline; +} +.tabbable.tabs-left:after, .tabbable.tabs-right:after { + clear: both; +} +.tabbable.tabs-left .tabs, .tabbable.tabs-right .tabs { + width: 100px; +} +.tabbable.tabs-left .tabs > li, .tabbable.tabs-right .tabs > li { + float: none; + margin-bottom: -1px; +} +.tabbable.tabs-left .tabs > li > a, .tabbable.tabs-right .tabs > li > a { + margin-bottom: 2px; +} +.tabbable.tabs-left .tabs > li > a:hover, .tabbable.tabs-right .tabs > li > a:hover { + border-color: transparent; +} +.tabbable.tabs-left .tab-content { + margin-left: 100px; +} +.tabbable.tabs-left .tabs { + float: left; +} +.tabbable.tabs-left .tabs > li { + margin-right: -1px; +} +.tabbable.tabs-left .tabs > li > a { + margin-right: 0; + -webkit-border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; +} +.tabbable.tabs-left .tabs > li > a:hover { + border-right-color: #ddd; +} +.tabbable.tabs-left .tabs .active > a, .tabbable.tabs-left .tabs .active > a:hover { + border-color: #ddd; + border-right-color: transparent; +} +.tabbable.tabs-right .tab-content { + margin-right: 100px; +} +.tabbable.tabs-right .tabs { + float: right; +} +.tabbable.tabs-right .tabs > li { + margin-left: -1px; +} +.tabbable.tabs-right .tabs > li > a { + margin-left: 0; + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; +} +.tabbable.tabs-right .tabs > li > a:hover { + border-left-color: #ddd; +} +.tabbable.tabs-right .tabs .active > a, .tabbable.tabs-right .tabs .active > a:hover { + border-color: #ddd; + border-left-color: transparent; +} +.tabs .menu-dropdown, .tabs .dropdown-menu { + top: 35px; + border-width: 1px; + -webkit-border-radius: 0 6px 6px 6px; + -moz-border-radius: 0 6px 6px 6px; + border-radius: 0 6px 6px 6px; +} +.tabs a.menu:after, .tabs .dropdown-toggle:after { + border-top-color: #999; + margin-top: 15px; + margin-left: 5px; +} +.tabs li.open.menu .menu, .tabs .open.dropdown .dropdown-toggle { + border-color: #999; +} +.tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after { + border-top-color: #555; +} +.pills a { + margin: 5px 3px 5px 0; + padding: 0 15px; + line-height: 30px; + text-shadow: 0 1px 1px #ffffff; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; +} +.pills a:hover { + color: #ffffff; + text-decoration: none; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); + background-color: #00438a; +} +.pills .active a { + color: #ffffff; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); + background-color: #0069d6; +} +.pills-vertical > li { + float: none; +} +.tab-content > .tab-pane, .pill-content > .pill-pane { + display: none; +} +.tab-content > .active, .pill-content > .active { + display: block; +} +.breadcrumb { + margin: 0 0 18px; + padding: 7px 14px; + background-color: #f5f5f5; + background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5)); + background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); + background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5)); + background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); + background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); + background-image: linear-gradient(top, #ffffff, #f5f5f5); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); + border: 1px solid #ddd; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + -webkit-box-shadow: inset 0 1px 0 #ffffff; + -moz-box-shadow: inset 0 1px 0 #ffffff; + box-shadow: inset 0 1px 0 #ffffff; +} +.breadcrumb li { + display: inline; + text-shadow: 0 1px 0 #ffffff; +} +.breadcrumb .divider { + padding: 0 5px; + color: #bfbfbf; +} +.breadcrumb .active a { + color: #404040; +} +.pagination { + height: 36px; + margin: 18px 0; +} +.pagination ul { + float: left; + margin: 0; + border: 1px solid #ddd; + border: 1px solid rgba(0, 0, 0, 0.15); + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; -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); @@ -2079,24 +2137,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .pagination .next a { border: 0; } -.well { - background-color: #f5f5f5; - margin-bottom: 20px; - padding: 19px; - min-height: 20px; - border: 1px solid #eee; - border: 1px solid rgba(0, 0, 0, 0.05); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -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); -} -.well blockquote { - border-color: #ddd; - border-color: rgba(0, 0, 0, 0.15); -} .modal-backdrop { background-color: #000000; position: fixed; @@ -2331,40 +2371,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .popover .content p, .popover .content ul, .popover .content ol { margin-bottom: 0; } -.fade { - -webkit-transition: opacity 0.15s linear; - -moz-transition: opacity 0.15s linear; - -ms-transition: opacity 0.15s linear; - -o-transition: opacity 0.15s linear; - transition: opacity 0.15s linear; - opacity: 0; -} -.fade.in { - opacity: 1; -} -.label { - padding: 1px 3px 2px; - background-color: #bfbfbf; - font-size: 9.75px; - font-weight: bold; - color: #ffffff; - text-transform: uppercase; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -.label.important { - background-color: #c43c35; -} -.label.warning { - background-color: #f89406; -} -.label.success { - background-color: #46a546; -} -.label.notice { - background-color: #62cffc; -} .media-grid { margin-left: -20px; margin-bottom: 0; @@ -2403,12 +2409,6 @@ 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); } -.pull-right { - float: right; -} -.pull-left { - float: left; -} /* Responsive.less * For phone and tablet devices * ------------------------------------------------------------- */ -- cgit v1.2.3 From a8e88d14a422c3dfdb79eaf6d6a3a2f1144df150 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 17 Nov 2011 00:06:16 -0800 Subject: make form classes match table classes (readable left to right), update docs associated with it --- bootstrap.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index c59d49954..c88f4ecaf 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: Wed Nov 16 23:58:14 PST 2011 + * Date: Thu Nov 17 00:05:35 PST 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). @@ -921,7 +921,7 @@ form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-app margin-right: 0; margin-left: -1px; } -.form-search .search-query { +.search-form .search-query { -webkit-border-radius: 14px; -moz-border-radius: 14px; border-radius: 14px; @@ -932,19 +932,19 @@ form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-app .control-group > label { font-weight: bold; } -.form-horizontal .control-group > label { +.horizontal-form .control-group > label { float: left; width: 130px; padding-top: 5px; text-align: right; } -.form-horizontal .controls { +.horizontal-form .controls { margin-left: 150px; } -.form-horizontal .control-list { +.horizontal-form .control-list { padding-top: 6px; } -.form-horizontal .form-actions { +.horizontal-form .form-actions { padding-left: 150px; } /* -- cgit v1.2.3 From 160970560b819fe3e3a3396f7385ed8cafc43bf9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 17 Nov 2011 00:37:14 -0800 Subject: updated font mixins courtesy of @apancutt --- bootstrap.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index c88f4ecaf..c1de34a91 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: Thu Nov 17 00:05:35 PST 2011 + * Date: Thu Nov 17 00:36:27 PST 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). @@ -477,8 +477,8 @@ blockquote { padding-left: 15px; } blockquote p { - font-size: 16px; - font-weight: 300; + font-size: 300; + font-weight: 16px; line-height: 22.5px; margin-bottom: 0; } @@ -550,8 +550,8 @@ input, select, textarea { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: normal; + font-size: normal; + font-weight: 13px; line-height: 18px; } label { @@ -1209,8 +1209,8 @@ table .headerSortUp.purple, table .headerSortDown.purple { background-color: #444; background-color: rgba(255, 255, 255, 0.3); font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: normal; - font-weight: 13px; + font-size: 13px; + font-weight: normal; line-height: 1; padding: 4px 9px; color: #ffffff; -- cgit v1.2.3 From ba9fcd8b57ad7974a52aecabac7c90dccda4afcb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 17 Nov 2011 00:49:51 -0800 Subject: make uneditable inputs work with span* classes --- bootstrap.css | 82 ++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 65 insertions(+), 17 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index c1de34a91..b65126285 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: Thu Nov 17 00:36:27 PST 2011 + * Date: Thu Nov 17 00:48:46 PST 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). @@ -657,97 +657,145 @@ input[type=file]:focus, input[type=checkbox]:focus, select:focus { .input-xxlarge { width: 530px; } -input.span1, textarea.span1, select.span1 { +input.span1, +textarea.span1, +select.span1, +.uneditable-input.span1 { display: inline-block; float: none; width: 50px; margin-left: 0; } -input.span2, textarea.span2, select.span2 { +input.span2, +textarea.span2, +select.span2, +.uneditable-input.span2 { display: inline-block; float: none; width: 150px; margin-left: 0; } -input.span3, textarea.span3, select.span3 { +input.span3, +textarea.span3, +select.span3, +.uneditable-input.span3 { display: inline-block; float: none; width: 250px; margin-left: 0; } -input.span4, textarea.span4, select.span4 { +input.span4, +textarea.span4, +select.span4, +.uneditable-input.span4 { display: inline-block; float: none; width: 350px; margin-left: 0; } -input.span5, textarea.span5, select.span5 { +input.span5, +textarea.span5, +select.span5, +.uneditable-input.span5 { display: inline-block; float: none; width: 450px; margin-left: 0; } -input.span6, textarea.span6, select.span6 { +input.span6, +textarea.span6, +select.span6, +.uneditable-input.span6 { display: inline-block; float: none; width: 550px; margin-left: 0; } -input.span7, textarea.span7, select.span7 { +input.span7, +textarea.span7, +select.span7, +.uneditable-input.span7 { display: inline-block; float: none; width: 650px; margin-left: 0; } -input.span8, textarea.span8, select.span8 { +input.span8, +textarea.span8, +select.span8, +.uneditable-input.span8 { display: inline-block; float: none; width: 750px; margin-left: 0; } -input.span9, textarea.span9, select.span9 { +input.span9, +textarea.span9, +select.span9, +.uneditable-input.span9 { display: inline-block; float: none; width: 850px; margin-left: 0; } -input.span10, textarea.span10, select.span10 { +input.span10, +textarea.span10, +select.span10, +.uneditable-input.span10 { display: inline-block; float: none; width: 950px; margin-left: 0; } -input.span11, textarea.span11, select.span11 { +input.span11, +textarea.span11, +select.span11, +.uneditable-input.span11 { display: inline-block; float: none; width: 1050px; margin-left: 0; } -input.span12, textarea.span12, select.span12 { +input.span12, +textarea.span12, +select.span12, +.uneditable-input.span12 { display: inline-block; float: none; width: 1150px; margin-left: 0; } -input.span13, textarea.span13, select.span13 { +input.span13, +textarea.span13, +select.span13, +.uneditable-input.span13 { display: inline-block; float: none; width: 1250px; margin-left: 0; } -input.span14, textarea.span14, select.span14 { +input.span14, +textarea.span14, +select.span14, +.uneditable-input.span14 { display: inline-block; float: none; width: 1350px; margin-left: 0; } -input.span15, textarea.span15, select.span15 { +input.span15, +textarea.span15, +select.span15, +.uneditable-input.span15 { display: inline-block; float: none; width: 1450px; margin-left: 0; } -input.span16, textarea.span16, select.span16 { +input.span16, +textarea.span16, +select.span16, +.uneditable-input.span16 { display: inline-block; float: none; width: 1550px; -- cgit v1.2.3 From 159c7a7fdae4a3bd929ee9cc76aaa3b509a969dc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 17 Nov 2011 00:52:11 -0800 Subject: remove code styling if it's in a pre tag --- bootstrap.css | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index b65126285..e8b9d2d53 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: Thu Nov 17 00:48:46 PST 2011 + * Date: Thu Nov 17 00:52:01 PST 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). @@ -503,15 +503,15 @@ address { } code, pre { padding: 0 3px 2px; - font-family: Menlo, Monaco, Andale Mono, Courier New, monospace; + font-family: "Menlo", Monaco, Courier New, monospace; font-size: 12px; + color: #404040; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } code { background-color: #fee9cc; - color: rgba(0, 0, 0, 0.75); padding: 1px 3px; } pre { @@ -530,6 +530,10 @@ pre { white-space: pre-wrap; word-break: break-all; } +pre code { + padding: 0; + background-color: transparent; +} /* Forms.less * Base styles for various input types, form layouts, and states * ------------------------------------------------------------- */ -- cgit v1.2.3 From 0b1d5d9189ea82cde5e848e5a8771a8f4850e21f Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 20 Nov 2011 18:19:50 -0800 Subject: revert all js stuff back to 1.4 :/ --- bootstrap.css | 247 +++++++++++++++++++++++++++------------------------------- 1 file changed, 115 insertions(+), 132 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index e8b9d2d53..e17c454d5 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: Thu Nov 17 00:52:01 PST 2011 + * Date: Sun Nov 20 18:13:58 PST 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). @@ -118,9 +118,9 @@ audio:not([controls]) { display: none; } sub, sup { + position: relative; font-size: 75%; line-height: 0; - position: relative; vertical-align: baseline; } sup { @@ -137,18 +137,18 @@ button, input, select, textarea { - font-size: 100%; margin: 0; + font-size: 100%; vertical-align: baseline; *vertical-align: middle; } button, input { - line-height: normal; *overflow: visible; + line-height: normal; } button::-moz-focus-inner, input::-moz-focus-inner { - border: 0; padding: 0; + border: 0; } button, input[type="button"], @@ -181,12 +181,12 @@ textarea { * Basic and global styles for generating a grid system, structural layout, and page templates * ------------------------------------------------------------------------------------------- */ body { - background-color: #ffffff; margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; line-height: 18px; color: #404040; + background-color: #ffffff; } .container { width: 940px; @@ -196,9 +196,9 @@ body { } .container:before, .container:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .container:after { clear: both; @@ -212,9 +212,9 @@ body { } .fluid-container:before, .fluid-container:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .fluid-container:after { clear: both; @@ -236,10 +236,10 @@ body { margin-right: 240px; } a { + font-weight: inherit; + line-height: inherit; color: #0069d6; text-decoration: none; - line-height: inherit; - font-weight: inherit; } a:hover { color: #00438a; @@ -263,9 +263,9 @@ a:hover { } .row:before, .row:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .row:after { clear: both; @@ -348,10 +348,10 @@ a:hover { * Headings, body text, lists, code, and more for a versatile and durable typography system * ---------------------------------------------------------------------------------------- */ p { + margin-bottom: 9px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; line-height: 18px; - margin-bottom: 9px; } p small { font-size: 11px; @@ -433,8 +433,8 @@ li { color: #404040; } ul.unstyled { - list-style: none; margin-left: 0; + list-style: none; } dl { margin-bottom: 18px; @@ -472,15 +472,15 @@ abbr { cursor: help; } blockquote { + padding-left: 15px; margin-bottom: 18px; border-left: 5px solid #eee; - padding-left: 15px; } blockquote p { + margin-bottom: 0; font-size: 300; font-weight: 16px; line-height: 22.5px; - margin-bottom: 0; } blockquote small { display: block; @@ -498,8 +498,8 @@ blockquote.pull-right p, blockquote.pull-right small { } address { display: block; - line-height: 18px; margin-bottom: 18px; + line-height: 18px; } code, pre { padding: 0 3px 2px; @@ -511,16 +511,16 @@ code, pre { border-radius: 3px; } code { - background-color: #fee9cc; padding: 1px 3px; + background-color: #fee9cc; } pre { - background-color: #f5f5f5; display: block; padding: 8.5px; margin: 0 0 9px; - line-height: 18px; font-size: 12px; + line-height: 18px; + background-color: #f5f5f5; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.15); -webkit-border-radius: 3px; @@ -593,11 +593,11 @@ input[type=checkbox], input[type=radio] { cursor: pointer; } input[type=file] { - background-color: #ffffff; - background-color: initial; padding: initial; - border: initial; line-height: initial; + border: initial; + background-color: #ffffff; + background-color: initial; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; @@ -608,34 +608,34 @@ input[type=button], input[type=reset], input[type=submit] { } select, input[type=file] { height: 27px; - line-height: 27px; *margin-top: 4px; /* For IE7, add top margin to align select with labels */ + line-height: 27px; } select[multiple] { - background-color: #ffffff; height: inherit; + background-color: #ffffff; } textarea { height: auto; } input, textarea { + -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; -moz-transition: border linear 0.2s, box-shadow linear 0.2s; -ms-transition: border linear 0.2s, box-shadow linear 0.2s; -o-transition: border linear 0.2s, box-shadow linear 0.2s; transition: border linear 0.2s, box-shadow linear 0.2s; - -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); } input:focus, textarea:focus { - outline: 0; border-color: rgba(82, 168, 236, 0.8); -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); + outline: 0; } input[type=file]:focus, input[type=checkbox]:focus, select:focus { -webkit-box-shadow: none; @@ -877,8 +877,8 @@ form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-app border-top: 1px solid #ddd; } .uneditable-input { - background-color: #ffffff; display: block; + background-color: #ffffff; border-color: #eee; -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); @@ -897,14 +897,14 @@ form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-app color: #bfbfbf; } .help-inline { - display: inline; - padding-left: 5px; *position: relative; /* IE6-7 */ *top: -5px; /* IE6-7 */ + display: inline; + padding-left: 5px; } .help-block { display: block; @@ -932,27 +932,27 @@ form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-app } .input-prepend .add-on, .input-append .add-on { position: relative; - background: #f5f5f5; - border: 1px solid #ccc; z-index: 2; float: left; display: block; width: auto; min-width: 16px; height: 18px; - padding: 4px 4px 4px 5px; margin-right: -1px; + padding: 4px 4px 4px 5px; font-weight: normal; line-height: 18px; color: #bfbfbf; text-align: center; text-shadow: 0 1px 0 #ffffff; + background-color: #f5f5f5; + border: 1px solid #ccc; -webkit-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } .input-prepend .active, .input-append .active { - background: #a9dba9; + background-color: #a9dba9; border-color: #46a546; } .input-prepend .add-on { @@ -967,11 +967,11 @@ form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-app border-radius: 3px 0 0 3px; } .input-append .add-on { + margin-right: 0; + margin-left: -1px; -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; - margin-right: 0; - margin-left: -1px; } .search-form .search-query { -webkit-border-radius: 14px; @@ -1122,17 +1122,17 @@ table .header { cursor: pointer; } table .header:after { - content: ""; float: right; margin-top: 7px; border-width: 0 4px 4px; border-style: solid; border-color: #000 transparent; + content: ""; visibility: hidden; } table .headerSortUp, table .headerSortDown { - background-color: rgba(141, 192, 219, 0.25); text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); + background-color: rgba(141, 192, 219, 0.25); } table .header:hover:after { visibility: visible; @@ -1140,7 +1140,6 @@ table .header:hover:after { table .headerSortDown:after, table .headerSortDown:hover:after { visibility: visible; filter: alpha(opacity=60); - -khtml-opacity: 0.6; -moz-opacity: 0.6; opacity: 0.6; } @@ -1154,7 +1153,6 @@ table .headerSortUp:after { -moz-box-shadow: none; box-shadow: none; filter: alpha(opacity=60); - -khtml-opacity: 0.6; -moz-opacity: 0.6; opacity: 0.6; } @@ -1228,45 +1226,45 @@ table .headerSortUp.purple, table .headerSortDown.purple { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } .navbar .brand a:hover, .navbar ul .active > a { - background-color: #333333; - background-color: rgba(255, 255, 255, 0.05); color: #ffffff; text-decoration: none; + background-color: #333333; + background-color: rgba(255, 255, 255, 0.05); } .navbar .brand { float: left; display: block; padding: 8px 20px 12px; margin-left: -20px; - color: #ffffff; font-size: 20px; font-weight: 200; line-height: 1; + color: #ffffff; } .navbar p { margin: 0; line-height: 40px; } .navbar p a:hover { - background-color: transparent; color: #ffffff; + background-color: transparent; } .navbar-search { position: relative; + float: left; margin-top: 6px; margin-bottom: 0; - float: left; } .navbar-search .search-query { - background-color: #444; - background-color: rgba(255, 255, 255, 0.3); + padding: 4px 9px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 1; - padding: 4px 9px; color: #ffffff; color: rgba(255, 255, 255, 0.75); + background-color: #444; + background-color: rgba(255, 255, 255, 0.3); border: 1px solid #111; -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); @@ -1284,20 +1282,20 @@ table .headerSortUp.purple, table .headerSortDown.purple { color: #e6e6e6; } .navbar-search .search-query:hover { + color: #ffffff; background-color: #bfbfbf; background-color: rgba(255, 255, 255, 0.5); - color: #ffffff; } .navbar-search .search-query:focus, .navbar-search .search-query.focused { - outline: 0; - background-color: #ffffff; + padding: 5px 10px; color: #404040; text-shadow: 0 1px 0 #ffffff; + background-color: #ffffff; border: 0; - padding: 5px 10px; -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + outline: 0; } .navbar-static { margin-bottom: 18px; @@ -1312,16 +1310,16 @@ table .headerSortUp.purple, table .headerSortDown.purple { .navbar-fixed { position: fixed; top: 0; - left: 0; right: 0; + left: 0; z-index: 10000; } .nav { + position: relative; + left: 0; display: block; float: left; margin: 0 10px 0 0; - position: relative; - left: 0; } .nav > li { display: block; @@ -1396,42 +1394,39 @@ table .headerSortUp.purple, table .headerSortDown.purple { position: relative; } .dropdown-toggle:after { + display: inline-block; width: 0; height: 0; - display: inline-block; - content: "↓"; - text-indent: -99999px; - vertical-align: top; margin-top: 8px; margin-left: 6px; + text-indent: -99999px; + vertical-align: top; border-left: 4px solid transparent; border-right: 4px solid transparent; border-top: 4px solid #ffffff; filter: alpha(opacity=30); - -khtml-opacity: 0.3; -moz-opacity: 0.3; opacity: 0.3; + content: "↓"; } .dropdown:hover .dropdown-toggle:after { filter: alpha(opacity=100); - -khtml-opacity: 1; -moz-opacity: 1; opacity: 1; } .dropdown-menu { - background-color: #ffffff; - float: left; - display: none; position: absolute; top: 40px; z-index: 900; + float: left; + display: none; min-width: 160px; max-width: 220px; _width: 160px; + padding: 6px 0; margin-left: 0; margin-right: 0; - padding: 6px 0; - zoom: 1; + background-color: #ffffff; border-color: #999; border-color: rgba(0, 0, 0, 0.2); border-style: solid; @@ -1445,6 +1440,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-background-clip: padding-box; -moz-background-clip: padding-box; background-clip: padding-box; + zoom: 1; } .dropdown-menu li { float: none; @@ -1468,6 +1464,8 @@ table .headerSortUp.purple, table .headerSortDown.purple { text-shadow: 0 1px 0 #ffffff; } .topbar .dropdown-menu a:hover, .dropdown-menu a:hover { + color: #404040; + text-decoration: none; background-color: #dddddd; background-image: -khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd)); background-image: -moz-linear-gradient(top, #eeeeee, #dddddd); @@ -1478,8 +1476,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { background-image: linear-gradient(top, #eeeeee, #dddddd); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0); - color: #404040; - text-decoration: none; -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); @@ -1493,9 +1489,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { display: block; } .hero-unit { - background-color: #f5f5f5; - margin-bottom: 30px; padding: 60px; + margin-bottom: 30px; + background-color: #f5f5f5; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -1512,8 +1508,8 @@ table .headerSortUp.purple, table .headerSortDown.purple { line-height: 27px; } footer { - margin-top: 17px; padding-top: 17px; + margin-top: 17px; border-top: 1px solid #eee; } .page-header { @@ -1548,6 +1544,7 @@ footer { .alert-message.danger, .btn.error, .alert-message.error { + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #c43c35; background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35)); background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); @@ -1558,11 +1555,11 @@ footer { background-image: linear-gradient(top, #ee5f5b, #c43c35); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); border-color: #c43c35 #c43c35 #882a25; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } .btn.success, .alert-message.success { + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #57a957; background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); background-image: -moz-linear-gradient(top, #62c462, #57a957); @@ -1573,11 +1570,11 @@ footer { background-image: linear-gradient(top, #62c462, #57a957); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); border-color: #57a957 #57a957 #3d773d; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } .btn.info, .alert-message.info { + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #339bb9; background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); @@ -1588,13 +1585,16 @@ footer { background-image: linear-gradient(top, #5bc0de, #339bb9); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); border-color: #339bb9 #339bb9 #22697d; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } .btn { - cursor: pointer; display: inline-block; + padding: 5px 14px 6px; + font-size: 13px; + line-height: normal; + color: #333; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); background-color: #e6e6e6; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); @@ -1604,11 +1604,6 @@ footer { background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); background-repeat: no-repeat; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); - padding: 5px 14px 6px; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - color: #333; - font-size: 13px; - line-height: normal; border: 1px solid #ccc; border-bottom-color: #bbb; -webkit-border-radius: 4px; @@ -1617,6 +1612,7 @@ footer { -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); + cursor: pointer; -webkit-transition: 0.1s linear all; -moz-transition: 0.1s linear all; -ms-transition: 0.1s linear all; @@ -1624,15 +1620,16 @@ footer { transition: 0.1s linear all; } .btn:hover { - background-position: 0 -15px; color: #333; text-decoration: none; + background-position: 0 -15px; } .btn:focus { outline: 1px dotted #666; } .btn.primary { color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #0064cd; background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd)); background-image: -moz-linear-gradient(top, #049cdb, #0064cd); @@ -1643,7 +1640,6 @@ footer { background-image: linear-gradient(top, #049cdb, #0064cd); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); border-color: #0064cd #0064cd #003f81; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } @@ -1657,7 +1653,6 @@ footer { background-image: none; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); filter: alpha(opacity=65); - -khtml-opacity: 0.65; -moz-opacity: 0.65; opacity: 0.65; -webkit-box-shadow: none; @@ -1669,7 +1664,6 @@ footer { background-image: none; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); filter: alpha(opacity=65); - -khtml-opacity: 0.65; -moz-opacity: 0.65; opacity: 0.65; -webkit-box-shadow: none; @@ -1677,9 +1671,9 @@ footer { box-shadow: none; } .btn.large { + padding: 9px 14px 9px; font-size: 15px; line-height: normal; - padding: 9px 14px 9px; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -1700,9 +1694,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .btn-toolbar:before, .btn-toolbar:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .btn-toolbar:after { clear: both; @@ -1716,9 +1710,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .btn-group:before, .btn-group:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .btn-group:after { clear: both; @@ -1753,13 +1747,12 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .close { float: right; - color: #000000; font-size: 20px; font-weight: bold; line-height: 13.5px; + color: #000000; text-shadow: 0 1px 0 #ffffff; filter: alpha(opacity=20); - -khtml-opacity: 0.2; -moz-opacity: 0.2; opacity: 0.2; } @@ -1767,7 +1760,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { color: #000000; text-decoration: none; filter: alpha(opacity=40); - -khtml-opacity: 0.4; -moz-opacity: 0.4; opacity: 0.4; } @@ -1776,6 +1768,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { padding: 7px 15px; margin-bottom: 18px; color: #404040; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #eedc94; background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94)); background-image: -moz-linear-gradient(top, #fceec1, #eedc94); @@ -1786,10 +1780,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { background-image: linear-gradient(top, #fceec1, #eedc94); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); border-color: #eedc94 #eedc94 #e4c652; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); border-width: 1px; border-style: solid; -webkit-border-radius: 4px; @@ -1821,10 +1813,10 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); } .alert-message.block-message { + padding: 14px; background-image: none; background-color: #fdf5d9; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - padding: 14px; border-color: #fceec1; -webkit-box-shadow: none; -moz-box-shadow: none; @@ -1859,10 +1851,10 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { border-color: #c6edf9; } .well { - background-color: #f5f5f5; - margin-bottom: 20px; - padding: 19px; min-height: 20px; + padding: 19px; + margin-bottom: 20px; + background-color: #f5f5f5; border: 1px solid #eee; border: 1px solid rgba(0, 0, 0, 0.05); -webkit-border-radius: 4px; @@ -1889,11 +1881,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .label { padding: 1px 3px 2px; - background-color: #bfbfbf; font-size: 9.75px; font-weight: bold; color: #ffffff; text-transform: uppercase; + background-color: #bfbfbf; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; @@ -1910,15 +1902,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .label.notice { background-color: #62cffc; } -.pull-right { - float: right; -} -.pull-left { - float: left; -} .tabs, .pills { - margin: 0 0 20px; padding: 0; + margin: 0 0 20px; list-style: none; zoom: 1; } @@ -1927,9 +1913,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .tabs:after, .pills:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .tabs:after, .pills:after { clear: both; @@ -2005,9 +1991,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .tabbable.tabs-left:after, .tabbable.tabs-right:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .tabbable.tabs-left:after, .tabbable.tabs-right:after { clear: both; @@ -2088,8 +2074,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { border-top-color: #555; } .pills a { - margin: 5px 3px 5px 0; padding: 0 15px; + margin: 5px 3px 5px 0; line-height: 30px; text-shadow: 0 1px 1px #ffffff; -webkit-border-radius: 15px; @@ -2117,8 +2103,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { display: block; } .breadcrumb { - margin: 0 0 18px; padding: 7px 14px; + margin: 0 0 18px; background-color: #f5f5f5; background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5)); background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); @@ -2171,39 +2157,38 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { float: left; padding: 0 14px; line-height: 34px; + text-decoration: none; border-right: 1px solid; border-right-color: #ddd; border-right-color: rgba(0, 0, 0, 0.15); *border-right-color: #ddd; /* IE6-7 */ - text-decoration: none; } .pagination a:hover, .pagination .active a { background-color: #c7eefe; } .pagination .disabled a, .pagination .disabled a:hover { - background-color: transparent; color: #bfbfbf; + background-color: transparent; } .pagination .next a { border: 0; } .modal-backdrop { - background-color: #000000; position: fixed; top: 0; - left: 0; right: 0; bottom: 0; + left: 0; z-index: 10000; + background-color: #000000; } .modal-backdrop.fade { opacity: 0; } .modal-backdrop, .modal-backdrop.fade.in { filter: alpha(opacity=80); - -khtml-opacity: 0.8; -moz-opacity: 0.8; opacity: 0.8; } @@ -2245,15 +2230,16 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { top: 50%; } .modal-header { - border-bottom: 1px solid #eee; padding: 5px 15px; + border-bottom: 1px solid #eee; } .modal-body { padding: 15px; } .modal-footer { - background-color: #f5f5f5; padding: 14px 15px 15px; + margin-bottom: 0; + background-color: #f5f5f5; border-top: 1px solid #ddd; -webkit-border-radius: 0 0 6px 6px; -moz-border-radius: 0 0 6px 6px; @@ -2262,13 +2248,12 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff; zoom: 1; - margin-bottom: 0; } .modal-footer:before, .modal-footer:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .modal-footer:after { clear: both; @@ -2278,20 +2263,18 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { margin-left: 5px; } .twipsy { - display: block; position: absolute; + z-index: 1000; + display: block; visibility: visible; padding: 5px; font-size: 11px; - z-index: 1000; filter: alpha(opacity=80); - -khtml-opacity: 0.8; -moz-opacity: 0.8; opacity: 0.8; } .twipsy.fade.in { filter: alpha(opacity=80); - -khtml-opacity: 0.8; -moz-opacity: 0.8; opacity: 0.8; } @@ -2328,12 +2311,12 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { border-right: 5px solid #000000; } .twipsy-inner { + max-width: 200px; padding: 3px 8px; - background-color: #000000; color: white; text-align: center; - max-width: 200px; text-decoration: none; + background-color: #000000; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -2348,8 +2331,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { top: 0; left: 0; z-index: 1000; - padding: 5px; display: none; + padding: 5px; } .popover.above .arrow { bottom: 0; @@ -2389,11 +2372,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { height: 0; } .popover .inner { - background-color: #000000; - background-color: rgba(0, 0, 0, 0.8); padding: 3px; - overflow: hidden; width: 280px; + overflow: hidden; + background-color: #000000; + background-color: rgba(0, 0, 0, 0.8); -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -2402,17 +2385,17 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); } .popover .title { - background-color: #f5f5f5; padding: 9px 15px; line-height: 1; + background-color: #f5f5f5; + border-bottom: 1px solid #eee; -webkit-border-radius: 3px 3px 0 0; -moz-border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0; - border-bottom: 1px solid #eee; } .popover .content { - background-color: #ffffff; padding: 14px; + background-color: #ffffff; -webkit-border-radius: 0 0 3px 3px; -moz-border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px; @@ -2430,9 +2413,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .media-grid:before, .media-grid:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .media-grid:after { clear: both; -- cgit v1.2.3 From bc65b58551575c9dfb2e4d9f4f7af97009e39432 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 20 Nov 2011 20:58:04 -0800 Subject: merge in js from 1.4... start working through js docs --- bootstrap.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index e17c454d5..d6cc76b6d 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -1,12 +1,12 @@ /*! - * Bootstrap v1.2.0 + * Bootstrap v2.0.0 * * Copyright 2011 Twitter, Inc * Licensed under the Apache License v2.0 * 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 Nov 20 18:13:58 PST 2011 + * Date: Sun Nov 20 20:05:48 PST 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). @@ -2269,11 +2269,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { visibility: visible; padding: 5px; font-size: 11px; - filter: alpha(opacity=80); - -moz-opacity: 0.8; - opacity: 0.8; + filter: alpha(opacity=0); + -moz-opacity: 0; + opacity: 0; } -.twipsy.fade.in { +.twipsy.in { filter: alpha(opacity=80); -moz-opacity: 0.8; opacity: 0.8; -- cgit v1.2.3 From b2650859d6c6dcb0665311b6e983d230fee1111f Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 24 Nov 2011 14:43:26 -0800 Subject: update buttons js for button groups --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index d6cc76b6d..895f1c861 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 Nov 20 20:05:48 PST 2011 + * Date: Thu Nov 24 13:45:21 PST 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). @@ -1643,7 +1643,7 @@ footer { border-color: #0064cd #0064cd #003f81; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } -.btn:active { +.btn.active, .btn:active { -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); -- cgit v1.2.3 From 98fddaa3557b1c872f1e585d579ec7e5e989e95d Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Fri, 25 Nov 2011 17:23:14 -0800 Subject: new plugin "collapse" for collapsible lists and "accordion" like support --- bootstrap.css | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 895f1c861..19d07745e 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: Thu Nov 24 13:45:21 PST 2011 + * Date: Fri Nov 25 12:09:37 PST 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). @@ -1879,6 +1879,32 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .fade.in { opacity: 1; } +.collapse { + position: relative; + overflow: hidden; +} +.collapse.height { + -webkit-transition: height 0.35s ease; + -moz-transition: height 0.35s ease; + -ms-transition: height 0.35s ease; + -o-transition: height 0.35s ease; + transition: height 0.35s ease; + height: 0; +} +.collapse.height.in { + height: auto; +} +.collapse.width { + -webkit-transition: width 0.35s ease; + -moz-transition: width 0.35s ease; + -ms-transition: width 0.35s ease; + -o-transition: width 0.35s ease; + transition: width 0.35s ease; + width: 0; +} +.collapse.width.in { + width: auto; +} .label { padding: 1px 3px 2px; font-size: 9.75px; -- cgit v1.2.3 From 3157de8d1d4b69c0f5152b4a784bd185f76c9ac4 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Fri, 25 Nov 2011 21:34:55 -0800 Subject: clean up comments for better built files --- bootstrap.css | 50 ++++---------------------------------------------- 1 file changed, 4 insertions(+), 46 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 19d07745e..4c4d85aa9 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,11 +6,8 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Fri Nov 25 12:09:37 PST 2011 + * Date: Fri Nov 25 21:33:58 PST 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). - * ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */ html, body { margin: 0; padding: 0; @@ -170,16 +167,6 @@ textarea { overflow: auto; vertical-align: top; } -/* Variables.less - * Variables to customize the look and feel of Bootstrap - * ----------------------------------------------------- */ -/* Mixins.less - * Snippets of reusable CSS to develop faster and keep code readable - * ----------------------------------------------------------------- */ -/* - * Scaffolding - * Basic and global styles for generating a grid system, structural layout, and page templates - * ------------------------------------------------------------------------------------------- */ body { margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -344,9 +331,6 @@ a:hover { .offset11 { margin-left: 900px; } -/* Typography.less - * Headings, body text, lists, code, and more for a versatile and durable typography system - * ---------------------------------------------------------------------------------------- */ p { margin-bottom: 9px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -534,9 +518,6 @@ pre code { padding: 0; background-color: transparent; } -/* Forms.less - * Base styles for various input types, form layouts, and states - * ------------------------------------------------------------- */ form { margin-bottom: 18px; } @@ -999,10 +980,6 @@ form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-app .horizontal-form .form-actions { padding-left: 150px; } -/* - * Tables.less - * Tables for, you guessed it, tabular data - * ---------------------------------------- */ table { width: 100%; padding: 0; @@ -1198,9 +1175,6 @@ table .purple { table .headerSortUp.purple, table .headerSortDown.purple { background-color: #e2d5f0; } -/* Patterns.less - * Repeatable UI elements outside the base styles provided from the scaffolding - * ---------------------------------------------------------------------------- */ .navbar { height: 40px; overflow: visible; @@ -1880,31 +1854,18 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { opacity: 1; } .collapse { - position: relative; - overflow: hidden; -} -.collapse.height { -webkit-transition: height 0.35s ease; -moz-transition: height 0.35s ease; -ms-transition: height 0.35s ease; -o-transition: height 0.35s ease; transition: height 0.35s ease; + position: relative; + overflow: hidden; height: 0; } -.collapse.height.in { +.collapse.in { height: auto; } -.collapse.width { - -webkit-transition: width 0.35s ease; - -moz-transition: width 0.35s ease; - -ms-transition: width 0.35s ease; - -o-transition: width 0.35s ease; - transition: width 0.35s ease; - width: 0; -} -.collapse.width.in { - width: auto; -} .label { padding: 1px 3px 2px; font-size: 9.75px; @@ -2470,9 +2431,6 @@ 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) { .container { width: auto; -- cgit v1.2.3 From d48027d49567c2d38211c357d6fb8d6a5a9e8a7b Mon Sep 17 00:00:00 2001 From: Jeff Adams Date: Tue, 29 Nov 2011 11:12:32 -0600 Subject: add input width calculation fix from #408 to the 2.0 branch --- bootstrap.css | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 4c4d85aa9..271c35afc 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: Fri Nov 25 21:33:58 PST 2011 + * Date: Tue Nov 29 11:11:41 CST 2011 */ html, body { margin: 0; @@ -657,7 +657,7 @@ select.span2, .uneditable-input.span2 { display: inline-block; float: none; - width: 150px; + width: 130px; margin-left: 0; } input.span3, @@ -666,7 +666,7 @@ select.span3, .uneditable-input.span3 { display: inline-block; float: none; - width: 250px; + width: 210px; margin-left: 0; } input.span4, @@ -675,7 +675,7 @@ select.span4, .uneditable-input.span4 { display: inline-block; float: none; - width: 350px; + width: 290px; margin-left: 0; } input.span5, @@ -684,7 +684,7 @@ select.span5, .uneditable-input.span5 { display: inline-block; float: none; - width: 450px; + width: 370px; margin-left: 0; } input.span6, @@ -693,7 +693,7 @@ select.span6, .uneditable-input.span6 { display: inline-block; float: none; - width: 550px; + width: 450px; margin-left: 0; } input.span7, @@ -702,7 +702,7 @@ select.span7, .uneditable-input.span7 { display: inline-block; float: none; - width: 650px; + width: 530px; margin-left: 0; } input.span8, @@ -711,7 +711,7 @@ select.span8, .uneditable-input.span8 { display: inline-block; float: none; - width: 750px; + width: 610px; margin-left: 0; } input.span9, @@ -720,7 +720,7 @@ select.span9, .uneditable-input.span9 { display: inline-block; float: none; - width: 850px; + width: 690px; margin-left: 0; } input.span10, @@ -729,7 +729,7 @@ select.span10, .uneditable-input.span10 { display: inline-block; float: none; - width: 950px; + width: 770px; margin-left: 0; } input.span11, @@ -738,7 +738,7 @@ select.span11, .uneditable-input.span11 { display: inline-block; float: none; - width: 1050px; + width: 850px; margin-left: 0; } input.span12, @@ -747,7 +747,7 @@ select.span12, .uneditable-input.span12 { display: inline-block; float: none; - width: 1150px; + width: 930px; margin-left: 0; } input.span13, @@ -756,7 +756,7 @@ select.span13, .uneditable-input.span13 { display: inline-block; float: none; - width: 1250px; + width: 1010px; margin-left: 0; } input.span14, @@ -765,7 +765,7 @@ select.span14, .uneditable-input.span14 { display: inline-block; float: none; - width: 1350px; + width: 1090px; margin-left: 0; } input.span15, @@ -774,7 +774,7 @@ select.span15, .uneditable-input.span15 { display: inline-block; float: none; - width: 1450px; + width: 1170px; margin-left: 0; } input.span16, @@ -783,7 +783,7 @@ select.span16, .uneditable-input.span16 { display: inline-block; float: none; - width: 1550px; + width: 1250px; margin-left: 0; } input[disabled], -- cgit v1.2.3 From 1da19bf65f9affec06ba6e1f6e5f545a8e2ea457 Mon Sep 17 00:00:00 2001 From: Jeff Adams Date: Tue, 29 Nov 2011 14:06:31 -0600 Subject: scope form feedback states to .control-group instead of unused .clearfix --- bootstrap.css | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 4c4d85aa9..1fa314cd4 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: Fri Nov 25 21:33:58 PST 2011 + * Date: Tue Nov 29 14:05:43 CST 2011 */ html, body { margin: 0; @@ -796,56 +796,56 @@ textarea[readonly] { border-color: #ddd; cursor: not-allowed; } -form .clearfix.error > label, form .clearfix.error .help-block, form .clearfix.error .help-inline { +.control-group.error > label, .control-group.error .help-block, .control-group.error .help-inline { color: #b94a48; } -form .clearfix.error input, form .clearfix.error textarea { +.control-group.error input, .control-group.error textarea { color: #b94a48; border-color: #ee5f5b; } -form .clearfix.error input:focus, form .clearfix.error textarea:focus { +.control-group.error input:focus, .control-group.error textarea:focus { border-color: #e9322d; -webkit-box-shadow: 0 0 6px #f8b9b7; -moz-box-shadow: 0 0 6px #f8b9b7; box-shadow: 0 0 6px #f8b9b7; } -form .clearfix.error .input-prepend .add-on, form .clearfix.error .input-append .add-on { +.control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { color: #b94a48; background-color: #fce6e6; border-color: #b94a48; } -form .clearfix.warning > label, form .clearfix.warning .help-block, form .clearfix.warning .help-inline { +.control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline { color: #c09853; } -form .clearfix.warning input, form .clearfix.warning textarea { +.control-group.warning input, .control-group.warning textarea { color: #c09853; border-color: #ccae64; } -form .clearfix.warning input:focus, form .clearfix.warning textarea:focus { +.control-group.warning input:focus, .control-group.warning textarea:focus { border-color: #be9a3f; -webkit-box-shadow: 0 0 6px #e5d6b1; -moz-box-shadow: 0 0 6px #e5d6b1; box-shadow: 0 0 6px #e5d6b1; } -form .clearfix.warning .input-prepend .add-on, form .clearfix.warning .input-append .add-on { +.control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { color: #c09853; background-color: #d2b877; border-color: #c09853; } -form .clearfix.success > label, form .clearfix.success .help-block, form .clearfix.success .help-inline { +.control-group.success > label, .control-group.success .help-block, .control-group.success .help-inline { color: #468847; } -form .clearfix.success input, form .clearfix.success textarea { +.control-group.success input, .control-group.success textarea { color: #468847; border-color: #57a957; } -form .clearfix.success input:focus, form .clearfix.success textarea:focus { +.control-group.success input:focus, .control-group.success textarea:focus { border-color: #458845; -webkit-box-shadow: 0 0 6px #9acc9a; -moz-box-shadow: 0 0 6px #9acc9a; box-shadow: 0 0 6px #9acc9a; } -form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-append .add-on { +.control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { color: #468847; background-color: #bcddbc; border-color: #468847; -- cgit v1.2.3 From b36df463108e2e4df8c389a06f577823564788d9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 29 Nov 2011 22:35:03 -0800 Subject: misc docs updates, revamped tables CSS save for grid columns and tablesorter options --- bootstrap.css | 538 ++++++++++++++++++++++++++++------------------------------ 1 file changed, 258 insertions(+), 280 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index e8b9d2d53..87e12fca0 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: Thu Nov 17 00:52:01 PST 2011 + * Date: Tue Nov 29 22:34:51 PST 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). @@ -118,9 +118,9 @@ audio:not([controls]) { display: none; } sub, sup { + position: relative; font-size: 75%; line-height: 0; - position: relative; vertical-align: baseline; } sup { @@ -137,18 +137,18 @@ button, input, select, textarea { - font-size: 100%; margin: 0; + font-size: 100%; vertical-align: baseline; *vertical-align: middle; } button, input { - line-height: normal; *overflow: visible; + line-height: normal; } button::-moz-focus-inner, input::-moz-focus-inner { - border: 0; padding: 0; + border: 0; } button, input[type="button"], @@ -181,12 +181,12 @@ textarea { * Basic and global styles for generating a grid system, structural layout, and page templates * ------------------------------------------------------------------------------------------- */ body { - background-color: #ffffff; margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; line-height: 18px; color: #404040; + background-color: #ffffff; } .container { width: 940px; @@ -196,9 +196,9 @@ body { } .container:before, .container:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .container:after { clear: both; @@ -212,9 +212,9 @@ body { } .fluid-container:before, .fluid-container:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .fluid-container:after { clear: both; @@ -236,10 +236,10 @@ body { margin-right: 240px; } a { + font-weight: inherit; + line-height: inherit; color: #0069d6; text-decoration: none; - line-height: inherit; - font-weight: inherit; } a:hover { color: #00438a; @@ -263,9 +263,9 @@ a:hover { } .row:before, .row:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .row:after { clear: both; @@ -348,10 +348,10 @@ a:hover { * Headings, body text, lists, code, and more for a versatile and durable typography system * ---------------------------------------------------------------------------------------- */ p { + margin-bottom: 9px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; line-height: 18px; - margin-bottom: 9px; } p small { font-size: 11px; @@ -433,8 +433,8 @@ li { color: #404040; } ul.unstyled { - list-style: none; margin-left: 0; + list-style: none; } dl { margin-bottom: 18px; @@ -472,15 +472,15 @@ abbr { cursor: help; } blockquote { + padding-left: 15px; margin-bottom: 18px; border-left: 5px solid #eee; - padding-left: 15px; } blockquote p { + margin-bottom: 0; font-size: 300; font-weight: 16px; line-height: 22.5px; - margin-bottom: 0; } blockquote small { display: block; @@ -498,8 +498,8 @@ blockquote.pull-right p, blockquote.pull-right small { } address { display: block; - line-height: 18px; margin-bottom: 18px; + line-height: 18px; } code, pre { padding: 0 3px 2px; @@ -511,16 +511,16 @@ code, pre { border-radius: 3px; } code { - background-color: #fee9cc; padding: 1px 3px; + background-color: #fee9cc; } pre { - background-color: #f5f5f5; display: block; padding: 8.5px; margin: 0 0 9px; - line-height: 18px; font-size: 12px; + line-height: 18px; + background-color: #f5f5f5; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.15); -webkit-border-radius: 3px; @@ -593,11 +593,11 @@ input[type=checkbox], input[type=radio] { cursor: pointer; } input[type=file] { - background-color: #ffffff; - background-color: initial; padding: initial; - border: initial; line-height: initial; + border: initial; + background-color: #ffffff; + background-color: initial; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; @@ -608,34 +608,34 @@ input[type=button], input[type=reset], input[type=submit] { } select, input[type=file] { height: 27px; - line-height: 27px; *margin-top: 4px; /* For IE7, add top margin to align select with labels */ + line-height: 27px; } select[multiple] { - background-color: #ffffff; height: inherit; + background-color: #ffffff; } textarea { height: auto; } input, textarea { + -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; -moz-transition: border linear 0.2s, box-shadow linear 0.2s; -ms-transition: border linear 0.2s, box-shadow linear 0.2s; -o-transition: border linear 0.2s, box-shadow linear 0.2s; transition: border linear 0.2s, box-shadow linear 0.2s; - -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); } input:focus, textarea:focus { - outline: 0; border-color: rgba(82, 168, 236, 0.8); -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); + outline: 0; } input[type=file]:focus, input[type=checkbox]:focus, select:focus { -webkit-box-shadow: none; @@ -877,8 +877,8 @@ form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-app border-top: 1px solid #ddd; } .uneditable-input { - background-color: #ffffff; display: block; + background-color: #ffffff; border-color: #eee; -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); @@ -897,14 +897,14 @@ form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-app color: #bfbfbf; } .help-inline { - display: inline; - padding-left: 5px; *position: relative; /* IE6-7 */ *top: -5px; /* IE6-7 */ + display: inline; + padding-left: 5px; } .help-block { display: block; @@ -932,27 +932,27 @@ form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-app } .input-prepend .add-on, .input-append .add-on { position: relative; - background: #f5f5f5; - border: 1px solid #ccc; z-index: 2; float: left; display: block; width: auto; min-width: 16px; height: 18px; - padding: 4px 4px 4px 5px; margin-right: -1px; + padding: 4px 4px 4px 5px; font-weight: normal; line-height: 18px; color: #bfbfbf; text-align: center; text-shadow: 0 1px 0 #ffffff; + background-color: #f5f5f5; + border: 1px solid #ccc; -webkit-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } .input-prepend .active, .input-append .active { - background: #a9dba9; + background-color: #a9dba9; border-color: #46a546; } .input-prepend .add-on { @@ -967,11 +967,11 @@ form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-app border-radius: 3px 0 0 3px; } .input-append .add-on { + margin-right: 0; + margin-left: -1px; -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; - margin-right: 0; - margin-left: -1px; } .search-form .search-query { -webkit-border-radius: 14px; @@ -1005,43 +1005,38 @@ form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-app * ---------------------------------------- */ table { width: 100%; - padding: 0; margin-bottom: 18px; - font-size: 13px; - border-collapse: collapse; } -table th, table td { - padding: 10px 10px 9px; +th, td { + padding: 8px; line-height: 18px; text-align: left; + border-bottom: 1px solid #ddd; } -table th { - padding-top: 9px; +th { font-weight: bold; - vertical-align: middle; + vertical-align: bottom; } -table td { +td { vertical-align: top; - border-top: 1px solid #ddd; } -table tbody th { - border-top: 1px solid #ddd; - vertical-align: top; +tbody tr:last-child th, tbody tr:last-child td { + border-bottom: 0; } .condensed-table th, .condensed-table td { - padding: 5px 5px 4px; + padding: 4px 5px; } .bordered-table { border: 1px solid #ddd; border-collapse: separate; - *border-collapse: collapse; - /* IE7, collapse table to remove spacing */ - -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; } -.bordered-table th + th, .bordered-table td + td, .bordered-table th + td { +.bordered-table th + th, +.bordered-table td + td, +.bordered-table th + td, +.bordered-table td + th { border-left: 1px solid #ddd; } .bordered-table thead:first-child tr:first-child th:first-child, .bordered-table tbody:first-child tr:first-child td:first-child { @@ -1054,153 +1049,151 @@ table tbody th { -moz-border-radius: 0 4px 0 0; border-radius: 0 4px 0 0; } -.bordered-table tbody tr:last-child td:first-child { +.bordered-table thead:last-child tr:last-child th:first-child, .bordered-table tbody:last-child 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; } -.bordered-table tbody tr:last-child td:last-child { +.bordered-table thead:last-child tr:last-child th:last-child, .bordered-table tbody:last-child 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; } -table .span1 { - width: 40px; -} -table .span2 { - width: 120px; -} -table .span3 { - width: 200px; -} -table .span4 { - width: 280px; -} -table .span5 { - width: 360px; -} -table .span6 { - width: 440px; -} -table .span7 { - width: 520px; -} -table .span8 { - width: 600px; -} -table .span9 { - width: 680px; -} -table .span10 { - width: 760px; -} -table .span11 { - width: 840px; -} -table .span12 { - width: 920px; -} -table .span13 { - width: 1000px; -} -table .span14 { - width: 1080px; -} -table .span15 { - width: 1160px; -} -table .span16 { - width: 1240px; -} .striped-table tbody tr:nth-child(odd) td, .striped-table tbody tr:nth-child(odd) th { background-color: #f9f9f9; } -.striped-table tbody tr:hover td, .striped-table tbody tr:hover th { - background-color: #f5f5f5; -} -table .header { - cursor: pointer; -} -table .header:after { - content: ""; - float: right; - margin-top: 7px; - border-width: 0 4px 4px; - border-style: solid; - border-color: #000 transparent; - visibility: hidden; -} -table .headerSortUp, table .headerSortDown { - background-color: rgba(141, 192, 219, 0.25); - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); -} -table .header:hover:after { - visibility: visible; -} -table .headerSortDown:after, table .headerSortDown:hover:after { - visibility: visible; - filter: alpha(opacity=60); - -khtml-opacity: 0.6; - -moz-opacity: 0.6; - opacity: 0.6; -} -table .headerSortUp:after { - border-bottom: none; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid #000; - visibility: visible; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - filter: alpha(opacity=60); - -khtml-opacity: 0.6; - -moz-opacity: 0.6; - opacity: 0.6; -} -table .blue { - color: #049cdb; - border-bottom-color: #049cdb; -} -table .headerSortUp.blue, table .headerSortDown.blue { - background-color: #ade6fe; -} -table .green { - color: #46a546; - border-bottom-color: #46a546; -} -table .headerSortUp.green, table .headerSortDown.green { - background-color: #cdeacd; -} -table .red { - color: #9d261d; - border-bottom-color: #9d261d; -} -table .headerSortUp.red, table .headerSortDown.red { - background-color: #f4c8c5; -} -table .yellow { - color: #ffc40d; - border-bottom-color: #ffc40d; -} -table .headerSortUp.yellow, table .headerSortDown.yellow { - background-color: #fff6d9; -} -table .orange { - color: #f89406; - border-bottom-color: #f89406; -} -table .headerSortUp.orange, table .headerSortDown.orange { - background-color: #fee9cc; -} -table .purple { - color: #7a43b6; - border-bottom-color: #7a43b6; +/* +// ---------------- + +// This is a duplication of the main grid .columns() mixin, but subtracts 20px to account for input padding and border +.tableColumns(@columnSpan: 1) { + width: ((@gridColumnWidth - 20) * @columnSpan) + ((@gridColumnWidth - 20) * (@columnSpan - 1)); } -table .headerSortUp.purple, table .headerSortDown.purple { - background-color: #e2d5f0; +table { + // Default columns + .span1 { .tableColumns(1); } + .span2 { .tableColumns(2); } + .span3 { .tableColumns(3); } + .span4 { .tableColumns(4); } + .span5 { .tableColumns(5); } + .span6 { .tableColumns(6); } + .span7 { .tableColumns(7); } + .span8 { .tableColumns(8); } + .span9 { .tableColumns(9); } + .span10 { .tableColumns(10); } + .span11 { .tableColumns(11); } + .span12 { .tableColumns(12); } + .span13 { .tableColumns(13); } + .span14 { .tableColumns(14); } + .span15 { .tableColumns(15); } + .span16 { .tableColumns(16); } } -/* Patterns.less + + +// TABLESORTER +// ----------- + +table { + // Tablesorting styles w/ jQuery plugin + .header { + cursor: pointer; + &:after { + float: right; + margin-top: 7px; + border-width: 0 4px 4px; + border-style: solid; + border-color: #000 transparent; + content: ""; + visibility: hidden; + } + } + // Style the sorted column headers (THs) + .headerSortUp, + .headerSortDown { + text-shadow: 0 1px 1px rgba(255,255,255,.75); + background-color: rgba(141,192,219,.25); + } + // Style the ascending (reverse alphabetical) column header + .header:hover { + &:after { + visibility: visible; + } + } + // Style the descending (alphabetical) column header + .headerSortDown, + .headerSortDown:hover { + &:after { + visibility: visible; + .opacity(60); + } + } + // Style the ascending (reverse alphabetical) column header + .headerSortUp { + &:after { + border-bottom: none; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid #000; + visibility:visible; + .box-shadow(none); //can't add boxshadow to downward facing arrow :( + .opacity(60); + } + } + // Blue Table Headings + .blue { + color: @blue; + border-bottom-color: @blue; + } + .headerSortUp.blue, + .headerSortDown.blue { + background-color: lighten(@blue, 40%); + } + // Green Table Headings + .green { + color: @green; + border-bottom-color: @green; + } + .headerSortUp.green, + .headerSortDown.green { + background-color: lighten(@green, 40%); + } + // Red Table Headings + .red { + color: @red; + border-bottom-color: @red; + } + .headerSortUp.red, + .headerSortDown.red { + background-color: lighten(@red, 50%); + } + // Yellow Table Headings + .yellow { + color: @yellow; + border-bottom-color: @yellow; + } + .headerSortUp.yellow, + .headerSortDown.yellow { + background-color: lighten(@yellow, 40%); + } + // Orange Table Headings + .orange { + color: @orange; + border-bottom-color: @orange; + } + .headerSortUp.orange, + .headerSortDown.orange { + background-color: lighten(@orange, 40%); + } + // Purple Table Headings + .purple { + color: @purple; + border-bottom-color: @purple; + } + .headerSortUp.purple, + .headerSortDown.purple { + background-color: lighten(@purple, 40%); + } +}*//* Patterns.less * Repeatable UI elements outside the base styles provided from the scaffolding * ---------------------------------------------------------------------------- */ .navbar { @@ -1228,45 +1221,45 @@ table .headerSortUp.purple, table .headerSortDown.purple { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } .navbar .brand a:hover, .navbar ul .active > a { - background-color: #333333; - background-color: rgba(255, 255, 255, 0.05); color: #ffffff; text-decoration: none; + background-color: #333333; + background-color: rgba(255, 255, 255, 0.05); } .navbar .brand { float: left; display: block; padding: 8px 20px 12px; margin-left: -20px; - color: #ffffff; font-size: 20px; font-weight: 200; line-height: 1; + color: #ffffff; } .navbar p { margin: 0; line-height: 40px; } .navbar p a:hover { - background-color: transparent; color: #ffffff; + background-color: transparent; } .navbar-search { position: relative; + float: left; margin-top: 6px; margin-bottom: 0; - float: left; } .navbar-search .search-query { - background-color: #444; - background-color: rgba(255, 255, 255, 0.3); + padding: 4px 9px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 1; - padding: 4px 9px; color: #ffffff; color: rgba(255, 255, 255, 0.75); + background-color: #444; + background-color: rgba(255, 255, 255, 0.3); border: 1px solid #111; -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); @@ -1284,20 +1277,20 @@ table .headerSortUp.purple, table .headerSortDown.purple { color: #e6e6e6; } .navbar-search .search-query:hover { + color: #ffffff; background-color: #bfbfbf; background-color: rgba(255, 255, 255, 0.5); - color: #ffffff; } .navbar-search .search-query:focus, .navbar-search .search-query.focused { - outline: 0; - background-color: #ffffff; + padding: 5px 10px; color: #404040; text-shadow: 0 1px 0 #ffffff; + background-color: #ffffff; border: 0; - padding: 5px 10px; -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + outline: 0; } .navbar-static { margin-bottom: 18px; @@ -1312,16 +1305,16 @@ table .headerSortUp.purple, table .headerSortDown.purple { .navbar-fixed { position: fixed; top: 0; - left: 0; right: 0; + left: 0; z-index: 10000; } .nav { + position: relative; + left: 0; display: block; float: left; margin: 0 10px 0 0; - position: relative; - left: 0; } .nav > li { display: block; @@ -1396,42 +1389,39 @@ table .headerSortUp.purple, table .headerSortDown.purple { position: relative; } .dropdown-toggle:after { + display: inline-block; width: 0; height: 0; - display: inline-block; - content: "↓"; - text-indent: -99999px; - vertical-align: top; margin-top: 8px; margin-left: 6px; + text-indent: -99999px; + vertical-align: top; border-left: 4px solid transparent; border-right: 4px solid transparent; border-top: 4px solid #ffffff; filter: alpha(opacity=30); - -khtml-opacity: 0.3; -moz-opacity: 0.3; opacity: 0.3; + content: "↓"; } .dropdown:hover .dropdown-toggle:after { filter: alpha(opacity=100); - -khtml-opacity: 1; -moz-opacity: 1; opacity: 1; } .dropdown-menu { - background-color: #ffffff; - float: left; - display: none; position: absolute; top: 40px; z-index: 900; + float: left; + display: none; min-width: 160px; max-width: 220px; _width: 160px; + padding: 6px 0; margin-left: 0; margin-right: 0; - padding: 6px 0; - zoom: 1; + background-color: #ffffff; border-color: #999; border-color: rgba(0, 0, 0, 0.2); border-style: solid; @@ -1445,6 +1435,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-background-clip: padding-box; -moz-background-clip: padding-box; background-clip: padding-box; + zoom: 1; } .dropdown-menu li { float: none; @@ -1468,6 +1459,8 @@ table .headerSortUp.purple, table .headerSortDown.purple { text-shadow: 0 1px 0 #ffffff; } .topbar .dropdown-menu a:hover, .dropdown-menu a:hover { + color: #404040; + text-decoration: none; background-color: #dddddd; background-image: -khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd)); background-image: -moz-linear-gradient(top, #eeeeee, #dddddd); @@ -1478,8 +1471,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { background-image: linear-gradient(top, #eeeeee, #dddddd); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0); - color: #404040; - text-decoration: none; -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); @@ -1493,9 +1484,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { display: block; } .hero-unit { - background-color: #f5f5f5; - margin-bottom: 30px; padding: 60px; + margin-bottom: 30px; + background-color: #f5f5f5; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -1512,8 +1503,8 @@ table .headerSortUp.purple, table .headerSortDown.purple { line-height: 27px; } footer { - margin-top: 17px; padding-top: 17px; + margin-top: 17px; border-top: 1px solid #eee; } .page-header { @@ -1548,6 +1539,7 @@ footer { .alert-message.danger, .btn.error, .alert-message.error { + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #c43c35; background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35)); background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); @@ -1558,11 +1550,11 @@ footer { background-image: linear-gradient(top, #ee5f5b, #c43c35); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); border-color: #c43c35 #c43c35 #882a25; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } .btn.success, .alert-message.success { + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #57a957; background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); background-image: -moz-linear-gradient(top, #62c462, #57a957); @@ -1573,11 +1565,11 @@ footer { background-image: linear-gradient(top, #62c462, #57a957); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); border-color: #57a957 #57a957 #3d773d; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } .btn.info, .alert-message.info { + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #339bb9; background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); @@ -1588,13 +1580,16 @@ footer { background-image: linear-gradient(top, #5bc0de, #339bb9); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); border-color: #339bb9 #339bb9 #22697d; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } .btn { - cursor: pointer; display: inline-block; + padding: 5px 14px 6px; + font-size: 13px; + line-height: normal; + color: #333; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); background-color: #e6e6e6; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); @@ -1604,11 +1599,6 @@ footer { background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); background-repeat: no-repeat; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); - padding: 5px 14px 6px; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - color: #333; - font-size: 13px; - line-height: normal; border: 1px solid #ccc; border-bottom-color: #bbb; -webkit-border-radius: 4px; @@ -1617,6 +1607,7 @@ footer { -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); + cursor: pointer; -webkit-transition: 0.1s linear all; -moz-transition: 0.1s linear all; -ms-transition: 0.1s linear all; @@ -1624,15 +1615,16 @@ footer { transition: 0.1s linear all; } .btn:hover { - background-position: 0 -15px; color: #333; text-decoration: none; + background-position: 0 -15px; } .btn:focus { outline: 1px dotted #666; } .btn.primary { color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #0064cd; background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd)); background-image: -moz-linear-gradient(top, #049cdb, #0064cd); @@ -1643,7 +1635,6 @@ footer { background-image: linear-gradient(top, #049cdb, #0064cd); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); border-color: #0064cd #0064cd #003f81; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } @@ -1657,7 +1648,6 @@ footer { background-image: none; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); filter: alpha(opacity=65); - -khtml-opacity: 0.65; -moz-opacity: 0.65; opacity: 0.65; -webkit-box-shadow: none; @@ -1669,7 +1659,6 @@ footer { background-image: none; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); filter: alpha(opacity=65); - -khtml-opacity: 0.65; -moz-opacity: 0.65; opacity: 0.65; -webkit-box-shadow: none; @@ -1677,9 +1666,9 @@ footer { box-shadow: none; } .btn.large { + padding: 9px 14px 9px; font-size: 15px; line-height: normal; - padding: 9px 14px 9px; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -1700,9 +1689,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .btn-toolbar:before, .btn-toolbar:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .btn-toolbar:after { clear: both; @@ -1716,9 +1705,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .btn-group:before, .btn-group:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .btn-group:after { clear: both; @@ -1753,13 +1742,12 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .close { float: right; - color: #000000; font-size: 20px; font-weight: bold; line-height: 13.5px; + color: #000000; text-shadow: 0 1px 0 #ffffff; filter: alpha(opacity=20); - -khtml-opacity: 0.2; -moz-opacity: 0.2; opacity: 0.2; } @@ -1767,7 +1755,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { color: #000000; text-decoration: none; filter: alpha(opacity=40); - -khtml-opacity: 0.4; -moz-opacity: 0.4; opacity: 0.4; } @@ -1776,6 +1763,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { padding: 7px 15px; margin-bottom: 18px; color: #404040; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #eedc94; background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94)); background-image: -moz-linear-gradient(top, #fceec1, #eedc94); @@ -1786,10 +1775,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { background-image: linear-gradient(top, #fceec1, #eedc94); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); border-color: #eedc94 #eedc94 #e4c652; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); border-width: 1px; border-style: solid; -webkit-border-radius: 4px; @@ -1821,10 +1808,10 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); } .alert-message.block-message { + padding: 14px; background-image: none; background-color: #fdf5d9; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - padding: 14px; border-color: #fceec1; -webkit-box-shadow: none; -moz-box-shadow: none; @@ -1859,10 +1846,10 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { border-color: #c6edf9; } .well { - background-color: #f5f5f5; - margin-bottom: 20px; - padding: 19px; min-height: 20px; + padding: 19px; + margin-bottom: 20px; + background-color: #f5f5f5; border: 1px solid #eee; border: 1px solid rgba(0, 0, 0, 0.05); -webkit-border-radius: 4px; @@ -1889,11 +1876,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .label { padding: 1px 3px 2px; - background-color: #bfbfbf; font-size: 9.75px; font-weight: bold; color: #ffffff; text-transform: uppercase; + background-color: #bfbfbf; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; @@ -1910,15 +1897,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .label.notice { background-color: #62cffc; } -.pull-right { - float: right; -} -.pull-left { - float: left; -} .tabs, .pills { - margin: 0 0 20px; padding: 0; + margin: 0 0 20px; list-style: none; zoom: 1; } @@ -1927,9 +1908,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .tabs:after, .pills:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .tabs:after, .pills:after { clear: both; @@ -2005,9 +1986,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .tabbable.tabs-left:after, .tabbable.tabs-right:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .tabbable.tabs-left:after, .tabbable.tabs-right:after { clear: both; @@ -2088,8 +2069,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { border-top-color: #555; } .pills a { - margin: 5px 3px 5px 0; padding: 0 15px; + margin: 5px 3px 5px 0; line-height: 30px; text-shadow: 0 1px 1px #ffffff; -webkit-border-radius: 15px; @@ -2117,8 +2098,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { display: block; } .breadcrumb { - margin: 0 0 18px; padding: 7px 14px; + margin: 0 0 18px; background-color: #f5f5f5; background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5)); background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); @@ -2171,39 +2152,38 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { float: left; padding: 0 14px; line-height: 34px; + text-decoration: none; border-right: 1px solid; border-right-color: #ddd; border-right-color: rgba(0, 0, 0, 0.15); *border-right-color: #ddd; /* IE6-7 */ - text-decoration: none; } .pagination a:hover, .pagination .active a { background-color: #c7eefe; } .pagination .disabled a, .pagination .disabled a:hover { - background-color: transparent; color: #bfbfbf; + background-color: transparent; } .pagination .next a { border: 0; } .modal-backdrop { - background-color: #000000; position: fixed; top: 0; - left: 0; right: 0; bottom: 0; + left: 0; z-index: 10000; + background-color: #000000; } .modal-backdrop.fade { opacity: 0; } .modal-backdrop, .modal-backdrop.fade.in { filter: alpha(opacity=80); - -khtml-opacity: 0.8; -moz-opacity: 0.8; opacity: 0.8; } @@ -2245,15 +2225,16 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { top: 50%; } .modal-header { - border-bottom: 1px solid #eee; padding: 5px 15px; + border-bottom: 1px solid #eee; } .modal-body { padding: 15px; } .modal-footer { - background-color: #f5f5f5; padding: 14px 15px 15px; + margin-bottom: 0; + background-color: #f5f5f5; border-top: 1px solid #ddd; -webkit-border-radius: 0 0 6px 6px; -moz-border-radius: 0 0 6px 6px; @@ -2262,13 +2243,12 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff; zoom: 1; - margin-bottom: 0; } .modal-footer:before, .modal-footer:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .modal-footer:after { clear: both; @@ -2278,20 +2258,18 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { margin-left: 5px; } .twipsy { - display: block; position: absolute; + z-index: 1000; + display: block; visibility: visible; padding: 5px; font-size: 11px; - z-index: 1000; filter: alpha(opacity=80); - -khtml-opacity: 0.8; -moz-opacity: 0.8; opacity: 0.8; } .twipsy.fade.in { filter: alpha(opacity=80); - -khtml-opacity: 0.8; -moz-opacity: 0.8; opacity: 0.8; } @@ -2328,12 +2306,12 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { border-right: 5px solid #000000; } .twipsy-inner { + max-width: 200px; padding: 3px 8px; - background-color: #000000; color: white; text-align: center; - max-width: 200px; text-decoration: none; + background-color: #000000; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -2348,8 +2326,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { top: 0; left: 0; z-index: 1000; - padding: 5px; display: none; + padding: 5px; } .popover.above .arrow { bottom: 0; @@ -2389,11 +2367,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { height: 0; } .popover .inner { - background-color: #000000; - background-color: rgba(0, 0, 0, 0.8); padding: 3px; - overflow: hidden; width: 280px; + overflow: hidden; + background-color: #000000; + background-color: rgba(0, 0, 0, 0.8); -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -2402,17 +2380,17 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); } .popover .title { - background-color: #f5f5f5; padding: 9px 15px; line-height: 1; + background-color: #f5f5f5; + border-bottom: 1px solid #eee; -webkit-border-radius: 3px 3px 0 0; -moz-border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0; - border-bottom: 1px solid #eee; } .popover .content { - background-color: #ffffff; padding: 14px; + background-color: #ffffff; -webkit-border-radius: 0 0 3px 3px; -moz-border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px; @@ -2430,9 +2408,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .media-grid:before, .media-grid:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .media-grid:after { clear: both; -- cgit v1.2.3 From 90c190d4efedd4080c574b34bffdf54cd5b9ed88 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 29 Nov 2011 23:48:27 -0800 Subject: updates to add warning for bordered tables to docs, fix to spacing on prettyprint pre blocks --- bootstrap.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 6c5e58b71..aa852460e 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 Nov 29 22:53:00 PST 2011 + * Date: Tue Nov 29 23:48:09 PST 2011 */ html, body { margin: 0; @@ -514,6 +514,9 @@ pre { white-space: pre-wrap; word-break: break-all; } +pre.prettyprint { + margin-bottom: 18px; +} pre code { padding: 0; background-color: transparent; -- cgit v1.2.3 From f2c40ee24d0caa26e79ed206370858918c603419 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 30 Nov 2011 00:39:38 -0800 Subject: adding step nav to components --- bootstrap.css | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index aa852460e..6e10706f7 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 Nov 29 23:48:09 PST 2011 + * Date: Wed Nov 30 00:39:32 PST 2011 */ html, body { margin: 0; @@ -2088,6 +2088,48 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .tab-content > .active, .pill-content > .active { display: block; } +.step-nav { + position: relative; + margin: 0 0 18px; + list-style: none; + line-height: 30px; + text-align: center; + background-color: #f5f5f5; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; +} +.step-nav li { + display: inline; + color: #bfbfbf; +} +.step-nav .prev, .step-nav .next { + position: absolute; + top: 6px; +} +.step-nav .prev { + left: 15px; +} +.step-nav .next { + right: 15px; +} +.step-nav .dot { + display: inline-block; + width: 10px; + height: 10px; + margin: 0 3px; + text-indent: -999em; + background-color: #bfbfbf; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25); +} +.step-nav .dot:hover, .step-nav .active .dot { + background-color: #404040; +} .breadcrumb { padding: 7px 14px; margin: 0 0 18px; -- cgit v1.2.3 From bc51c15709469fd0c2e78886a15e849626a8f191 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 30 Nov 2011 01:00:55 -0800 Subject: adding temp idea for subnav to docs --- bootstrap.css | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 6e10706f7..2bef99e1a 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: Wed Nov 30 00:39:32 PST 2011 + * Date: Wed Nov 30 00:54:47 PST 2011 */ html, body { margin: 0; @@ -2130,6 +2130,49 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .step-nav .dot:hover, .step-nav .active .dot { background-color: #404040; } +.subnav { + position: relative; + background-color: #eeeeee; + background-image: -khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#eeeeee)); + background-image: -moz-linear-gradient(top, #f5f5f5, #eeeeee); + background-image: -ms-linear-gradient(top, #f5f5f5, #eeeeee); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #eeeeee)); + background-image: -webkit-linear-gradient(top, #f5f5f5, #eeeeee); + background-image: -o-linear-gradient(top, #f5f5f5, #eeeeee); + background-image: linear-gradient(top, #f5f5f5, #eeeeee); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#eeeeee', GradientType=0); + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.subnav a { + padding: 10px 15px; + color: #0069d6; + text-shadow: 0 1px 0 #fff; + border-left: 1px solid #f9f9f9; + border-right: 1px solid #e5e5e5; +} +.subnav a:hover { + color: #00438a; + background-color: #eee; +} +.subnav li:first-child a { + border-left: 0; + -webkit-border-radius: 6px 0 0 6px; + -moz-border-radius: 6px 0 0 6px; + border-radius: 6px 0 0 6px; +} +.subnav li:last-child a { + border-right: 0; + -webkit-border-radius: 0 6px 6px 0; + -moz-border-radius: 0 6px 6px 0; + border-radius: 0 6px 6px 0; +} +.subnav ul .active > a { + color: #404040; + background-color: #eee; +} .breadcrumb { padding: 7px 14px; margin: 0 0 18px; -- cgit v1.2.3 From dc628c9115b74e49940c0cc200a8914232c9d2a2 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 30 Nov 2011 22:05:09 -0800 Subject: start of carousel --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 4c4d85aa9..462c254a8 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: Fri Nov 25 21:33:58 PST 2011 + * Date: Mon Nov 28 11:50:42 PST 2011 */ html, body { margin: 0; -- cgit v1.2.3 From 6e70d490e1c189518164d7f08035c34e21745715 Mon Sep 17 00:00:00 2001 From: Evan Meagher Date: Fri, 2 Dec 2011 11:37:39 -0800 Subject: Add vertical nav divider example in components doc page. --- bootstrap.css | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index afd87d137..977737f67 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: Wed Nov 30 22:05:44 PST 2011 + * Date: Fri Dec 2 11:32:48 PST 2011 */ html, body { margin: 0; @@ -1313,6 +1313,14 @@ table { background-color: #222; background-color: rgba(0, 0, 0, 0.5); } +.nav .divider { + height: 40px; + width: 1px; + margin: 0 5px; + overflow: hidden; + background-color: #222; + border-right: 1px solid #444; +} .nav.secondary-nav { float: right; margin-left: 10px; -- cgit v1.2.3 From b12b71bf7ca76437a532122d8efff59506b61530 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 9 Dec 2011 11:32:07 -0800 Subject: updated to include sub nav and pip nav, new docs updates, topbar nav refinements for media queried settings --- bootstrap.css | 216 +++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 139 insertions(+), 77 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 2bef99e1a..d0c78d037 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: Wed Nov 30 00:54:47 PST 2011 + * Date: Fri Dec 9 11:23:25 PST 2011 */ html, body { margin: 0; @@ -1175,7 +1175,6 @@ table { } }*/ .navbar { - height: 40px; overflow: visible; } .navbar-inner { @@ -2131,7 +2130,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { background-color: #404040; } .subnav { - position: relative; background-color: #eeeeee; background-image: -khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#eeeeee)); background-image: -moz-linear-gradient(top, #f5f5f5, #eeeeee); @@ -2142,12 +2140,13 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { background-image: linear-gradient(top, #f5f5f5, #eeeeee); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#eeeeee', GradientType=0); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + -webkit-box-shadow: inset 0 1px 0 #ffffff, 0 0 5px rgba(0, 0, 0, 0.5); + -moz-box-shadow: inset 0 1px 0 #ffffff, 0 0 5px rgba(0, 0, 0, 0.5); + box-shadow: inset 0 1px 0 #ffffff, 0 0 5px rgba(0, 0, 0, 0.5); } .subnav a { - padding: 10px 15px; + padding: 8px 10px; + font-size: 12px; color: #0069d6; text-shadow: 0 1px 0 #fff; border-left: 1px solid #f9f9f9; @@ -2515,44 +2514,35 @@ 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); } +.hidden { + display: none; + visibility: hidden; +} @media (max-width: 480px) { - .container { - width: auto; - padding: 0 15px; - } - .row { - margin-left: 0; - } - [class*="span"] { - float: none; - display: block; - width: auto; - margin: 0; - } .modal { width: auto; margin: 0; } - .form-horizontal .control-group > label { + .horizontal-form .control-group > label { float: none; width: auto; padding-top: 0; text-align: left; } - .form-horizontal .controls { + .horizontal-form .controls { margin-left: 0; } - .form-horizontal .control-list { + .horizontal-form .control-list { padding-top: 0; } - .form-horizontal .form-actions { + .horizontal-form .form-actions { padding-left: 0; } } -@media (min-width: 480px) and (max-width: 768px) { +@media (max-width: 768px) { .container { width: auto; - padding: 0 10px; + padding: 0 20px; } .row { margin-left: 0; @@ -2563,6 +2553,55 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { width: auto; margin: 0; } + .nav { + position: absolute; + top: 0; + left: 0; + width: 180px; + padding-top: 40px; + list-style: none; + } + .nav, .nav > li:last-child a { + -webkit-border-radius: 0 0 4px 0; + -moz-border-radius: 0 0 4px 0; + border-radius: 0 0 4px 0; + } + .nav > li { + float: none; + display: none; + } + .nav > li > a { + float: none; + background-color: #222; + } + .nav > .active { + display: block; + position: absolute; + top: 0; + left: 0; + } + .navbar ul .active > a { + background-color: transparent; + } + .nav > .active a:after { + display: inline-block; + width: 0; + height: 0; + margin-top: 8px; + margin-left: 6px; + text-indent: -99999px; + vertical-align: top; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid #ffffff; + filter: alpha(opacity=100); + -moz-opacity: 1; + opacity: 1; + content: "↓"; + } + .nav > .active a:hover { + background-color: rgba(255, 255, 255, 0.05); + } } @media (min-width: 768px) and (max-width: 940px) { .container { @@ -2641,60 +2680,83 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { margin-left: 768px; } } -/* -// LARGE DESKTOP & UP -// ------------------ - @media (min-width: 1210px) { - - // 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; - } - .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 7b810bf9a617e1f02e073aafcc70857dc915ee59 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 9 Dec 2011 12:10:01 -0800 Subject: update js in footer, add max-width to img --- bootstrap.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index adae67ec9..2180ae446 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: Fri Dec 9 11:32:45 PST 2011 + * Date: Fri Dec 9 12:09:50 PST 2011 */ html, body { margin: 0; @@ -127,6 +127,8 @@ sub { bottom: -0.25em; } img { + max-width: 100%; + height: auto; border: 0; -ms-interpolation-mode: bicubic; } -- cgit v1.2.3 From 97b285896f50bed4a66b00a70ed67eb3224bc7f3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 9 Dec 2011 12:51:54 -0800 Subject: help tables not look like shit on mobile maybe? also fix bordered table example --- bootstrap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 2180ae446..d52b96fa6 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: Fri Dec 9 12:09:50 PST 2011 + * Date: Fri Dec 9 12:51:39 PST 2011 */ html, body { margin: 0; @@ -70,6 +70,7 @@ td { font-family: inherit; } table { + max-width: 100%; border-collapse: collapse; border-spacing: 0; } -- cgit v1.2.3 From 5c8df1d2858c3d5f2cc65a80acaef5312b1ae87f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 9 Dec 2011 14:34:38 -0800 Subject: updated index page to add featured sites, more docs tweaks --- bootstrap.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index d52b96fa6..0c1c02566 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: Fri Dec 9 12:51:39 PST 2011 + * Date: Fri Dec 9 13:29:05 PST 2011 */ html, body { margin: 0; @@ -436,9 +436,10 @@ dl dd { margin-left: 9px; } hr { - margin: 20px 0 19px; + margin: 27px 0; border: 0; - border-bottom: 1px solid #eee; + border-top: 1px solid #e5e5e5; + border-bottom: 1px solid #fff; } strong { font-style: inherit; -- cgit v1.2.3 From 4d55356e9b476cbfea5eb2ea01099dc19a5fc5f4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 9 Dec 2011 14:39:23 -0800 Subject: remove uber large responsive stuff --- bootstrap.css | 124 +++++++++++++++++++++++----------------------------------- 1 file changed, 49 insertions(+), 75 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 0c1c02566..6cfb0fbf9 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: Fri Dec 9 13:29:05 PST 2011 + * Date: Fri Dec 9 14:39:08 PST 2011 */ html, body { margin: 0; @@ -2684,83 +2684,57 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { margin-left: 768px; } } +/* @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; + + // 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)); } - .offset9 { - margin-left: 900px; + .offset(@columnOffset: 1) { + margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @gridGutterWidth; } - .offset10 { - margin-left: 1000px; - } - .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); } + } +*/ -- cgit v1.2.3 From d587845149471ad9ed07bc57c1a8652c54d17c55 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 10 Dec 2011 22:21:08 -0800 Subject: tweaks and increase specificity of pills and active classes --- bootstrap.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 6cfb0fbf9..b7a820f71 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: Fri Dec 9 14:39:08 PST 2011 + * Date: Sat Dec 10 22:20:18 PST 2011 */ html, body { margin: 0; @@ -2062,7 +2062,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after { border-top-color: #555; } -.pills a { +.pills > a { padding: 0 15px; margin: 5px 3px 5px 0; line-height: 30px; @@ -2071,13 +2071,13 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-border-radius: 15px; border-radius: 15px; } -.pills a:hover { +.pills > a:hover { color: #ffffff; text-decoration: none; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); background-color: #00438a; } -.pills .active a { +.pills .active > a { color: #ffffff; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); background-color: #0069d6; -- cgit v1.2.3 From d2e56ad53d5d5c93cd6206a6829ee2054f583c5b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 10 Dec 2011 22:29:49 -0800 Subject: unstyle image inputs --- bootstrap.css | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index b7a820f71..5fb8b6fc8 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 Dec 10 22:20:18 PST 2011 + * Date: Sat Dec 10 22:29:17 PST 2011 */ html, body { margin: 0; @@ -567,8 +567,7 @@ select, -moz-border-radius: 3px; border-radius: 3px; } -/* Mini reset for unique input types */ -input[type=checkbox], input[type=radio] { +input[type=image], input[type=checkbox], input[type=radio] { width: auto; height: auto; padding: 0; @@ -605,6 +604,11 @@ select[multiple] { height: inherit; background-color: #ffffff; } +input[type=image] { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} textarea { height: auto; } -- cgit v1.2.3 From 95048c271eb4166a4e22ab1f0ff6d69bade7d62b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Dec 2011 01:03:57 -0800 Subject: fix specificity on pills --- bootstrap.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 79fe4826c..1c04bc09c 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 Dec 11 00:58:00 PST 2011 + * Date: Sun Dec 11 01:03:44 PST 2011 */ html, body { margin: 0; @@ -2074,7 +2074,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after { border-top-color: #555; } -.pills > a { +.pills > li > a { padding: 0 15px; margin: 5px 3px 5px 0; line-height: 30px; @@ -2083,7 +2083,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-border-radius: 15px; border-radius: 15px; } -.pills > a:hover { +.pills > li > a:hover { color: #ffffff; text-decoration: none; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); -- cgit v1.2.3 From 401f84a7ec65996a8573671b2c17077f85e63e6f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Dec 2011 01:58:06 -0800 Subject: center example sites in docs on mobile --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 1c04bc09c..49164fa53 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 Dec 11 01:03:44 PST 2011 + * Date: Sun Dec 11 01:57:49 PST 2011 */ html, body { margin: 0; -- cgit v1.2.3 From 4e8c26d409c60f50e2ab245e74ec18af5131d838 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Dec 2011 02:38:58 -0800 Subject: updated buttons docs --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 49164fa53..4e5055c1b 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 Dec 11 01:57:49 PST 2011 + * Date: Sun Dec 11 02:07:42 PST 2011 */ html, body { margin: 0; -- cgit v1.2.3 From d681ae9f51b85d8e1efae2a819ce289266d7efd0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Dec 2011 09:51:41 -0800 Subject: updated docs to include other less apps --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 4e5055c1b..6411413ff 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 Dec 11 02:07:42 PST 2011 + * Date: Mon Dec 12 09:51:27 PST 2011 */ html, body { margin: 0; -- cgit v1.2.3 From 72a536393c2f2aba4f855384e94c4ce09bc2e39c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 19 Dec 2011 22:58:56 -0800 Subject: mostly docs updates, but also some bug fixes per github issues --- bootstrap.css | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 6411413ff..f57423b0c 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 Dec 12 09:51:27 PST 2011 + * Date: Mon Dec 19 22:58:34 PST 2011 */ html, body { margin: 0; @@ -600,9 +600,11 @@ select, input[type=file] { line-height: 27px; } +select { + background-color: #ffffff; +} select[multiple] { height: inherit; - background-color: #ffffff; } input[type=image] { -webkit-box-shadow: none; @@ -2492,27 +2494,28 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .popover .content p, .popover .content ul, .popover .content ol { margin-bottom: 0; } -.media-grid { +.thumbnails { margin-left: -20px; margin-bottom: 0; + list-style: none; zoom: 1; } -.media-grid:before, .media-grid:after { +.thumbnails:before, .thumbnails:after { display: table; *display: inline; content: ""; zoom: 1; } -.media-grid:after { +.thumbnails:after { clear: both; } -.media-grid li { - display: inline; -} -.media-grid a { +.thumbnails > li { float: left; - padding: 4px; margin: 0 0 20px 20px; +} +.thumbnail { + display: block; + line-height: 1; border: 1px solid #ddd; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -2521,15 +2524,19 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); } -.media-grid a img { - display: block; -} -.media-grid a:hover { +a.thumbnail:hover { border-color: #0069d6; -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); } +.thumbnail > img { + display: block; + margin: 4px; +} +.thumbnail .caption { + padding: 9px; +} .hidden { display: none; visibility: hidden; -- cgit v1.2.3 From 0980a33b4703677e1aaf3cd949c0437512fa6f33 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 20 Dec 2011 19:37:41 -0800 Subject: update all to new on api + add animation support to tabs --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 6411413ff..c39a12264 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 Dec 12 09:51:27 PST 2011 + * Date: Tue Dec 20 19:08:51 PST 2011 */ html, body { margin: 0; -- cgit v1.2.3 From c4364285e456013c4b66308fea86e0f1fb852817 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 20 Dec 2011 22:12:23 -0800 Subject: add default margin for popover and twipsy --- bootstrap.css | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index c39a12264..f3fcca637 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 Dec 20 19:08:51 PST 2011 + * Date: Tue Dec 20 22:11:42 PST 2011 */ html, body { margin: 0; @@ -2364,6 +2364,18 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-opacity: 0.8; opacity: 0.8; } +.twipsy.above { + margin-top: -2px; +} +.twipsy.right { + margin-left: 2px; +} +.twipsy.below { + margin-top: 2px; +} +.twipsy.left { + margin-left: -2px; +} .twipsy.above .twipsy-arrow { bottom: 0; left: 50%; @@ -2420,6 +2432,18 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { display: none; padding: 5px; } +.popover.above { + margin-top: -5px; +} +.popover.right { + margin-left: 5px; +} +.popover.below { + margin-top: 5px; +} +.popover.left { + margin-left: -5px; +} .popover.above .arrow { bottom: 0; left: 50%; -- cgit v1.2.3 From 8a7abc7493a07935d4d91b2cc56a82523fd53970 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2011 16:00:50 -0600 Subject: docs updates, forms updated to include error states and more examples, remove text-shadow from gradientbar mixin to fix bug --- bootstrap.css | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index f57423b0c..7254ee443 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 Dec 19 22:58:34 PST 2011 + * Date: Wed Dec 21 15:58:57 CST 2011 */ html, body { margin: 0; @@ -919,6 +919,9 @@ textarea[readonly] { .inline-inputs span { padding: 0 2px 0 1px; } +.input-prepend, .input-append { + overflow: hidden; +} .input-prepend input, .input-append input { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; @@ -1534,7 +1537,6 @@ footer { .alert-message.danger, .btn.error, .alert-message.error { - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #c43c35; background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35)); background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); @@ -1549,7 +1551,6 @@ footer { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } .btn.success, .alert-message.success { - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #57a957; background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); background-image: -moz-linear-gradient(top, #62c462, #57a957); @@ -1564,7 +1565,6 @@ footer { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } .btn.info, .alert-message.info { - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #339bb9; background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); @@ -1619,7 +1619,6 @@ footer { } .btn.primary { color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #0064cd; background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd)); background-image: -moz-linear-gradient(top, #049cdb, #0064cd); @@ -1759,7 +1758,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { margin-bottom: 18px; color: #404040; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #eedc94; background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94)); background-image: -moz-linear-gradient(top, #fceec1, #eedc94); @@ -1802,6 +1800,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); } +.alert-message.error, .alert-message.success, .alert-message.info { + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +} .alert-message.block-message { padding: 14px; background-image: none; -- cgit v1.2.3 From 20aecb983838422c7b43e20960b10d4d79fefaa3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2011 16:22:20 -0600 Subject: updated all docs to jQuery 1.7, move all docs JS to application.js, and move dropdowns css to dedicated file --- bootstrap.css | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 101 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 7254ee443..74849e66b 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: Wed Dec 21 15:58:57 CST 2011 + * Date: Wed Dec 21 16:21:54 CST 2011 */ html, body { margin: 0; @@ -1610,7 +1610,7 @@ footer { transition: 0.1s linear all; } .btn:hover { - color: #333; + color: #404040; text-decoration: none; background-position: 0 -15px; } @@ -1619,6 +1619,7 @@ footer { } .btn.primary { color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #0064cd; background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd)); background-image: -moz-linear-gradient(top, #049cdb, #0064cd); @@ -1906,6 +1907,104 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .label.notice { background-color: #62cffc; } +.dropdown { + position: relative; +} +.dropdown-toggle:after { + display: inline-block; + width: 0; + height: 0; + margin-top: 8px; + margin-left: 6px; + text-indent: -99999px; + vertical-align: top; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid #ffffff; + filter: alpha(opacity=30); + -moz-opacity: 0.3; + opacity: 0.3; + content: "↓"; +} +.dropdown:hover .dropdown-toggle:after { + filter: alpha(opacity=100); + -moz-opacity: 1; + opacity: 1; +} +.dropdown-menu { + position: absolute; + top: 40px; + z-index: 900; + float: left; + display: none; + min-width: 160px; + max-width: 220px; + _width: 160px; + padding: 6px 0; + margin-left: 0; + margin-right: 0; + background-color: #ffffff; + border-color: #999; + border-color: rgba(0, 0, 0, 0.2); + border-style: solid; + border-width: 0 1px 1px; + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; + -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); + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; + zoom: 1; +} +.dropdown-menu li { + float: none; + display: block; + background-color: none; +} +.dropdown-menu .divider { + height: 1px; + margin: 5px 0; + overflow: hidden; + background-color: #eee; + border-bottom: 1px solid #ffffff; +} +.topbar .dropdown-menu a, .dropdown-menu a { + display: block; + padding: 4px 15px; + clear: both; + font-weight: normal; + line-height: 18px; + color: #808080; + text-shadow: 0 1px 0 #ffffff; +} +.topbar .dropdown-menu a:hover, .dropdown-menu a:hover { + color: #404040; + text-decoration: none; + background-color: #dddddd; + background-image: -khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd)); + background-image: -moz-linear-gradient(top, #eeeeee, #dddddd); + background-image: -ms-linear-gradient(top, #eeeeee, #dddddd); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd)); + background-image: -webkit-linear-gradient(top, #eeeeee, #dddddd); + background-image: -o-linear-gradient(top, #eeeeee, #dddddd); + background-image: linear-gradient(top, #eeeeee, #dddddd); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0); + -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); + -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); + box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); +} +.dropdown.open .dropdown-toggle { + color: #ffffff; + background: #ccc; + background: rgba(0, 0, 0, 0.3); +} +.dropdown.open .dropdown-menu { + display: block; +} .tabs, .pills { padding: 0; margin: 0 0 20px; -- cgit v1.2.3 From c854ed167ce37d6a008723c78f2e6336211fff69 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2011 16:26:21 -0600 Subject: rename media grid to thumbnails, recompile bootstrap, fix examples for mobile phones --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 74849e66b..c7f2dfc6a 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: Wed Dec 21 16:21:54 CST 2011 + * Date: Wed Dec 21 16:26:02 CST 2011 */ html, body { margin: 0; -- cgit v1.2.3 From 00cbadf9943fea6a196cc01c7705d7f2c012bfa1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2011 18:21:55 -0600 Subject: update thumbnails to keep images from going past edges of thumbnails --- bootstrap.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index c7f2dfc6a..3fa776fcb 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: Wed Dec 21 16:26:02 CST 2011 + * Date: Wed Dec 21 18:20:33 CST 2011 */ html, body { margin: 0; @@ -2615,6 +2615,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .thumbnail { display: block; + padding: 4px; line-height: 1; border: 1px solid #ddd; -webkit-border-radius: 4px; @@ -2632,7 +2633,7 @@ a.thumbnail:hover { } .thumbnail > img { display: block; - margin: 4px; + max-width: 100%; } .thumbnail .caption { padding: 9px; -- cgit v1.2.3 From 369cedd87c4447241ce2a73ed6c8414a4cd8bdf8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2011 19:31:01 -0600 Subject: update comment on select bg bug and confirmed it was fixed, scoped responsive .span* to .row --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 354f534b2..fbd909de3 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: Wed Dec 21 18:38:56 CST 2011 + * Date: Wed Dec 21 19:30:30 CST 2011 */ html, body { margin: 0; @@ -2695,7 +2695,7 @@ a.thumbnail:hover { .row { margin-left: 0; } - [class*="span"] { + .row > [class*="span"] { float: none; display: block; width: auto; -- cgit v1.2.3 From 690d3f4d1aeb97a76d22a4dfe056e33606e0bd94 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2011 19:32:14 -0600 Subject: remove inline input field CSS since that's not required as all inputs are inline-block anyway --- bootstrap.css | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index fbd909de3..2ea7a8fbe 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: Wed Dec 21 19:30:30 CST 2011 + * Date: Wed Dec 21 19:31:39 CST 2011 */ html, body { margin: 0; @@ -904,21 +904,6 @@ textarea[readonly] { display: block; max-width: 600px; } -.inline-inputs { - color: #808080; -} -.inline-inputs span, .inline-inputs input { - display: inline-block; -} -.inline-inputs input.mini { - width: 60px; -} -.inline-inputs input.small { - width: 90px; -} -.inline-inputs span { - padding: 0 2px 0 1px; -} .input-prepend, .input-append { overflow: hidden; } -- cgit v1.2.3 From efacac0d6c812abffa8a84a48fa760f5f56c92f0 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 21 Dec 2011 18:42:43 -0800 Subject: clean up all the js across all the doc pages --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 612fe24bc..6515b12b5 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: Wed Dec 21 13:29:41 PST 2011 + * Date: Wed Dec 21 18:41:55 PST 2011 */ html, body { margin: 0; -- cgit v1.2.3 From 87ac818253a26bcf09fa55f78ae3f55759c54e64 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 22 Dec 2011 19:10:32 -0800 Subject: change above below to top bottom and add "inside" placement option --- bootstrap.css | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 6515b12b5..ee80000c2 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: Wed Dec 21 18:41:55 PST 2011 + * Date: Thu Dec 22 19:09:49 PST 2011 */ html, body { margin: 0; @@ -2366,19 +2366,19 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-opacity: 0.8; opacity: 0.8; } -.twipsy.above { +.twipsy.top { margin-top: -2px; } .twipsy.right { margin-left: 2px; } -.twipsy.below { +.twipsy.bottom { margin-top: 2px; } .twipsy.left { margin-left: -2px; } -.twipsy.above .twipsy-arrow { +.twipsy.top .twipsy-arrow { bottom: 0; left: 50%; margin-left: -5px; @@ -2394,7 +2394,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { border-bottom: 5px solid transparent; border-left: 5px solid #000000; } -.twipsy.below .twipsy-arrow { +.twipsy.bottom .twipsy-arrow { top: 0; left: 50%; margin-left: -5px; @@ -2434,19 +2434,19 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { display: none; padding: 5px; } -.popover.above { +.popover.top { margin-top: -5px; } .popover.right { margin-left: 5px; } -.popover.below { +.popover.bottom { margin-top: 5px; } .popover.left { margin-left: -5px; } -.popover.above .arrow { +.popover.top .arrow { bottom: 0; left: 50%; margin-left: -5px; @@ -2462,7 +2462,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { border-bottom: 5px solid transparent; border-right: 5px solid #000000; } -.popover.below .arrow { +.popover.bottom .arrow { top: 0; left: 50%; margin-left: -5px; -- cgit v1.2.3 From 076370f3f9076b177a1f9c8ba9f536faa1a58957 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 24 Dec 2011 22:31:39 -0800 Subject: fix for linux --- bootstrap.css | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index eb7b65678..333d6f04c 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,11 +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. -<<<<<<< HEAD - * Date: Thu Dec 22 19:09:49 PST 2011 -======= - * Date: Wed Dec 21 18:38:56 CST 2011 ->>>>>>> 9fb380151d477f1741b7609ade7a9e7fd5450b2c + * Date: Sat Dec 24 22:30:43 PST 2011 */ html, body { margin: 0; -- cgit v1.2.3 From 058f47b33b3978bbb484e521e7fc14c6ebadc161 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 26 Dec 2011 17:25:25 -0600 Subject: clean up some comments and fix a bug with buttons in navbar by removing too generic of a link color --- bootstrap.css | 106 ++-------------------------------------------------------- 1 file changed, 3 insertions(+), 103 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 5e22415dd..ff21bc836 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 Dec 26 16:47:02 CST 2011 + * Date: Mon Dec 26 17:12:29 CST 2011 */ html, body { margin: 0; @@ -1191,10 +1191,6 @@ table { -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); -} .navbar .brand a:hover, .navbar ul .active > a { color: #ffffff; text-decoration: none; @@ -1300,7 +1296,9 @@ table { float: none; padding: 10px 10px 11px; line-height: 19px; + color: #bfbfbf; text-decoration: none; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } .nav a:hover { color: #ffffff; @@ -1368,104 +1366,6 @@ table { .topbar ul .dropdown-menu li a { padding: 4px 15px; } -.dropdown { - position: relative; -} -.dropdown-toggle:after { - display: inline-block; - width: 0; - height: 0; - margin-top: 8px; - margin-left: 6px; - text-indent: -99999px; - vertical-align: top; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid #ffffff; - filter: alpha(opacity=30); - -moz-opacity: 0.3; - opacity: 0.3; - content: "↓"; -} -.dropdown:hover .dropdown-toggle:after { - filter: alpha(opacity=100); - -moz-opacity: 1; - opacity: 1; -} -.dropdown-menu { - position: absolute; - top: 40px; - z-index: 900; - float: left; - display: none; - min-width: 160px; - max-width: 220px; - _width: 160px; - padding: 6px 0; - margin-left: 0; - margin-right: 0; - background-color: #ffffff; - border-color: #999; - border-color: rgba(0, 0, 0, 0.2); - border-style: solid; - border-width: 0 1px 1px; - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - -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); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; - zoom: 1; -} -.dropdown-menu li { - float: none; - display: block; - background-color: none; -} -.dropdown-menu .divider { - height: 1px; - margin: 5px 0; - overflow: hidden; - background-color: #eee; - border-bottom: 1px solid #ffffff; -} -.topbar .dropdown-menu a, .dropdown-menu a { - display: block; - padding: 4px 15px; - clear: both; - font-weight: normal; - line-height: 18px; - color: #808080; - text-shadow: 0 1px 0 #ffffff; -} -.topbar .dropdown-menu a:hover, .dropdown-menu a:hover { - color: #404040; - text-decoration: none; - background-color: #dddddd; - background-image: -khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd)); - background-image: -moz-linear-gradient(top, #eeeeee, #dddddd); - background-image: -ms-linear-gradient(top, #eeeeee, #dddddd); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd)); - background-image: -webkit-linear-gradient(top, #eeeeee, #dddddd); - background-image: -o-linear-gradient(top, #eeeeee, #dddddd); - background-image: linear-gradient(top, #eeeeee, #dddddd); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0); - -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); -} -.dropdown.open .dropdown-toggle { - color: #ffffff; - background: #ccc; - background: rgba(0, 0, 0, 0.3); -} -.dropdown.open .dropdown-menu { - display: block; -} .hero-unit { padding: 60px; margin-bottom: 30px; -- cgit v1.2.3 From 324246e4f964437a2dfa7efbd2d1b6b039369b2c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 12:39:39 -0600 Subject: remove negative margin from .brand in docs, update navbar to support buttons up thurr --- bootstrap.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index ff21bc836..105c10de3 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 Dec 26 17:12:29 CST 2011 + * Date: Tue Dec 27 12:39:01 CST 2011 */ html, body { margin: 0; @@ -1215,6 +1215,9 @@ table { color: #ffffff; background-color: transparent; } +.navbar .btn { + margin-top: 5px; +} .navbar-search { position: relative; float: left; -- cgit v1.2.3 From fec02f50455c87f0e01fe74b1fb2e3cd032ade09 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 15:40:58 -0600 Subject: clean up some css for github issues: input prepend z-index, modals revamped for responsive --- bootstrap.css | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 105c10de3..95dde47e8 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 Dec 27 12:39:01 CST 2011 + * Date: Tue Dec 27 15:23:07 CST 2011 */ html, body { margin: 0; @@ -602,6 +602,7 @@ select, input[type=file] { } select { background-color: #ffffff; + vertical-align: middle; } select[multiple] { height: inherit; @@ -904,17 +905,12 @@ textarea[readonly] { display: block; max-width: 600px; } -.input-prepend, .input-append { - overflow: hidden; -} .input-prepend input, .input-append input { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } .input-prepend .add-on, .input-append .add-on { - position: relative; - z-index: 2; float: left; display: block; width: auto; @@ -2574,6 +2570,16 @@ a.thumbnail:hover { .horizontal-form .form-actions { padding-left: 0; } + .modal { + position: fixed; + top: 20px; + left: 20px; + right: 20px; + width: auto; + } + .modal .close { + padding: 10px; + } } @media (max-width: 768px) { .container { -- cgit v1.2.3 From 3426877c894b858d89e68c72bc300cd4f670c40f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 15:51:36 -0600 Subject: add ie7 inline block mixin and add ability to center pagination --- bootstrap.css | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 95dde47e8..51341e902 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 Dec 27 15:23:07 CST 2011 + * Date: Tue Dec 27 15:49:07 CST 2011 */ html, body { margin: 0; @@ -2211,7 +2211,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { margin: 18px 0; } .pagination ul { - float: left; + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; margin: 0; border: 1px solid #ddd; border: 1px solid rgba(0, 0, 0, 0.15); @@ -2247,6 +2251,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .pagination .next a { border: 0; } +.pagination.centered { + text-align: center; +} .modal-backdrop { position: fixed; top: 0; -- cgit v1.2.3 From 46d2ad5e221646807fb2bd71881860462988008e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 16:08:07 -0600 Subject: allow select with size attr to not have fixed height --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 51341e902..a1fcc1df6 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 Dec 27 15:49:07 CST 2011 + * Date: Tue Dec 27 16:07:55 CST 2011 */ html, body { margin: 0; @@ -604,7 +604,7 @@ select { background-color: #ffffff; vertical-align: middle; } -select[multiple] { +select[multiple], select[size] { height: inherit; } input[type=image] { -- cgit v1.2.3 From e78d5f8ff33009e4c4ab57496913b43ff1e369dc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 16:25:22 -0600 Subject: fix tables for rowspan --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index a1fcc1df6..2b870bfce 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 Dec 27 16:07:55 CST 2011 + * Date: Tue Dec 27 16:25:12 CST 2011 */ html, body { margin: 0; -- cgit v1.2.3 From 53c6dbff0d6dd781df421f07acdd9e98719b41bf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 17:04:55 -0600 Subject: add appended input example to docs, fix help-text wrapping issue by clearing float --- bootstrap.css | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 2b870bfce..e83f46258 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 Dec 27 16:25:12 CST 2011 + * Date: Tue Dec 27 17:02:48 CST 2011 */ html, body { margin: 0; @@ -491,7 +491,7 @@ address { } code, pre { padding: 0 3px 2px; - font-family: "Menlo", Monaco, Courier New, monospace; + font-family: Menlo, Monaco, Courier New, monospace; font-size: 12px; color: #404040; -webkit-border-radius: 3px; @@ -905,6 +905,21 @@ textarea[readonly] { display: block; max-width: 600px; } +.input-prepend, .input-append { + zoom: 1; +} +.input-prepend:before, +.input-append:before, +.input-prepend:after, +.input-append:after { + display: table; + *display: inline; + content: ""; + zoom: 1; +} +.input-prepend:after, .input-append:after { + clear: both; +} .input-prepend input, .input-append input { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; @@ -985,7 +1000,7 @@ th, td { padding: 8px; line-height: 18px; text-align: left; - border-bottom: 1px solid #ddd; + border-top: 1px solid #ddd; } th { font-weight: bold; @@ -994,9 +1009,6 @@ th { td { vertical-align: top; } -tbody tr:last-child th, tbody tr:last-child td { - border-bottom: 0; -} .condensed-table th, .condensed-table td { padding: 4px 5px; } -- cgit v1.2.3 From 704d713aadbfcd27e39226cb0d1b2243d52dde0a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 17:39:34 -0600 Subject: border radius on large button toolbar --- bootstrap.css | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index e83f46258..1d0a29b51 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 Dec 27 17:02:48 CST 2011 + * Date: Tue Dec 27 17:38:27 CST 2011 */ html, body { margin: 0; @@ -1628,6 +1628,23 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-border-radius-bottomright: 4px; border-bottom-right-radius: 4px; } +.btn-group .btn.large:first-child { + margin-left: 0; + -webkit-border-top-left-radius: 6px; + -moz-border-radius-topleft: 6px; + border-top-left-radius: 6px; + -webkit-border-bottom-left-radius: 6px; + -moz-border-radius-bottomleft: 6px; + border-bottom-left-radius: 6px; +} +.btn-group .btn.large:last-child { + -webkit-border-top-right-radius: 6px; + -moz-border-radius-topright: 6px; + border-top-right-radius: 6px; + -webkit-border-bottom-right-radius: 6px; + -moz-border-radius-bottomright: 6px; + border-bottom-right-radius: 6px; +} .btn-group .btn:hover, .btn-group .btn:focus, .btn-group .btn:active { z-index: 2; } -- cgit v1.2.3 From 553030ca7de8dac3c5180629ff84fa14173513ab Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 30 Dec 2011 16:01:29 -0800 Subject: missing parantheses --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 1d0a29b51..8e2ce41f3 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 Dec 27 17:38:27 CST 2011 + * Date: Fri Dec 30 16:01:05 PST 2011 */ html, body { margin: 0; -- cgit v1.2.3 From 2d092dfeea969d82bc55a153c6a597a3e87a0a03 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 2 Jan 2012 16:04:01 -0800 Subject: start playing with carousel stuff --- bootstrap.css | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 333d6f04c..d906168cf 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 Dec 24 22:30:43 PST 2011 + * Date: Sun Dec 25 21:24:32 PST 2011 */ html, body { margin: 0; @@ -2385,6 +2385,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { top: 50%; left: 50%; z-index: 11000; + max-height: 500px; + overflow: auto; width: 560px; margin: -250px 0 0 -250px; background-color: #ffffff; @@ -2662,6 +2664,12 @@ a.thumbnail:hover { .thumbnail .caption { padding: 9px; } +.carousel .item { + display: none; +} +.carousel .active { + display: block; +} .hidden { display: none; visibility: hidden; -- cgit v1.2.3 From 8b58a1c3d9fea740c89f48c1771a6c7dd44e1f41 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 2 Jan 2012 19:13:02 -0800 Subject: placeholder design for carousel --- bootstrap.css | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 601c1875b..ae1754aa6 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 Jan 2 16:04:30 PST 2012 + * Date: Mon Jan 2 19:12:52 PST 2012 */ html, body { margin: 0; @@ -491,7 +491,7 @@ address { } code, pre { padding: 0 3px 2px; - font-family: Menlo, Monaco, Courier New, monospace; + font-family: Menlo, Monaco, "Courier New", monospace; font-size: 12px; color: #404040; -webkit-border-radius: 3px; @@ -2584,12 +2584,36 @@ a.thumbnail:hover { .thumbnail .caption { padding: 9px; } +.carousel { + position: relative; +} .carousel .item { display: none; } .carousel .active { display: block; } +.carousel .nav { + height: 50px; + position: absolute; + top: 50%; + margin: -25px 0 0; + cursor: pointer; + background: rgba(0, 0, 0, 0.7); + color: white; + font-size: 42px; + left: 5px; + font-weight: 100; + padding: 0 15px; +} +.carousel .nav.right { + right: 5px; + left: auto; +} +.carousel .nav:hover { + text-decoration: none; + background: rgba(0, 0, 0, 0.8); +} .hidden { display: none; visibility: hidden; -- cgit v1.2.3 From 3fb6f6ee8670acff0c681c621b87a06a087f94be Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 2 Jan 2012 22:30:57 -0800 Subject: basic carousel implementation --- bootstrap.css | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index ae1754aa6..b4fd7e748 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 Jan 2 19:12:52 PST 2012 + * Date: Mon Jan 2 22:30:09 PST 2012 */ html, body { margin: 0; @@ -2587,13 +2587,48 @@ a.thumbnail:hover { .carousel { position: relative; } +.carousel .carousel-inner { + overflow: hidden; + width: 100%; + position: relative; +} .carousel .item { display: none; + position: relative; + -webkit-transition: 0.25s linear left; + -moz-transition: 0.25s linear left; + -ms-transition: 0.25s linear left; + -o-transition: 0.25s linear left; + transition: 0.25s linear left; } -.carousel .active { +.carousel .active, .carousel .next, .carousel .prev { display: block; } +.carousel .next, .carousel .prev { + position: absolute; + top: 0; + width: 100%; +} +.carousel .next { + left: 100%; +} +.carousel .prev { + left: -100%; +} +.carousel .next.left, .carousel .prev.right { + left: 0%; +} +.carousel .active.left { + left: -100%; +} +.carousel .active.right { + left: 100%; +} .carousel .nav { + width: auto; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; height: 50px; position: absolute; top: 50%; -- cgit v1.2.3 From f5bcfaec2c13eb3102ffc2890a69a7c2b725ff36 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 2 Jan 2012 22:33:49 -0800 Subject: ease-in-out slide transition --- bootstrap.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index b4fd7e748..5413144e9 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 Jan 2 22:30:09 PST 2012 + * Date: Mon Jan 2 22:33:44 PST 2012 */ html, body { margin: 0; @@ -2595,11 +2595,11 @@ a.thumbnail:hover { .carousel .item { display: none; position: relative; - -webkit-transition: 0.25s linear left; - -moz-transition: 0.25s linear left; - -ms-transition: 0.25s linear left; - -o-transition: 0.25s linear left; - transition: 0.25s linear left; + -webkit-transition: 0.6s ease-in-out left; + -moz-transition: 0.6s ease-in-out left; + -ms-transition: 0.6s ease-in-out left; + -o-transition: 0.6s ease-in-out left; + transition: 0.6s ease-in-out left; } .carousel .active, .carousel .next, .carousel .prev { display: block; -- cgit v1.2.3 From fb9401b355366452d310d39f51224999da4daa82 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 01:34:14 -0800 Subject: tweaks abound, updated prettify styles, new sidenav component started, sprite icons started --- bootstrap.css | 330 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 328 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 8e2ce41f3..ade32d9ba 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: Fri Dec 30 16:01:05 PST 2011 + * Date: Thu Jan 5 01:33:17 PST 2012 */ html, body { margin: 0; @@ -401,7 +401,7 @@ h6 { text-transform: uppercase; } ul, ol { - margin: 0 0 9px 25px; + margin: 13px 0 14px 25px; } ul ul, ul ol, @@ -1025,6 +1025,9 @@ td { .bordered-table td + th { border-left: 1px solid #ddd; } +.bordered-table thead:first-child tr:first-child th, .bordered-table tbody:first-child tr:first-child td { + border-top: 0; +} .bordered-table thead:first-child tr:first-child th:first-child, .bordered-table tbody:first-child tr:first-child td:first-child { -webkit-border-radius: 4px 0 0 0; -moz-border-radius: 4px 0 0 0; @@ -1820,6 +1823,285 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .label.notice { background-color: #62cffc; } +i { + background-image: url(docs/assets/img/glyphicons-halflings-sprite.png); + background-position: 0 0; + background-repeat: no-repeat; + display: inline-block; + vertical-align: text-top; + width: 14px; + height: 14px; +} +.glass { + background-position: 0 0; +} +.music { + background-position: -24px 0; +} +.search { + background-position: -48px 0; +} +.envelope { + background-position: -72px 0; +} +.heart { + background-position: -96px 0; +} +.star { + background-position: -120px 0; +} +.star-empty { + background-position: -144px 0; +} +.user { + background-position: -168px 0; +} +.film { + background-position: -192px 0; +} +.th-large { + background-position: -216px 0; +} +.th { + background-position: -240px 0; +} +.th-lines { + background-position: -264px 0; +} +.ok { + background-position: -288px 0; +} +.remove { + background-position: -312px 0; +} +.zoom-in { + background-position: -336px 0; +} +.zoom-out { + background-position: -360px 0; +} +.off { + background-position: -384px 0; +} +.signal { + background-position: -408px 0; +} +.cog { + background-position: -432px 0; +} +.trash { + background-position: -456px 0; +} +.home { + background-position: 0 -24px; +} +.file { + background-position: -24px -24px; +} +.time { + background-position: -48px -24px; +} +.road { + background-position: -72px -24px; +} +.download-alt { + background-position: -96px -24px; +} +.download { + background-position: -120px -24px; +} +.upload { + background-position: -144px -24px; +} +.inbox { + background-position: -168px -24px; +} +.play-circle { + background-position: -192px -24px; +} +.repeat { + background-position: -216px -24px; +} +.refresh { + background-position: -240px -24px; +} +.calendar { + background-position: -264px -24px; +} +.lock { + background-position: -288px -24px; +} +.flag { + background-position: -312px -24px; +} +.headphones { + background-position: -336px -24px; +} +.volume-off { + background-position: -360px -24px; +} +.volume-down { + background-position: -384px -24px; +} +.volume-up { + background-position: -408px -24px; +} +.qrcode { + background-position: -432px -24px; +} +.barcode { + background-position: -456px -24px; +} +.tag { + background-position: 0 -48px; +} +.tags { + background-position: -24px -48px; +} +.book { + background-position: -48px -48px; +} +.bookmark { + background-position: -72px -48px; +} +.print { + background-position: -96px -48px; +} +.camera { + background-position: -120px -48px; +} +.font { + background-position: -144px -48px; +} +.bold { + background-position: -168px -48px; +} +.italic { + background-position: -192px -48px; +} +.text-height { + background-position: -216px -48px; +} +.text-width { + background-position: -240px -48px; +} +.align-left { + background-position: -264px -48px; +} +.align-center { + background-position: -288px -48px; +} +.align-right { + background-position: -312px -48px; +} +.align-justify { + background-position: -336px -48px; +} +.list { + background-position: -360px -48px; +} +.indent-left { + background-position: -384px -48px; +} +.indent-right { + background-position: -408px -48px; +} +.facetime-video { + background-position: -432px -48px; +} +.picture { + background-position: -456px -48px; +} +.pencil { + background-position: 0 -72px; +} +.map-marker { + background-position: -24px -72px; +} +.adjust { + background-position: -48px -72px; +} +.tint { + background-position: -72px -72px; +} +.edit { + background-position: -96px -72px; +} +.share { + background-position: -120px -72px; +} +.check { + background-position: -144px -72px; +} +.move { + background-position: -168px -72px; +} +.step-backward { + background-position: -192px -72px; +} +.fast-backward { + background-position: -216px -72px; +} +.backward { + background-position: -240px -72px; +} +.play { + background-position: -264px -72px; +} +.pause { + background-position: -288px -72px; +} +.stop { + background-position: -312px -72px; +} +.forward { + background-position: -336px -72px; +} +.fast-forward { + background-position: -360px -72px; +} +.step-forward { + background-position: -384px -72px; +} +.eject { + background-position: -408px -72px; +} +.chevron-left { + background-position: -432px -72px; +} +.chevron-right { + background-position: -456px -72px; +} +.arrow-left { + background-position: -240px -96px; +} +.arrow-right { + background-position: -264px -96px; +} +.arrow-up { + background-position: -288px -96px; +} +.arrow-down { + background-position: -312px -96px; +} +.share { + background-position: -336px -96px; +} +.resize-full { + background-position: -360px -96px; +} +.resize-small { + background-position: -384px -96px; +} +.plus { + background-position: -408px -96px; +} +.minus { + background-position: -432px -96px; +} +.asterisk { + background-position: -456px -96px; +} .dropdown { position: relative; } @@ -2538,6 +2820,50 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .popover .content p, .popover .content ul, .popover .content ol { margin-bottom: 0; } +.side-nav { + padding: 9px 0; +} +.side-nav .nav-label, .side-nav .nav-item { + display: block; + padding: 3px 16px; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); +} +.side-nav .nav-label { + font-size: 11px; + line-height: 18px; + color: #404040; + text-transform: uppercase; +} +.side-nav .nav-group { + margin: 0 -1px; + list-style: none; +} +.side-nav .nav-item { + font-weight: bold; +} +.side-nav .nav-item i { + vertical-align: -2px; +} +.side-nav .nav-item:hover { + text-decoration: none; +} +.side-nav .active .nav-item { + color: #fff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); + background-color: #aaaaaa; + background-image: -khtml-gradient(linear, left top, left bottom, from(#cccccc), to(#aaaaaa)); + background-image: -moz-linear-gradient(top, #cccccc, #aaaaaa); + background-image: -ms-linear-gradient(top, #cccccc, #aaaaaa); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #cccccc), color-stop(100%, #aaaaaa)); + background-image: -webkit-linear-gradient(top, #cccccc, #aaaaaa); + background-image: -o-linear-gradient(top, #cccccc, #aaaaaa); + background-image: linear-gradient(top, #cccccc, #aaaaaa); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#aaaaaa', GradientType=0); + -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.05), inset 0 -1px 0 rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.05), inset 0 -1px 0 rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.05), inset 0 -1px 0 rgba(0, 0, 0, 0.05); +} .thumbnails { margin-left: -20px; margin-bottom: 0; -- cgit v1.2.3 From 20add59de3f2b69aaa9c9b325dab20b13c75eaa1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 10:01:42 -0800 Subject: breaking out patterns.less even more, removing unnecessary div from checkbox and radio lists--now just labels and inputs --- bootstrap.css | 2675 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 1319 insertions(+), 1356 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index f9f174c3d..55706e2a3 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: Thu Jan 5 01:36:56 PST 2012 + * Date: Thu Jan 5 10:00:31 PST 2012 */ html, body { margin: 0; @@ -175,7 +175,7 @@ body { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; line-height: 18px; - color: #404040; + color: #555555; background-color: #ffffff; } .container { @@ -228,11 +228,11 @@ body { a { font-weight: inherit; line-height: inherit; - color: #0069d6; + color: #0088cc; text-decoration: none; } a:hover { - color: #00438a; + color: #005580; text-decoration: underline; } .pull-right { @@ -342,7 +342,7 @@ p { } p small { font-size: 11px; - color: #bfbfbf; + color: #999999; } h1, h2, @@ -351,7 +351,7 @@ h4, h5, h6 { font-weight: bold; - color: #404040; + color: #333333; text-rendering: optimizelegibility; } h1 small, @@ -360,7 +360,7 @@ h3 small, h4 small, h5 small, h6 small { - color: #bfbfbf; + color: #999999; } h1 { font-size: 30px; @@ -397,7 +397,7 @@ h5 { h6 { font-size: 13px; line-height: 18px; - color: #bfbfbf; + color: #999999; text-transform: uppercase; } ul, ol { @@ -417,7 +417,7 @@ ol { } li { line-height: 18px; - color: #404040; + color: #333333; } ul.unstyled { margin-left: 0; @@ -451,7 +451,7 @@ em { line-height: inherit; } .muted { - color: #bfbfbf; + color: #999999; } abbr { font-size: 90%; @@ -473,7 +473,7 @@ blockquote p { blockquote small { display: block; line-height: 18px; - color: #bfbfbf; + color: #999999; } blockquote small:before { content: '\2014 \00A0'; @@ -493,7 +493,7 @@ code, pre { padding: 0 3px 2px; font-family: Menlo, Monaco, "Courier New", monospace; font-size: 12px; - color: #404040; + color: #333333; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; @@ -534,7 +534,7 @@ legend { margin-bottom: 27px; font-size: 19.5px; line-height: 36px; - color: #404040; + color: #333333; border-bottom: 1px solid #eee; } label, @@ -549,7 +549,7 @@ textarea { label { display: block; margin-bottom: 5px; - color: #404040; + color: #333333; } input, textarea, @@ -561,7 +561,7 @@ select, padding: 4px; font-size: 13px; line-height: 18px; - color: #808080; + color: #555555; border: 1px solid #ccc; -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -881,15 +881,15 @@ textarea[readonly] { cursor: not-allowed; } :-moz-placeholder { - color: #bfbfbf; + color: #999999; } ::-webkit-input-placeholder { - color: #bfbfbf; + color: #999999; } .help-text { margin-top: 5px; margin-bottom: 0; - color: #bfbfbf; + color: #999999; } .help-inline { *position: relative; @@ -935,7 +935,7 @@ textarea[readonly] { padding: 4px 4px 4px 5px; font-weight: normal; line-height: 18px; - color: #bfbfbf; + color: #999999; text-align: center; text-shadow: 0 1px 0 #ffffff; background-color: #f5f5f5; @@ -986,7 +986,7 @@ textarea[readonly] { .horizontal-form .controls { margin-left: 150px; } -.horizontal-form .control-list { +.horizontal-form .controls > .radio:first-child, .horizontal-form .controls > .checkbox:first-child { padding-top: 6px; } .horizontal-form .form-actions { @@ -1183,580 +1183,382 @@ table { background-color: lighten(@purple, 40%); } }*/ -.navbar { - overflow: visible; +i { + background-image: url(docs/assets/img/glyphicons-halflings-sprite.png); + background-position: 0 0; + background-repeat: no-repeat; + display: inline-block; + vertical-align: text-top; + width: 14px; + height: 14px; } -.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); +.glass { + background-position: 0 0; } -.navbar .brand a:hover, .navbar ul .active > a { - color: #ffffff; - text-decoration: none; - background-color: #333333; - background-color: rgba(255, 255, 255, 0.05); +.music { + background-position: -24px 0; } -.navbar .brand { - float: left; - display: block; - padding: 8px 20px 12px; - margin-left: -20px; - font-size: 20px; - font-weight: 200; - line-height: 1; - color: #ffffff; +.search { + background-position: -48px 0; } -.navbar p { - margin: 0; - line-height: 40px; +.envelope { + background-position: -72px 0; } -.navbar p a:hover { - color: #ffffff; - background-color: transparent; +.heart { + background-position: -96px 0; } -.navbar .btn { - margin-top: 5px; +.star { + background-position: -120px 0; } -.navbar-search { - position: relative; - float: left; - margin-top: 6px; - margin-bottom: 0; +.star-empty { + background-position: -144px 0; } -.navbar-search .search-query { - padding: 4px 9px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: normal; - line-height: 1; - color: #ffffff; - color: rgba(255, 255, 255, 0.75); - background-color: #444; - background-color: rgba(255, 255, 255, 0.3); - border: 1px solid #111; - -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; +.user { + background-position: -168px 0; } -.navbar-search .search-query:-moz-placeholder { - color: #e6e6e6; +.film { + background-position: -192px 0; } -.navbar-search .search-query::-webkit-input-placeholder { - color: #e6e6e6; +.th-large { + background-position: -216px 0; } -.navbar-search .search-query:hover { - color: #ffffff; - background-color: #bfbfbf; - background-color: rgba(255, 255, 255, 0.5); +.th { + background-position: -240px 0; } -.navbar-search .search-query:focus, .navbar-search .search-query.focused { - padding: 5px 10px; - color: #404040; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - outline: 0; +.th-lines { + background-position: -264px 0; } -.navbar-static { - margin-bottom: 18px; +.ok { + background-position: -288px 0; } -.navbar-static .navbar-inner { - padding-left: 20px; - padding-right: 20px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; +.remove { + background-position: -312px 0; } -.navbar-fixed { - position: fixed; - top: 0; - right: 0; - left: 0; - z-index: 10000; +.zoom-in { + background-position: -336px 0; } -.nav { - position: relative; - left: 0; - display: block; - float: left; - margin: 0 10px 0 0; +.zoom-out { + background-position: -360px 0; } -.nav > li { - display: block; - float: left; +.off { + background-position: -384px 0; } -.nav a { - display: block; - float: none; - padding: 10px 10px 11px; - line-height: 19px; - color: #bfbfbf; - text-decoration: none; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +.signal { + background-position: -408px 0; } -.nav a:hover { - color: #ffffff; - text-decoration: none; +.cog { + background-position: -432px 0; } -.nav .active > a { - background-color: #222; - background-color: rgba(0, 0, 0, 0.5); +.trash { + background-position: -456px 0; } -.nav .divider { - height: 40px; - width: 1px; - margin: 0 5px; - overflow: hidden; - background-color: #222; - border-right: 1px solid #444; +.home { + background-position: 0 -24px; } -.nav.secondary-nav { - float: right; - margin-left: 10px; - margin-right: 0; +.file { + background-position: -24px -24px; } -.nav.secondary-nav .dropdown-menu { - right: 0; - border: 0; +.time { + background-position: -48px -24px; } -.nav .dropdown-toggle:hover, .nav .dropdown.open .dropdown-toggle { - background: #444; - background: rgba(255, 255, 255, 0.05); +.road { + background-position: -72px -24px; } -.nav .dropdown-menu { - background-color: #333; +.download-alt { + background-position: -96px -24px; } -.nav .dropdown-menu .dropdown-toggle { - color: #ffffff; +.download { + background-position: -120px -24px; } -.nav .dropdown-menu .dropdown-toggle.open { - background: #444; - background: rgba(255, 255, 255, 0.05); +.upload { + background-position: -144px -24px; } -.nav .dropdown-menu li a { - color: #999; - text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); +.inbox { + background-position: -168px -24px; } -.nav .dropdown-menu li a:hover { - background-color: #191919; - background-image: -khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919)); - background-image: -moz-linear-gradient(top, #292929, #191919); - background-image: -ms-linear-gradient(top, #292929, #191919); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919)); - background-image: -webkit-linear-gradient(top, #292929, #191919); - background-image: -o-linear-gradient(top, #292929, #191919); - background-image: linear-gradient(top, #292929, #191919); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#292929', endColorstr='#191919', GradientType=0); - color: #ffffff; +.play-circle { + background-position: -192px -24px; } -.nav .dropdown-menu .active a { - color: #ffffff; +.repeat { + background-position: -216px -24px; } -.nav .dropdown-menu .divider { - background-color: #222; - border-color: #444; +.refresh { + background-position: -240px -24px; } -.topbar ul .dropdown-menu li a { - padding: 4px 15px; +.calendar { + background-position: -264px -24px; } -.hero-unit { - padding: 60px; - margin-bottom: 30px; - background-color: #f5f5f5; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; +.lock { + background-position: -288px -24px; } -.hero-unit h1 { - margin-bottom: 0; - font-size: 60px; - line-height: 1; - letter-spacing: -1px; +.flag { + background-position: -312px -24px; } -.hero-unit p { - font-size: 18px; - font-weight: 200; - line-height: 27px; +.headphones { + background-position: -336px -24px; } -footer { - padding-top: 17px; - margin-top: 17px; - border-top: 1px solid #eee; +.volume-off { + background-position: -360px -24px; } -.page-header { - 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); +.volume-down { + background-position: -384px -24px; } -.page-header h1 { - margin-bottom: 13.5px; +.volume-up { + background-position: -408px -24px; } -.btn.danger, -.alert-message.danger, -.btn.danger:hover, -.alert-message.danger:hover, -.btn.error, -.alert-message.error, -.btn.error:hover, -.alert-message.error:hover, -.btn.success, -.alert-message.success, -.btn.success:hover, -.alert-message.success:hover, -.btn.info, -.alert-message.info, -.btn.info:hover, -.alert-message.info:hover { - color: #ffffff; -} -.btn.danger, -.alert-message.danger, -.btn.error, -.alert-message.error { - background-color: #c43c35; - background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35)); - background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(top, #ee5f5b, #c43c35); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); - border-color: #c43c35 #c43c35 #882a25; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +.qrcode { + background-position: -432px -24px; } -.btn.success, .alert-message.success { - background-color: #57a957; - background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); - background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); - background-image: -webkit-linear-gradient(top, #62c462, #57a957); - background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); - border-color: #57a957 #57a957 #3d773d; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +.barcode { + background-position: -456px -24px; } -.btn.info, .alert-message.info { - background-color: #339bb9; - background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); - background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9)); - background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); - background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(top, #5bc0de, #339bb9); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); - border-color: #339bb9 #339bb9 #22697d; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +.tag { + background-position: 0 -48px; } -.btn { - display: inline-block; - padding: 5px 14px 6px; - font-size: 13px; - line-height: normal; - color: #333; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - background-color: #e6e6e6; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); - background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-repeat: no-repeat; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); - border: 1px solid #ccc; - border-bottom-color: #bbb; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -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); - cursor: pointer; - -webkit-transition: 0.1s linear all; - -moz-transition: 0.1s linear all; - -ms-transition: 0.1s linear all; - -o-transition: 0.1s linear all; - transition: 0.1s linear all; +.tags { + background-position: -24px -48px; } -.btn:hover { - color: #404040; - text-decoration: none; - background-position: 0 -15px; +.book { + background-position: -48px -48px; } -.btn:focus { - outline: 1px dotted #666; +.bookmark { + background-position: -72px -48px; } -.btn.primary { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0064cd; - background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd)); - background-image: -moz-linear-gradient(top, #049cdb, #0064cd); - background-image: -ms-linear-gradient(top, #049cdb, #0064cd); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd)); - background-image: -webkit-linear-gradient(top, #049cdb, #0064cd); - background-image: -o-linear-gradient(top, #049cdb, #0064cd); - background-image: linear-gradient(top, #049cdb, #0064cd); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0); - border-color: #0064cd #0064cd #003f81; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +.print { + background-position: -96px -48px; } -.btn.active, .btn:active { - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); +.camera { + background-position: -120px -48px; } -.btn.disabled { - cursor: default; - background-image: none; - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - filter: alpha(opacity=65); - -moz-opacity: 0.65; - opacity: 0.65; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; +.font { + background-position: -144px -48px; } -.btn[disabled] { - cursor: default; - background-image: none; - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - filter: alpha(opacity=65); - -moz-opacity: 0.65; - opacity: 0.65; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; +.bold { + background-position: -168px -48px; } -.btn.large { - padding: 9px 14px 9px; - font-size: 15px; - line-height: normal; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; +.italic { + background-position: -192px -48px; } -.btn.small { - padding: 7px 9px 7px; - font-size: 11px; +.text-height { + background-position: -216px -48px; } -:root .alert-message, :root .btn { - border-radius: 0 \0; +.text-width { + background-position: -240px -48px; } -button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { - padding: 0; - border: 0; +.align-left { + background-position: -264px -48px; } -.btn-toolbar { - zoom: 1; +.align-center { + background-position: -288px -48px; } -.btn-toolbar:before, .btn-toolbar:after { - display: table; - *display: inline; - content: ""; - zoom: 1; +.align-right { + background-position: -312px -48px; } -.btn-toolbar:after { - clear: both; +.align-justify { + background-position: -336px -48px; } -.btn-toolbar .btn-group { - float: left; - margin-right: 10px; +.list { + background-position: -360px -48px; } -.btn-group { - zoom: 1; +.indent-left { + background-position: -384px -48px; } -.btn-group:before, .btn-group:after { - display: table; - *display: inline; - content: ""; - zoom: 1; +.indent-right { + background-position: -408px -48px; } -.btn-group:after { - clear: both; +.facetime-video { + background-position: -432px -48px; } -.btn-group .btn { - position: relative; - float: left; - margin-left: -1px; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; +.picture { + background-position: -456px -48px; } -.btn-group .btn:first-child { - margin-left: 0; - -webkit-border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; - border-top-left-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - border-bottom-left-radius: 4px; +.pencil { + background-position: 0 -72px; } -.btn-group .btn:last-child { - -webkit-border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; - border-bottom-right-radius: 4px; +.map-marker { + background-position: -24px -72px; } -.btn-group .btn.large:first-child { - margin-left: 0; - -webkit-border-top-left-radius: 6px; - -moz-border-radius-topleft: 6px; - border-top-left-radius: 6px; - -webkit-border-bottom-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - border-bottom-left-radius: 6px; +.adjust { + background-position: -48px -72px; } -.btn-group .btn.large:last-child { - -webkit-border-top-right-radius: 6px; - -moz-border-radius-topright: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - -moz-border-radius-bottomright: 6px; - border-bottom-right-radius: 6px; +.tint { + background-position: -72px -72px; } -.btn-group .btn:hover, .btn-group .btn:focus, .btn-group .btn:active { - z-index: 2; +.edit { + background-position: -96px -72px; } -.close { - float: right; - font-size: 20px; - font-weight: bold; - line-height: 13.5px; - color: #000000; - text-shadow: 0 1px 0 #ffffff; - filter: alpha(opacity=20); - -moz-opacity: 0.2; - opacity: 0.2; +.share { + background-position: -120px -72px; } -.close:hover { - color: #000000; - text-decoration: none; - filter: alpha(opacity=40); - -moz-opacity: 0.4; - opacity: 0.4; +.check { + background-position: -144px -72px; } -.alert-message { - position: relative; - padding: 7px 15px; - margin-bottom: 18px; - color: #404040; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - background-color: #eedc94; - background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94)); - background-image: -moz-linear-gradient(top, #fceec1, #eedc94); - background-image: -ms-linear-gradient(top, #fceec1, #eedc94); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94)); - background-image: -webkit-linear-gradient(top, #fceec1, #eedc94); - background-image: -o-linear-gradient(top, #fceec1, #eedc94); - background-image: linear-gradient(top, #fceec1, #eedc94); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0); - border-color: #eedc94 #eedc94 #e4c652; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - border-width: 1px; - border-style: solid; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -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); +.move { + background-position: -168px -72px; } -.alert-message .close { - *margin-top: 3px; - /* IE7 spacing */ - +.step-backward { + background-position: -192px -72px; } -.alert-message h5 { - line-height: 18px; +.fast-backward { + background-position: -216px -72px; } -.alert-message p { - margin-bottom: 0; +.backward { + background-position: -240px -72px; } -.alert-message div { - margin-top: 5px; - margin-bottom: 2px; - line-height: 28px; +.play { + background-position: -264px -72px; } -.alert-message .btn { - -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); - -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); - box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); +.pause { + background-position: -288px -72px; } -.alert-message.error, .alert-message.success, .alert-message.info { - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +.stop { + background-position: -312px -72px; } -.alert-message.block-message { - padding: 14px; - background-image: none; - background-color: #fdf5d9; - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - border-color: #fceec1; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; +.forward { + background-position: -336px -72px; } -.alert-message.block-message ul, .alert-message.block-message p { - margin-right: 30px; +.fast-forward { + background-position: -360px -72px; } -.alert-message.block-message ul { - margin-bottom: 0; +.step-forward { + background-position: -384px -72px; } -.alert-message.block-message li { - color: #404040; +.eject { + background-position: -408px -72px; } -.alert-message.block-message .alert-actions { - margin-top: 5px; +.chevron-left { + background-position: -432px -72px; } -.alert-message.block-message.error, .alert-message.block-message.success, .alert-message.block-message.info { - color: #404040; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); +.chevron-right { + background-position: -456px -72px; } -.alert-message.block-message.error { - background-color: #fddfde; - border-color: #fbc7c6; +.arrow-left { + background-position: -240px -96px; } -.alert-message.block-message.success { - background-color: #d1eed1; - border-color: #bfe7bf; +.arrow-right { + background-position: -264px -96px; } -.alert-message.block-message.info { - background-color: #ddf4fb; - border-color: #c6edf9; +.arrow-up { + background-position: -288px -96px; +} +.arrow-down { + background-position: -312px -96px; +} +.share { + background-position: -336px -96px; +} +.resize-full { + background-position: -360px -96px; +} +.resize-small { + background-position: -384px -96px; +} +.plus { + background-position: -408px -96px; +} +.minus { + background-position: -432px -96px; +} +.asterisk { + background-position: -456px -96px; +} +.dropdown { + position: relative; +} +.dropdown-toggle:after { + display: inline-block; + width: 0; + height: 0; + margin-top: 8px; + margin-left: 6px; + text-indent: -99999px; + vertical-align: top; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid #ffffff; + filter: alpha(opacity=30); + -moz-opacity: 0.3; + opacity: 0.3; + content: "↓"; +} +.dropdown:hover .dropdown-toggle:after { + filter: alpha(opacity=100); + -moz-opacity: 1; + opacity: 1; +} +.dropdown-menu { + position: absolute; + top: 40px; + z-index: 900; + float: left; + display: none; + min-width: 160px; + max-width: 220px; + _width: 160px; + padding: 6px 0; + margin-left: 0; + margin-right: 0; + background-color: #ffffff; + border-color: #999; + border-color: rgba(0, 0, 0, 0.2); + border-style: solid; + border-width: 0 1px 1px; + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; + -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); + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; + zoom: 1; +} +.dropdown-menu li { + float: none; + display: block; + background-color: none; +} +.dropdown-menu .divider { + height: 1px; + margin: 5px 0; + overflow: hidden; + background-color: #eee; + border-bottom: 1px solid #ffffff; +} +.topbar .dropdown-menu a, .dropdown-menu a { + display: block; + padding: 4px 15px; + clear: both; + font-weight: normal; + line-height: 18px; + color: #555555; + text-shadow: 0 1px 0 #ffffff; +} +.topbar .dropdown-menu a:hover, .dropdown-menu a:hover { + color: #333333; + text-decoration: none; + background-color: #dddddd; + background-image: -khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd)); + background-image: -moz-linear-gradient(top, #eeeeee, #dddddd); + background-image: -ms-linear-gradient(top, #eeeeee, #dddddd); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd)); + background-image: -webkit-linear-gradient(top, #eeeeee, #dddddd); + background-image: -o-linear-gradient(top, #eeeeee, #dddddd); + background-image: linear-gradient(top, #eeeeee, #dddddd); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0); + -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); + -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); + box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); +} +.dropdown.open .dropdown-toggle { + color: #ffffff; + background: #ccc; + background: rgba(0, 0, 0, 0.3); +} +.dropdown.open .dropdown-menu { + display: block; } .well { min-height: 20px; @@ -1800,1071 +1602,1209 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .collapse.in { height: auto; } -.label { - padding: 1px 3px 2px; - font-size: 9.75px; +.close { + float: right; + font-size: 20px; font-weight: bold; - color: #ffffff; - text-transform: uppercase; - background-color: #bfbfbf; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -.label.important { - background-color: #c43c35; -} -.label.warning { - background-color: #f89406; -} -.label.success { - background-color: #46a546; + line-height: 13.5px; + color: #000000; + text-shadow: 0 1px 0 #ffffff; + filter: alpha(opacity=20); + -moz-opacity: 0.2; + opacity: 0.2; } -.label.notice { - background-color: #62cffc; +.close:hover { + color: #000000; + text-decoration: none; + filter: alpha(opacity=40); + -moz-opacity: 0.4; + opacity: 0.4; } -i { - background-image: url(docs/assets/img/glyphicons-halflings-sprite.png); - background-position: 0 0; - background-repeat: no-repeat; - display: inline-block; - vertical-align: text-top; - width: 14px; - height: 14px; +.navbar { + overflow: visible; } -.glass { - background-position: 0 0; +.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); } -.music { - background-position: -24px 0; +.navbar .brand a:hover, .navbar ul .active > a { + color: #ffffff; + text-decoration: none; + background-color: #333333; + background-color: rgba(255, 255, 255, 0.05); } -.search { - background-position: -48px 0; +.navbar .brand { + float: left; + display: block; + padding: 8px 20px 12px; + margin-left: -20px; + font-size: 20px; + font-weight: 200; + line-height: 1; + color: #ffffff; } -.envelope { - background-position: -72px 0; +.navbar p { + margin: 0; + line-height: 40px; } -.heart { - background-position: -96px 0; +.navbar p a:hover { + color: #ffffff; + background-color: transparent; } -.star { - background-position: -120px 0; +.navbar .btn { + margin-top: 5px; } -.star-empty { - background-position: -144px 0; +.navbar-search { + position: relative; + float: left; + margin-top: 6px; + margin-bottom: 0; } -.user { - background-position: -168px 0; +.navbar-search .search-query { + padding: 4px 9px; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 13px; + font-weight: normal; + line-height: 1; + color: #ffffff; + color: rgba(255, 255, 255, 0.75); + background-color: #444; + background-color: rgba(255, 255, 255, 0.3); + border: 1px solid #111; + -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; } -.film { - background-position: -192px 0; +.navbar-search .search-query:-moz-placeholder { + color: #eeeeee; } -.th-large { - background-position: -216px 0; +.navbar-search .search-query::-webkit-input-placeholder { + color: #eeeeee; } -.th { - background-position: -240px 0; +.navbar-search .search-query:hover { + color: #ffffff; + background-color: #999999; + background-color: rgba(255, 255, 255, 0.5); } -.th-lines { - background-position: -264px 0; +.navbar-search .search-query:focus, .navbar-search .search-query.focused { + padding: 5px 10px; + color: #333333; + text-shadow: 0 1px 0 #ffffff; + background-color: #ffffff; + border: 0; + -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + outline: 0; } -.ok { - background-position: -288px 0; +.navbar-static { + margin-bottom: 18px; } -.remove { - background-position: -312px 0; +.navbar-static .navbar-inner { + padding-left: 20px; + padding-right: 20px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } -.zoom-in { - background-position: -336px 0; +.navbar-fixed { + position: fixed; + top: 0; + right: 0; + left: 0; + z-index: 10000; } -.zoom-out { - background-position: -360px 0; +.nav { + position: relative; + left: 0; + display: block; + float: left; + margin: 0 10px 0 0; } -.off { - background-position: -384px 0; +.nav > li { + display: block; + float: left; } -.signal { - background-position: -408px 0; +.nav a { + display: block; + float: none; + padding: 10px 10px 11px; + line-height: 19px; + color: #999999; + text-decoration: none; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } -.cog { - background-position: -432px 0; +.nav a:hover { + color: #ffffff; + text-decoration: none; } -.trash { - background-position: -456px 0; +.nav .active > a { + background-color: #222; + background-color: rgba(0, 0, 0, 0.5); } -.home { - background-position: 0 -24px; +.nav .divider { + height: 40px; + width: 1px; + margin: 0 5px; + overflow: hidden; + background-color: #222; + border-right: 1px solid #444; } -.file { - background-position: -24px -24px; +.nav.secondary-nav { + float: right; + margin-left: 10px; + margin-right: 0; } -.time { - background-position: -48px -24px; +.nav.secondary-nav .dropdown-menu { + right: 0; + border: 0; } -.road { - background-position: -72px -24px; +.nav .dropdown-toggle:hover, .nav .dropdown.open .dropdown-toggle { + background: #444; + background: rgba(255, 255, 255, 0.05); } -.download-alt { - background-position: -96px -24px; +.nav .dropdown-menu { + background-color: #333; } -.download { - background-position: -120px -24px; +.nav .dropdown-menu .dropdown-toggle { + color: #ffffff; } -.upload { - background-position: -144px -24px; +.nav .dropdown-menu .dropdown-toggle.open { + background: #444; + background: rgba(255, 255, 255, 0.05); } -.inbox { - background-position: -168px -24px; +.nav .dropdown-menu li a { + color: #999; + text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); } -.play-circle { - background-position: -192px -24px; +.nav .dropdown-menu li a:hover { + background-color: #191919; + background-image: -khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919)); + background-image: -moz-linear-gradient(top, #292929, #191919); + background-image: -ms-linear-gradient(top, #292929, #191919); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919)); + background-image: -webkit-linear-gradient(top, #292929, #191919); + background-image: -o-linear-gradient(top, #292929, #191919); + background-image: linear-gradient(top, #292929, #191919); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#292929', endColorstr='#191919', GradientType=0); + color: #ffffff; } -.repeat { - background-position: -216px -24px; +.nav .dropdown-menu .active a { + color: #ffffff; } -.refresh { - background-position: -240px -24px; +.nav .dropdown-menu .divider { + background-color: #222; + border-color: #444; } -.calendar { - background-position: -264px -24px; +.tabs, .pills { + padding: 0; + margin: 0 0 20px; + list-style: none; + zoom: 1; } -.lock { - background-position: -288px -24px; +.tabs:before, +.pills:before, +.tabs:after, +.pills:after { + display: table; + *display: inline; + content: ""; + zoom: 1; } -.flag { - background-position: -312px -24px; +.tabs:after, .pills:after { + clear: both; } -.headphones { - background-position: -336px -24px; +.tabs > li, .pills > li { + float: left; } -.volume-off { - background-position: -360px -24px; +.tabs > li > a, .pills > li > a { + display: block; } -.volume-down { - background-position: -384px -24px; +.tabs { + border-color: #ddd; + border-style: solid; + border-width: 0 0 1px; } -.volume-up { - background-position: -408px -24px; +.tabs > li { + position: relative; + margin-bottom: -1px; } -.qrcode { - background-position: -432px -24px; +.tabs > li > a { + padding: 0 15px; + margin-right: 2px; + line-height: 36px; + border: 1px solid transparent; + -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; } -.barcode { - background-position: -456px -24px; +.tabs > li > a:hover { + text-decoration: none; + background-color: #eee; + border-color: #eee #eee #ddd; } -.tag { - background-position: 0 -48px; +.tabs .active > a, .tabs .active > a:hover { + color: #555555; + background-color: #ffffff; + border: 1px solid #ddd; + border-bottom-color: transparent; + cursor: default; } -.tags { - background-position: -24px -48px; +.tabbable { + margin-bottom: 18px; } -.book { - background-position: -48px -48px; +.tabbable .tabs { + margin-bottom: 0; + border-bottom: 0; } -.bookmark { - background-position: -72px -48px; +.tabbable .tab-content { + padding: 19px; + border: 1px solid #ddd; } -.print { - background-position: -96px -48px; +.tabbable.tabs-bottom .tabs > li { + margin-top: -1px; + margin-bottom: 0; } -.camera { - background-position: -120px -48px; +.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; } -.font { - background-position: -144px -48px; +.tabbable.tabs-bottom .tabs > li > a:hover { + border-bottom-color: transparent; + border-top-color: #ddd; } -.bold { - background-position: -168px -48px; +.tabbable.tabs-bottom .tabs > .active > a, .tabbable.tabs-bottom .tabs > .active > a:hover { + border-color: transparent #ddd #ddd #ddd; } -.italic { - background-position: -192px -48px; +.tabbable.tabs-left, .tabbable.tabs-right { + zoom: 1; } -.text-height { - background-position: -216px -48px; +.tabbable.tabs-left:before, +.tabbable.tabs-right:before, +.tabbable.tabs-left:after, +.tabbable.tabs-right:after { + display: table; + *display: inline; + content: ""; + zoom: 1; } -.text-width { - background-position: -240px -48px; +.tabbable.tabs-left:after, .tabbable.tabs-right:after { + clear: both; } -.align-left { - background-position: -264px -48px; +.tabbable.tabs-left .tabs, .tabbable.tabs-right .tabs { + width: 100px; } -.align-center { - background-position: -288px -48px; +.tabbable.tabs-left .tabs > li, .tabbable.tabs-right .tabs > li { + float: none; + margin-bottom: -1px; } -.align-right { - background-position: -312px -48px; +.tabbable.tabs-left .tabs > li > a, .tabbable.tabs-right .tabs > li > a { + margin-bottom: 2px; } -.align-justify { - background-position: -336px -48px; +.tabbable.tabs-left .tabs > li > a:hover, .tabbable.tabs-right .tabs > li > a:hover { + border-color: transparent; } -.list { - background-position: -360px -48px; +.tabbable.tabs-left .tab-content { + margin-left: 100px; } -.indent-left { - background-position: -384px -48px; +.tabbable.tabs-left .tabs { + float: left; } -.indent-right { - background-position: -408px -48px; +.tabbable.tabs-left .tabs > li { + margin-right: -1px; } -.facetime-video { - background-position: -432px -48px; +.tabbable.tabs-left .tabs > li > a { + margin-right: 0; + -webkit-border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; } -.picture { - background-position: -456px -48px; +.tabbable.tabs-left .tabs > li > a:hover { + border-right-color: #ddd; } -.pencil { - background-position: 0 -72px; +.tabbable.tabs-left .tabs .active > a, .tabbable.tabs-left .tabs .active > a:hover { + border-color: #ddd; + border-right-color: transparent; } -.map-marker { - background-position: -24px -72px; +.tabbable.tabs-right .tab-content { + margin-right: 100px; } -.adjust { - background-position: -48px -72px; +.tabbable.tabs-right .tabs { + float: right; } -.tint { - background-position: -72px -72px; +.tabbable.tabs-right .tabs > li { + margin-left: -1px; } -.edit { - background-position: -96px -72px; +.tabbable.tabs-right .tabs > li > a { + margin-left: 0; + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; } -.share { - background-position: -120px -72px; +.tabbable.tabs-right .tabs > li > a:hover { + border-left-color: #ddd; } -.check { - background-position: -144px -72px; +.tabbable.tabs-right .tabs .active > a, .tabbable.tabs-right .tabs .active > a:hover { + border-color: #ddd; + border-left-color: transparent; } -.move { - background-position: -168px -72px; +.tabs .menu-dropdown, .tabs .dropdown-menu { + top: 35px; + border-width: 1px; + -webkit-border-radius: 0 6px 6px 6px; + -moz-border-radius: 0 6px 6px 6px; + border-radius: 0 6px 6px 6px; } -.step-backward { - background-position: -192px -72px; +.tabs a.menu:after, .tabs .dropdown-toggle:after { + border-top-color: #999; + margin-top: 15px; + margin-left: 5px; } -.fast-backward { - background-position: -216px -72px; +.tabs li.open.menu .menu, .tabs .open.dropdown .dropdown-toggle { + border-color: #999; } -.backward { - background-position: -240px -72px; +.tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after { + border-top-color: #555; } -.play { - background-position: -264px -72px; +.pills > li > a { + padding: 0 15px; + margin: 5px 3px 5px 0; + line-height: 30px; + text-shadow: 0 1px 1px #ffffff; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; } -.pause { - background-position: -288px -72px; +.pills > li > a:hover { + color: #ffffff; + text-decoration: none; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); + background-color: #005580; } -.stop { - background-position: -312px -72px; +.pills .active > a { + color: #ffffff; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); + background-color: #0088cc; } -.forward { - background-position: -336px -72px; +.pills-vertical > li { + float: none; } -.fast-forward { - background-position: -360px -72px; +.tab-content > .tab-pane, .pill-content > .pill-pane { + display: none; } -.step-forward { - background-position: -384px -72px; +.tab-content > .active, .pill-content > .active { + display: block; } -.eject { - background-position: -408px -72px; +.step-nav { + position: relative; + margin: 0 0 18px; + list-style: none; + line-height: 30px; + text-align: center; + background-color: #f5f5f5; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; } -.chevron-left { - background-position: -432px -72px; +.step-nav li { + display: inline; + color: #999999; } -.chevron-right { - background-position: -456px -72px; +.step-nav .prev, .step-nav .next { + position: absolute; + top: 6px; } -.arrow-left { - background-position: -240px -96px; -} -.arrow-right { - background-position: -264px -96px; +.step-nav .prev { + left: 15px; } -.arrow-up { - background-position: -288px -96px; +.step-nav .next { + right: 15px; } -.arrow-down { - background-position: -312px -96px; +.step-nav .dot { + display: inline-block; + width: 10px; + height: 10px; + margin: 0 3px; + text-indent: -999em; + background-color: #999999; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25); } -.share { - background-position: -336px -96px; +.step-nav .dot:hover, .step-nav .active .dot { + background-color: #333333; } -.resize-full { - background-position: -360px -96px; +.subnav { + background-color: #eeeeee; + background-image: -khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#eeeeee)); + background-image: -moz-linear-gradient(top, #f5f5f5, #eeeeee); + background-image: -ms-linear-gradient(top, #f5f5f5, #eeeeee); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #eeeeee)); + background-image: -webkit-linear-gradient(top, #f5f5f5, #eeeeee); + background-image: -o-linear-gradient(top, #f5f5f5, #eeeeee); + background-image: linear-gradient(top, #f5f5f5, #eeeeee); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#eeeeee', GradientType=0); + -webkit-box-shadow: inset 0 1px 0 #ffffff, 0 0 5px rgba(0, 0, 0, 0.5); + -moz-box-shadow: inset 0 1px 0 #ffffff, 0 0 5px rgba(0, 0, 0, 0.5); + box-shadow: inset 0 1px 0 #ffffff, 0 0 5px rgba(0, 0, 0, 0.5); } -.resize-small { - background-position: -384px -96px; +.subnav a { + padding: 8px 10px; + font-size: 12px; + color: #0088cc; + text-shadow: 0 1px 0 #fff; + border-left: 1px solid #f9f9f9; + border-right: 1px solid #e5e5e5; } -.plus { - background-position: -408px -96px; +.subnav a:hover { + color: #005580; + background-color: #eee; } -.minus { - background-position: -432px -96px; +.subnav li:first-child a { + border-left: 0; + -webkit-border-radius: 6px 0 0 6px; + -moz-border-radius: 6px 0 0 6px; + border-radius: 6px 0 0 6px; } -.asterisk { - background-position: -456px -96px; +.subnav li:last-child a { + border-right: 0; + -webkit-border-radius: 0 6px 6px 0; + -moz-border-radius: 0 6px 6px 0; + border-radius: 0 6px 6px 0; } -.dropdown { - position: relative; +.subnav ul .active > a { + color: #333333; + background-color: #eee; } -.dropdown-toggle:after { - display: inline-block; - width: 0; - height: 0; - margin-top: 8px; - margin-left: 6px; - text-indent: -99999px; - vertical-align: top; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid #ffffff; - filter: alpha(opacity=30); - -moz-opacity: 0.3; - opacity: 0.3; - content: "↓"; +.side-nav { + padding: 9px 0; } -.dropdown:hover .dropdown-toggle:after { - filter: alpha(opacity=100); - -moz-opacity: 1; - opacity: 1; +.side-nav .nav-label, .side-nav .nav-item { + display: block; + padding: 3px 16px; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); } -.dropdown-menu { - position: absolute; - top: 40px; - z-index: 900; - float: left; - display: none; - min-width: 160px; - max-width: 220px; - _width: 160px; - padding: 6px 0; - margin-left: 0; - margin-right: 0; - background-color: #ffffff; - border-color: #999; - border-color: rgba(0, 0, 0, 0.2); - border-style: solid; - border-width: 0 1px 1px; - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - -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); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; - zoom: 1; +.side-nav .nav-label { + font-size: 11px; + line-height: 18px; + color: #333333; + text-transform: uppercase; } -.dropdown-menu li { - float: none; - display: block; - background-color: none; +.side-nav .nav-group { + margin: 0 -1px; + list-style: none; } -.dropdown-menu .divider { - height: 1px; - margin: 5px 0; - overflow: hidden; - background-color: #eee; - border-bottom: 1px solid #ffffff; +.side-nav .nav-item { + font-weight: bold; } -.topbar .dropdown-menu a, .dropdown-menu a { - display: block; - padding: 4px 15px; - clear: both; - font-weight: normal; - line-height: 18px; - color: #808080; - text-shadow: 0 1px 0 #ffffff; +.side-nav .nav-item i { + vertical-align: -2px; } -.topbar .dropdown-menu a:hover, .dropdown-menu a:hover { - color: #404040; +.side-nav .nav-item:hover { text-decoration: none; - background-color: #dddddd; - background-image: -khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd)); - background-image: -moz-linear-gradient(top, #eeeeee, #dddddd); - background-image: -ms-linear-gradient(top, #eeeeee, #dddddd); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd)); - background-image: -webkit-linear-gradient(top, #eeeeee, #dddddd); - background-image: -o-linear-gradient(top, #eeeeee, #dddddd); - background-image: linear-gradient(top, #eeeeee, #dddddd); +} +.side-nav .active .nav-item { + color: #fff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); + background-color: #aaaaaa; + background-image: -khtml-gradient(linear, left top, left bottom, from(#cccccc), to(#aaaaaa)); + background-image: -moz-linear-gradient(top, #cccccc, #aaaaaa); + background-image: -ms-linear-gradient(top, #cccccc, #aaaaaa); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #cccccc), color-stop(100%, #aaaaaa)); + background-image: -webkit-linear-gradient(top, #cccccc, #aaaaaa); + background-image: -o-linear-gradient(top, #cccccc, #aaaaaa); + background-image: linear-gradient(top, #cccccc, #aaaaaa); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0); - -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#aaaaaa', GradientType=0); + -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.05), inset 0 -1px 0 rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.05), inset 0 -1px 0 rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.05), inset 0 -1px 0 rgba(0, 0, 0, 0.05); } -.dropdown.open .dropdown-toggle { - color: #ffffff; - background: #ccc; - background: rgba(0, 0, 0, 0.3); +.breadcrumb { + padding: 7px 14px; + margin: 0 0 18px; + background-color: #f5f5f5; + background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5)); + background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); + background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5)); + background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); + background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); + background-image: linear-gradient(top, #ffffff, #f5f5f5); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); + border: 1px solid #ddd; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + -webkit-box-shadow: inset 0 1px 0 #ffffff; + -moz-box-shadow: inset 0 1px 0 #ffffff; + box-shadow: inset 0 1px 0 #ffffff; } -.dropdown.open .dropdown-menu { - display: block; +.breadcrumb li { + display: inline; + text-shadow: 0 1px 0 #ffffff; } -.tabs, .pills { - padding: 0; - margin: 0 0 20px; - list-style: none; - zoom: 1; +.breadcrumb .divider { + padding: 0 5px; + color: #999999; } -.tabs:before, -.pills:before, -.tabs:after, -.pills:after { - display: table; - *display: inline; - content: ""; - zoom: 1; +.breadcrumb .active a { + color: #333333; } -.tabs:after, .pills:after { - clear: both; +.pagination { + height: 36px; + margin: 18px 0; } -.tabs > li, .pills > li { - float: left; +.pagination ul { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + margin: 0; + border: 1px solid #ddd; + border: 1px solid rgba(0, 0, 0, 0.15); + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + -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); } -.tabs > li > a, .pills > li > a { - display: block; +.pagination li { + display: inline; } -.tabs { - border-color: #ddd; - border-style: solid; - border-width: 0 0 1px; +.pagination a { + float: left; + padding: 0 14px; + line-height: 34px; + text-decoration: none; + border-right: 1px solid; + border-right-color: #ddd; + border-right-color: rgba(0, 0, 0, 0.15); + *border-right-color: #ddd; + /* IE6-7 */ + } -.tabs > li { - position: relative; - margin-bottom: -1px; +.pagination a:hover, .pagination .active a { + background-color: #c7eefe; } -.tabs > li > a { - padding: 0 15px; - margin-right: 2px; - line-height: 36px; - border: 1px solid transparent; - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; +.pagination .disabled a, .pagination .disabled a:hover { + color: #999999; + background-color: transparent; } -.tabs > li > a:hover { - text-decoration: none; - background-color: #eee; - border-color: #eee #eee #ddd; +.pagination .next a { + border: 0; } -.tabs .active > a, .tabs .active > a:hover { - color: #808080; - background-color: #ffffff; - border: 1px solid #ddd; - border-bottom-color: transparent; - cursor: default; +.pagination.centered { + text-align: center; } -.tabbable { - margin-bottom: 18px; +.modal-backdrop { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 10000; + background-color: #000000; } -.tabbable .tabs { - margin-bottom: 0; - border-bottom: 0; +.modal-backdrop.fade { + opacity: 0; } -.tabbable .tab-content { - padding: 19px; - border: 1px solid #ddd; +.modal-backdrop, .modal-backdrop.fade.in { + filter: alpha(opacity=80); + -moz-opacity: 0.8; + opacity: 0.8; } -.tabbable.tabs-bottom .tabs > li { - margin-top: -1px; - margin-bottom: 0; +.modal { + position: fixed; + top: 50%; + left: 50%; + z-index: 11000; + max-height: 500px; + overflow: auto; + width: 560px; + margin: -250px 0 0 -250px; + background-color: #ffffff; + border: 1px solid #999; + border: 1px solid rgba(0, 0, 0, 0.3); + *border: 1px solid #999; + /* IE6-7 */ + + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -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); + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; } -.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; +.modal .close { + margin-top: 7px; } -.tabbable.tabs-bottom .tabs > li > a:hover { - border-bottom-color: transparent; - border-top-color: #ddd; +.modal.fade { + -webkit-transition: opacity .3s linear, top .3s ease-out; + -moz-transition: opacity .3s linear, top .3s ease-out; + -ms-transition: opacity .3s linear, top .3s ease-out; + -o-transition: opacity .3s linear, top .3s ease-out; + transition: opacity .3s linear, top .3s ease-out; + top: -25%; } -.tabbable.tabs-bottom .tabs > .active > a, .tabbable.tabs-bottom .tabs > .active > a:hover { - border-color: transparent #ddd #ddd #ddd; +.modal.fade.in { + top: 50%; } -.tabbable.tabs-left, .tabbable.tabs-right { +.modal-header { + padding: 5px 15px; + border-bottom: 1px solid #eee; +} +.modal-body { + padding: 15px; +} +.modal-footer { + padding: 14px 15px 15px; + margin-bottom: 0; + background-color: #f5f5f5; + border-top: 1px solid #ddd; + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; + -webkit-box-shadow: inset 0 1px 0 #ffffff; + -moz-box-shadow: inset 0 1px 0 #ffffff; + box-shadow: inset 0 1px 0 #ffffff; zoom: 1; } -.tabbable.tabs-left:before, -.tabbable.tabs-right:before, -.tabbable.tabs-left:after, -.tabbable.tabs-right:after { +.modal-footer:before, .modal-footer:after { display: table; *display: inline; content: ""; zoom: 1; } -.tabbable.tabs-left:after, .tabbable.tabs-right:after { +.modal-footer:after { clear: both; } -.tabbable.tabs-left .tabs, .tabbable.tabs-right .tabs { - width: 100px; -} -.tabbable.tabs-left .tabs > li, .tabbable.tabs-right .tabs > li { - float: none; - margin-bottom: -1px; +.modal-footer .btn { + float: right; + margin-left: 5px; } -.tabbable.tabs-left .tabs > li > a, .tabbable.tabs-right .tabs > li > a { - margin-bottom: 2px; +.twipsy { + position: absolute; + z-index: 1000; + display: block; + visibility: visible; + padding: 5px; + font-size: 11px; + filter: alpha(opacity=0); + -moz-opacity: 0; + opacity: 0; } -.tabbable.tabs-left .tabs > li > a:hover, .tabbable.tabs-right .tabs > li > a:hover { - border-color: transparent; +.twipsy.in { + filter: alpha(opacity=80); + -moz-opacity: 0.8; + opacity: 0.8; } -.tabbable.tabs-left .tab-content { - margin-left: 100px; +.twipsy.top { + margin-top: -2px; } -.tabbable.tabs-left .tabs { - float: left; +.twipsy.right { + margin-left: 2px; } -.tabbable.tabs-left .tabs > li { - margin-right: -1px; +.twipsy.bottom { + margin-top: 2px; } -.tabbable.tabs-left .tabs > li > a { - margin-right: 0; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; +.twipsy.left { + margin-left: -2px; } -.tabbable.tabs-left .tabs > li > a:hover { - border-right-color: #ddd; +.twipsy.top .twipsy-arrow { + bottom: 0; + left: 50%; + margin-left: -5px; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-top: 5px solid #000000; } -.tabbable.tabs-left .tabs .active > a, .tabbable.tabs-left .tabs .active > a:hover { - border-color: #ddd; - border-right-color: transparent; +.twipsy.left .twipsy-arrow { + top: 50%; + right: 0; + margin-top: -5px; + border-top: 5px solid transparent; + border-bottom: 5px solid transparent; + border-left: 5px solid #000000; } -.tabbable.tabs-right .tab-content { - margin-right: 100px; +.twipsy.bottom .twipsy-arrow { + top: 0; + left: 50%; + margin-left: -5px; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-bottom: 5px solid #000000; } -.tabbable.tabs-right .tabs { - float: right; +.twipsy.right .twipsy-arrow { + top: 50%; + left: 0; + margin-top: -5px; + border-top: 5px solid transparent; + border-bottom: 5px solid transparent; + border-right: 5px solid #000000; } -.tabbable.tabs-right .tabs > li { - margin-left: -1px; +.twipsy-inner { + max-width: 200px; + padding: 3px 8px; + color: white; + text-align: center; + text-decoration: none; + background-color: #000000; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } -.tabbable.tabs-right .tabs > li > a { - margin-left: 0; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; +.twipsy-arrow { + position: absolute; + width: 0; + height: 0; } -.tabbable.tabs-right .tabs > li > a:hover { - border-left-color: #ddd; +.popover { + position: absolute; + top: 0; + left: 0; + z-index: 1000; + display: none; + padding: 5px; } -.tabbable.tabs-right .tabs .active > a, .tabbable.tabs-right .tabs .active > a:hover { - border-color: #ddd; - border-left-color: transparent; +.popover.top { + margin-top: -5px; } -.tabs .menu-dropdown, .tabs .dropdown-menu { - top: 35px; - border-width: 1px; - -webkit-border-radius: 0 6px 6px 6px; - -moz-border-radius: 0 6px 6px 6px; - border-radius: 0 6px 6px 6px; -} -.tabs a.menu:after, .tabs .dropdown-toggle:after { - border-top-color: #999; - margin-top: 15px; +.popover.right { margin-left: 5px; } -.tabs li.open.menu .menu, .tabs .open.dropdown .dropdown-toggle { - border-color: #999; +.popover.bottom { + margin-top: 5px; } -.tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after { - border-top-color: #555; +.popover.left { + margin-left: -5px; } -.pills > li > a { - padding: 0 15px; - margin: 5px 3px 5px 0; - line-height: 30px; - text-shadow: 0 1px 1px #ffffff; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; +.popover.top .arrow { + bottom: 0; + left: 50%; + margin-left: -5px; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-top: 5px solid #000000; } -.pills > li > a:hover { - color: #ffffff; - text-decoration: none; - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); - background-color: #00438a; +.popover.right .arrow { + top: 50%; + left: 0; + margin-top: -5px; + border-top: 5px solid transparent; + border-bottom: 5px solid transparent; + border-right: 5px solid #000000; } -.pills .active > a { - color: #ffffff; - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); - background-color: #0069d6; +.popover.bottom .arrow { + top: 0; + left: 50%; + margin-left: -5px; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-bottom: 5px solid #000000; } -.pills-vertical > li { - float: none; +.popover.left .arrow { + top: 50%; + right: 0; + margin-top: -5px; + border-top: 5px solid transparent; + border-bottom: 5px solid transparent; + border-left: 5px solid #000000; } -.tab-content > .tab-pane, .pill-content > .pill-pane { - display: none; +.popover .arrow { + position: absolute; + width: 0; + height: 0; } -.tab-content > .active, .pill-content > .active { - display: block; +.popover .inner { + padding: 3px; + width: 280px; + overflow: hidden; + background-color: #000000; + background-color: rgba(0, 0, 0, 0.8); + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -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); } -.step-nav { - position: relative; - margin: 0 0 18px; - list-style: none; - line-height: 30px; - text-align: center; +.popover .title { + padding: 9px 15px; + line-height: 1; background-color: #f5f5f5; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} -.step-nav li { - display: inline; - color: #bfbfbf; -} -.step-nav .prev, .step-nav .next { - position: absolute; - top: 6px; -} -.step-nav .prev { - left: 15px; + border-bottom: 1px solid #eee; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } -.step-nav .next { - right: 15px; +.popover .content { + padding: 14px; + background-color: #ffffff; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; } -.step-nav .dot { - display: inline-block; - width: 10px; - height: 10px; - margin: 0 3px; - text-indent: -999em; - background-color: #bfbfbf; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25); +.popover .content p, .popover .content ul, .popover .content ol { + margin-bottom: 0; } -.step-nav .dot:hover, .step-nav .active .dot { - background-color: #404040; +.btn.danger, +.alert-message.danger, +.btn.danger:hover, +.alert-message.danger:hover, +.btn.error, +.alert-message.error, +.btn.error:hover, +.alert-message.error:hover, +.btn.success, +.alert-message.success, +.btn.success:hover, +.alert-message.success:hover, +.btn.info, +.alert-message.info, +.btn.info:hover, +.alert-message.info:hover { + color: #ffffff; } -.subnav { - background-color: #eeeeee; - background-image: -khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#eeeeee)); - background-image: -moz-linear-gradient(top, #f5f5f5, #eeeeee); - background-image: -ms-linear-gradient(top, #f5f5f5, #eeeeee); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #eeeeee)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #eeeeee); - background-image: -o-linear-gradient(top, #f5f5f5, #eeeeee); - background-image: linear-gradient(top, #f5f5f5, #eeeeee); +.btn.danger, +.alert-message.danger, +.btn.error, +.alert-message.error { + background-color: #c43c35; + background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35)); + background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35)); + background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); + background-image: linear-gradient(top, #ee5f5b, #c43c35); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#eeeeee', GradientType=0); - -webkit-box-shadow: inset 0 1px 0 #ffffff, 0 0 5px rgba(0, 0, 0, 0.5); - -moz-box-shadow: inset 0 1px 0 #ffffff, 0 0 5px rgba(0, 0, 0, 0.5); - box-shadow: inset 0 1px 0 #ffffff, 0 0 5px rgba(0, 0, 0, 0.5); -} -.subnav a { - padding: 8px 10px; - font-size: 12px; - color: #0069d6; - text-shadow: 0 1px 0 #fff; - border-left: 1px solid #f9f9f9; - border-right: 1px solid #e5e5e5; -} -.subnav a:hover { - color: #00438a; - background-color: #eee; -} -.subnav li:first-child a { - border-left: 0; - -webkit-border-radius: 6px 0 0 6px; - -moz-border-radius: 6px 0 0 6px; - border-radius: 6px 0 0 6px; -} -.subnav li:last-child a { - border-right: 0; - -webkit-border-radius: 0 6px 6px 0; - -moz-border-radius: 0 6px 6px 0; - border-radius: 0 6px 6px 0; -} -.subnav ul .active > a { - color: #404040; - background-color: #eee; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); + border-color: #c43c35 #c43c35 #882a25; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } -.breadcrumb { - padding: 7px 14px; - margin: 0 0 18px; - background-color: #f5f5f5; - background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5)); - background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5)); - background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); - background-image: linear-gradient(top, #ffffff, #f5f5f5); +.btn.success, .alert-message.success { + background-color: #57a957; + background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); + background-image: -moz-linear-gradient(top, #62c462, #57a957); + background-image: -ms-linear-gradient(top, #62c462, #57a957); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); + background-image: -webkit-linear-gradient(top, #62c462, #57a957); + background-image: -o-linear-gradient(top, #62c462, #57a957); + background-image: linear-gradient(top, #62c462, #57a957); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); - border: 1px solid #ddd; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; -} -.breadcrumb li { - display: inline; - text-shadow: 0 1px 0 #ffffff; -} -.breadcrumb .divider { - padding: 0 5px; - color: #bfbfbf; -} -.breadcrumb .active a { - color: #404040; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); + border-color: #57a957 #57a957 #3d773d; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } -.pagination { - height: 36px; - margin: 18px 0; +.btn.info, .alert-message.info { + background-color: #339bb9; + background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); + background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); + background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9)); + background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); + background-image: -o-linear-gradient(top, #5bc0de, #339bb9); + background-image: linear-gradient(top, #5bc0de, #339bb9); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); + border-color: #339bb9 #339bb9 #22697d; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } -.pagination ul { +.btn { display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - margin: 0; - border: 1px solid #ddd; - border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -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); -} -.pagination li { - display: inline; + padding: 5px 14px 6px; + font-size: 13px; + line-height: normal; + color: #333; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); + background-color: #e6e6e6; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); + background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); + background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-repeat: no-repeat; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); + border: 1px solid #ccc; + border-bottom-color: #bbb; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -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); + cursor: pointer; + -webkit-transition: 0.1s linear all; + -moz-transition: 0.1s linear all; + -ms-transition: 0.1s linear all; + -o-transition: 0.1s linear all; + transition: 0.1s linear all; } -.pagination a { - float: left; - padding: 0 14px; - line-height: 34px; +.btn:hover { + color: #333333; text-decoration: none; - border-right: 1px solid; - border-right-color: #ddd; - border-right-color: rgba(0, 0, 0, 0.15); - *border-right-color: #ddd; - /* IE6-7 */ - -} -.pagination a:hover, .pagination .active a { - background-color: #c7eefe; -} -.pagination .disabled a, .pagination .disabled a:hover { - color: #bfbfbf; - background-color: transparent; + background-position: 0 -15px; } -.pagination .next a { - border: 0; +.btn:focus { + outline: 1px dotted #666; } -.pagination.centered { - text-align: center; +.btn.primary { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #0064cd; + background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd)); + background-image: -moz-linear-gradient(top, #049cdb, #0064cd); + background-image: -ms-linear-gradient(top, #049cdb, #0064cd); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd)); + background-image: -webkit-linear-gradient(top, #049cdb, #0064cd); + background-image: -o-linear-gradient(top, #049cdb, #0064cd); + background-image: linear-gradient(top, #049cdb, #0064cd); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0); + border-color: #0064cd #0064cd #003f81; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } -.modal-backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 10000; - background-color: #000000; +.btn.active, .btn:active { + -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); } -.modal-backdrop.fade { - opacity: 0; +.btn.disabled { + cursor: default; + background-image: none; + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + filter: alpha(opacity=65); + -moz-opacity: 0.65; + opacity: 0.65; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } -.modal-backdrop, .modal-backdrop.fade.in { - filter: alpha(opacity=80); - -moz-opacity: 0.8; - opacity: 0.8; +.btn[disabled] { + cursor: default; + background-image: none; + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + filter: alpha(opacity=65); + -moz-opacity: 0.65; + opacity: 0.65; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } -.modal { - position: fixed; - top: 50%; - left: 50%; - z-index: 11000; - max-height: 500px; - overflow: auto; - width: 560px; - margin: -250px 0 0 -250px; - background-color: #ffffff; - border: 1px solid #999; - border: 1px solid rgba(0, 0, 0, 0.3); - *border: 1px solid #999; - /* IE6-7 */ - +.btn.large { + padding: 9px 14px 9px; + font-size: 15px; + line-height: normal; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; - -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); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} -.modal .close { - margin-top: 7px; -} -.modal.fade { - -webkit-transition: opacity .3s linear, top .3s ease-out; - -moz-transition: opacity .3s linear, top .3s ease-out; - -ms-transition: opacity .3s linear, top .3s ease-out; - -o-transition: opacity .3s linear, top .3s ease-out; - transition: opacity .3s linear, top .3s ease-out; - top: -25%; } -.modal.fade.in { - top: 50%; +.btn.small { + padding: 7px 9px 7px; + font-size: 11px; } -.modal-header { - padding: 5px 15px; - border-bottom: 1px solid #eee; +:root .alert-message, :root .btn { + border-radius: 0 \0; } -.modal-body { - padding: 15px; +button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { + padding: 0; + border: 0; } -.modal-footer { - padding: 14px 15px 15px; - margin-bottom: 0; - background-color: #f5f5f5; - border-top: 1px solid #ddd; - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; +.btn-toolbar { zoom: 1; } -.modal-footer:before, .modal-footer:after { +.btn-toolbar:before, .btn-toolbar:after { display: table; *display: inline; content: ""; zoom: 1; } -.modal-footer:after { +.btn-toolbar:after { clear: both; } -.modal-footer .btn { - float: right; - margin-left: 5px; -} -.twipsy { - position: absolute; - z-index: 1000; - display: block; - visibility: visible; - padding: 5px; - font-size: 11px; - filter: alpha(opacity=0); - -moz-opacity: 0; - opacity: 0; +.btn-toolbar .btn-group { + float: left; + margin-right: 10px; } -.twipsy.in { - filter: alpha(opacity=80); - -moz-opacity: 0.8; - opacity: 0.8; +.btn-group { + zoom: 1; } -.twipsy.top { - margin-top: -2px; +.btn-group:before, .btn-group:after { + display: table; + *display: inline; + content: ""; + zoom: 1; } -.twipsy.right { - margin-left: 2px; +.btn-group:after { + clear: both; } -.twipsy.bottom { - margin-top: 2px; +.btn-group .btn { + position: relative; + float: left; + margin-left: -1px; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } -.twipsy.left { - margin-left: -2px; +.btn-group .btn:first-child { + margin-left: 0; + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } -.twipsy.top .twipsy-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; +.btn-group .btn:last-child { + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; } -.twipsy.left .twipsy-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; +.btn-group .btn.large:first-child { + margin-left: 0; + -webkit-border-top-left-radius: 6px; + -moz-border-radius-topleft: 6px; + border-top-left-radius: 6px; + -webkit-border-bottom-left-radius: 6px; + -moz-border-radius-bottomleft: 6px; + border-bottom-left-radius: 6px; } -.twipsy.bottom .twipsy-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; +.btn-group .btn.large:last-child { + -webkit-border-top-right-radius: 6px; + -moz-border-radius-topright: 6px; + border-top-right-radius: 6px; + -webkit-border-bottom-right-radius: 6px; + -moz-border-radius-bottomright: 6px; + border-bottom-right-radius: 6px; } -.twipsy.right .twipsy-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; +.btn-group .btn:hover, .btn-group .btn:focus, .btn-group .btn:active { + z-index: 2; } -.twipsy-inner { - max-width: 200px; - padding: 3px 8px; - color: white; - text-align: center; - text-decoration: none; - background-color: #000000; +.alert-message { + position: relative; + padding: 7px 15px; + margin-bottom: 18px; + color: #333333; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + background-color: #eedc94; + background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94)); + background-image: -moz-linear-gradient(top, #fceec1, #eedc94); + background-image: -ms-linear-gradient(top, #fceec1, #eedc94); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94)); + background-image: -webkit-linear-gradient(top, #fceec1, #eedc94); + background-image: -o-linear-gradient(top, #fceec1, #eedc94); + background-image: linear-gradient(top, #fceec1, #eedc94); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0); + border-color: #eedc94 #eedc94 #e4c652; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + border-width: 1px; + border-style: solid; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; + -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); } -.twipsy-arrow { - position: absolute; - width: 0; - height: 0; -} -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1000; - display: none; - padding: 5px; +.alert-message .close { + *margin-top: 3px; + /* IE7 spacing */ + } -.popover.top { - margin-top: -5px; +.alert-message h5 { + line-height: 18px; } -.popover.right { - margin-left: 5px; +.alert-message p { + margin-bottom: 0; } -.popover.bottom { +.alert-message div { margin-top: 5px; + margin-bottom: 2px; + line-height: 28px; } -.popover.left { - margin-left: -5px; -} -.popover.top .arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; -} -.popover.right .arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; -} -.popover.bottom .arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; -} -.popover.left .arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.popover .arrow { - position: absolute; - width: 0; - height: 0; -} -.popover .inner { - padding: 3px; - width: 280px; - overflow: hidden; - background-color: #000000; - background-color: rgba(0, 0, 0, 0.8); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -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); +.alert-message .btn { + -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); + -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); + box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); } -.popover .title { - padding: 9px 15px; - line-height: 1; - background-color: #f5f5f5; - border-bottom: 1px solid #eee; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; +.alert-message.error, .alert-message.success, .alert-message.info { + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } -.popover .content { +.alert-message.block-message { padding: 14px; - background-color: #ffffff; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} -.popover .content p, .popover .content ul, .popover .content ol { - margin-bottom: 0; + background-image: none; + background-color: #fdf5d9; + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + border-color: #fceec1; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } -.side-nav { - padding: 9px 0; +.alert-message.block-message ul, .alert-message.block-message p { + margin-right: 30px; } -.side-nav .nav-label, .side-nav .nav-item { - display: block; - padding: 3px 16px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); +.alert-message.block-message ul { + margin-bottom: 0; } -.side-nav .nav-label { - font-size: 11px; - line-height: 18px; - color: #404040; - text-transform: uppercase; +.alert-message.block-message li { + color: #333333; } -.side-nav .nav-group { - margin: 0 -1px; - list-style: none; +.alert-message.block-message .alert-actions { + margin-top: 5px; } -.side-nav .nav-item { - font-weight: bold; +.alert-message.block-message.error, .alert-message.block-message.success, .alert-message.block-message.info { + color: #333333; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); } -.side-nav .nav-item i { - vertical-align: -2px; +.alert-message.block-message.error { + background-color: #fddfde; + border-color: #fbc7c6; } -.side-nav .nav-item:hover { - text-decoration: none; +.alert-message.block-message.success { + background-color: #d1eed1; + border-color: #bfe7bf; } -.side-nav .active .nav-item { - color: #fff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); - background-color: #aaaaaa; - background-image: -khtml-gradient(linear, left top, left bottom, from(#cccccc), to(#aaaaaa)); - background-image: -moz-linear-gradient(top, #cccccc, #aaaaaa); - background-image: -ms-linear-gradient(top, #cccccc, #aaaaaa); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #cccccc), color-stop(100%, #aaaaaa)); - background-image: -webkit-linear-gradient(top, #cccccc, #aaaaaa); - background-image: -o-linear-gradient(top, #cccccc, #aaaaaa); - background-image: linear-gradient(top, #cccccc, #aaaaaa); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#aaaaaa', GradientType=0); - -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.05), inset 0 -1px 0 rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.05), inset 0 -1px 0 rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.05), inset 0 -1px 0 rgba(0, 0, 0, 0.05); +.alert-message.block-message.info { + background-color: #ddf4fb; + border-color: #c6edf9; } .thumbnails { margin-left: -20px; @@ -2898,7 +2838,7 @@ i { box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); } a.thumbnail:hover { - border-color: #0069d6; + border-color: #0088cc; -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); @@ -2975,6 +2915,29 @@ a.thumbnail:hover { text-decoration: none; background: rgba(0, 0, 0, 0.8); } +.label { + padding: 1px 3px 2px; + font-size: 9.75px; + font-weight: bold; + color: #ffffff; + text-transform: uppercase; + background-color: #999999; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +.label.important { + background-color: #c43c35; +} +.label.warning { + background-color: #f89406; +} +.label.success { + background-color: #46a546; +} +.label.notice { + background-color: #62cffc; +} .hidden { display: none; visibility: hidden; -- cgit v1.2.3 From 23e5fc2133dd748ba4a7df52b598a24a2915811a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 14:11:41 -0800 Subject: Tweak the docs and address the new forms list of controls: radios and checkboxes are now hanging controls to wrap text properly --- bootstrap.css | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 55706e2a3..ea084d5f0 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: Thu Jan 5 10:00:31 PST 2012 + * Date: Thu Jan 5 14:10:04 PST 2012 */ html, body { margin: 0; @@ -615,6 +615,16 @@ input[type=image] { textarea { height: auto; } +.radio, .checkbox { + padding-left: 18px; +} +.radio input[type=radio], .checkbox input[type=checkbox] { + float: left; + margin-left: -18px; +} +.controls > .radio:first-child, .controls > .checkbox:first-child { + padding-top: 6px; +} input, textarea { -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); @@ -986,9 +996,6 @@ textarea[readonly] { .horizontal-form .controls { margin-left: 150px; } -.horizontal-form .controls > .radio:first-child, .horizontal-form .controls > .checkbox:first-child { - padding-top: 6px; -} .horizontal-form .form-actions { padding-left: 150px; } -- cgit v1.2.3 From 621dd13d87b6ba5fd351966056ea335c6a946f45 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 15:43:07 -0800 Subject: move mega link footer to scaffolding to try it out, fix broken button text shadow, change UL/OL margins back, make li color same as body --- bootstrap.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index ea084d5f0..6b6fd9e52 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: Thu Jan 5 14:10:04 PST 2012 + * Date: Thu Jan 5 15:42:23 PST 2012 */ html, body { margin: 0; @@ -401,7 +401,7 @@ h6 { text-transform: uppercase; } ul, ol { - margin: 13px 0 14px 25px; + margin: 0 0 9px 25px; } ul ul, ul ol, @@ -417,7 +417,7 @@ ol { } li { line-height: 18px; - color: #333333; + color: #555555; } ul.unstyled { margin-left: 0; @@ -2503,6 +2503,7 @@ i { .alert-message.info, .btn.info:hover, .alert-message.info:hover { + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); color: #ffffff; } .btn.danger, -- cgit v1.2.3 From 03d7c1a65e0321445842a4925d19331fda200c02 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 15:46:48 -0800 Subject: make dropdowns use unicode character for :after --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 6b6fd9e52..0624b3104 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: Thu Jan 5 15:42:23 PST 2012 + * Date: Thu Jan 5 15:46:10 PST 2012 */ html, body { margin: 0; @@ -1486,7 +1486,7 @@ i { filter: alpha(opacity=30); -moz-opacity: 0.3; opacity: 0.3; - content: "↓"; + content: "\2193"; } .dropdown:hover .dropdown-toggle:after { filter: alpha(opacity=100); -- cgit v1.2.3 From aa5342888bf9b3041d2f703349d7ff94cf8b5f43 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 15:48:40 -0800 Subject: default cursor for disabled links in pagination --- bootstrap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 0624b3104..aa13815fd 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: Thu Jan 5 15:46:10 PST 2012 + * Date: Thu Jan 5 15:48:31 PST 2012 */ html, body { margin: 0; @@ -2223,6 +2223,7 @@ i { .pagination .disabled a, .pagination .disabled a:hover { color: #999999; background-color: transparent; + cursor: default; } .pagination .next a { border: 0; -- cgit v1.2.3 From c56e9d2d35299b4c9e4e3d1aabcf59cedc9143f2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 21:43:28 -0800 Subject: massive docs update, mostly to all our new forms, and to the buttons --- bootstrap.css | 52 +++++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 27 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index aa13815fd..0014fcdcc 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: Thu Jan 5 15:48:31 PST 2012 + * Date: Thu Jan 5 21:43:09 PST 2012 */ html, body { margin: 0; @@ -261,7 +261,6 @@ a:hover { clear: both; } [class*="span"] { - display: inline; float: left; margin-left: 20px; } @@ -555,10 +554,11 @@ input, textarea, select, .uneditable-input { - display: inline-block; + display: block; width: 210px; height: 18px; padding: 4px; + margin-bottom: 9px; font-size: 13px; line-height: 18px; color: #555555; @@ -670,7 +670,6 @@ input.span1, textarea.span1, select.span1, .uneditable-input.span1 { - display: inline-block; float: none; width: 50px; margin-left: 0; @@ -679,7 +678,6 @@ input.span2, textarea.span2, select.span2, .uneditable-input.span2 { - display: inline-block; float: none; width: 130px; margin-left: 0; @@ -688,7 +686,6 @@ input.span3, textarea.span3, select.span3, .uneditable-input.span3 { - display: inline-block; float: none; width: 210px; margin-left: 0; @@ -697,7 +694,6 @@ input.span4, textarea.span4, select.span4, .uneditable-input.span4 { - display: inline-block; float: none; width: 290px; margin-left: 0; @@ -706,7 +702,6 @@ input.span5, textarea.span5, select.span5, .uneditable-input.span5 { - display: inline-block; float: none; width: 370px; margin-left: 0; @@ -715,7 +710,6 @@ input.span6, textarea.span6, select.span6, .uneditable-input.span6 { - display: inline-block; float: none; width: 450px; margin-left: 0; @@ -724,7 +718,6 @@ input.span7, textarea.span7, select.span7, .uneditable-input.span7 { - display: inline-block; float: none; width: 530px; margin-left: 0; @@ -733,7 +726,6 @@ input.span8, textarea.span8, select.span8, .uneditable-input.span8 { - display: inline-block; float: none; width: 610px; margin-left: 0; @@ -742,7 +734,6 @@ input.span9, textarea.span9, select.span9, .uneditable-input.span9 { - display: inline-block; float: none; width: 690px; margin-left: 0; @@ -751,7 +742,6 @@ input.span10, textarea.span10, select.span10, .uneditable-input.span10 { - display: inline-block; float: none; width: 770px; margin-left: 0; @@ -760,7 +750,6 @@ input.span11, textarea.span11, select.span11, .uneditable-input.span11 { - display: inline-block; float: none; width: 850px; margin-left: 0; @@ -769,7 +758,6 @@ input.span12, textarea.span12, select.span12, .uneditable-input.span12 { - display: inline-block; float: none; width: 930px; margin-left: 0; @@ -778,7 +766,6 @@ input.span13, textarea.span13, select.span13, .uneditable-input.span13 { - display: inline-block; float: none; width: 1010px; margin-left: 0; @@ -787,7 +774,6 @@ input.span14, textarea.span14, select.span14, .uneditable-input.span14 { - display: inline-block; float: none; width: 1090px; margin-left: 0; @@ -796,7 +782,6 @@ input.span15, textarea.span15, select.span15, .uneditable-input.span15 { - display: inline-block; float: none; width: 1170px; margin-left: 0; @@ -805,7 +790,6 @@ input.span16, textarea.span16, select.span16, .uneditable-input.span16 { - display: inline-block; float: none; width: 1250px; margin-left: 0; @@ -890,13 +874,13 @@ textarea[readonly] { box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); cursor: not-allowed; } -:-moz-placeholder { +input:-moz-placeholder { color: #999999; } -::-webkit-input-placeholder { +input::-webkit-input-placeholder { color: #999999; } -.help-text { +.help-block { margin-top: 5px; margin-bottom: 0; color: #999999; @@ -911,11 +895,8 @@ textarea[readonly] { display: inline; padding-left: 5px; } -.help-block { - display: block; - max-width: 600px; -} .input-prepend, .input-append { + margin-bottom: 5px; zoom: 1; } .input-prepend:before, @@ -977,10 +958,27 @@ textarea[readonly] { border-radius: 0 3px 3px 0; } .search-form .search-query { + padding-left: 14px; + padding-right: 14px; -webkit-border-radius: 14px; -moz-border-radius: 14px; border-radius: 14px; } +.search-form input, +.inline-form input, +.horizontal-form input, +.search-form textarea, +.inline-form textarea, +.horizontal-form textarea, +.search-form select, +.inline-form select, +.horizontal-form select, +.search-form .uneditable-input, +.inline-form .uneditable-input, +.horizontal-form .uneditable-input { + display: inline-block; + margin-bottom: 0; +} .control-group { margin-bottom: 18px; } @@ -2554,7 +2552,7 @@ i { } .btn { display: inline-block; - padding: 5px 14px 6px; + padding: 5px 10px 6px; font-size: 13px; line-height: normal; color: #333; -- cgit v1.2.3 From 7582520808ad6c3610831652d0d4d33ea4ebf15b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 22:37:23 -0800 Subject: docs cleanup and navbar brand hover --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 0014fcdcc..e2ef40a6c 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: Thu Jan 5 21:43:09 PST 2012 + * Date: Thu Jan 5 22:37:16 PST 2012 */ html, body { margin: 0; @@ -1644,7 +1644,7 @@ i { -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 .brand a:hover, .navbar ul .active > a { +.navbar .brand:hover, .navbar ul .active > a { color: #ffffff; text-decoration: none; background-color: #333333; -- cgit v1.2.3 From 5cb76037ae70ca26a923750ca9441b04d2fbd6a7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 23:24:19 -0800 Subject: fixing conflict in dividers in navbar, fix navbar docs, fix search form in navbar --- bootstrap.css | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index e2ef40a6c..4d8edd4fb 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: Thu Jan 5 22:37:16 PST 2012 + * Date: Thu Jan 5 23:24:01 PST 2012 */ html, body { margin: 0; @@ -957,9 +957,10 @@ input::-webkit-input-placeholder { -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } -.search-form .search-query { +.search-query { padding-left: 14px; padding-right: 14px; + margin-bottom: 0; -webkit-border-radius: 14px; -moz-border-radius: 14px; border-radius: 14px; @@ -1764,7 +1765,7 @@ i { background-color: #222; background-color: rgba(0, 0, 0, 0.5); } -.nav .divider { +.nav .vertical-divider { height: 40px; width: 1px; margin: 0 5px; @@ -1796,6 +1797,7 @@ i { background: rgba(255, 255, 255, 0.05); } .nav .dropdown-menu li a { + padding: 4px 15px; color: #999; text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); } -- cgit v1.2.3 From cfc2353059df628c67d19a3c5c3ead2cc6051f53 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 6 Jan 2012 23:59:22 -0800 Subject: front page docs updated to include old getting started section, update code styles to look like github gists, and lots more docs updates --- bootstrap.css | 50 +++++++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 19 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 4d8edd4fb..85ed7961a 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: Thu Jan 5 23:24:01 PST 2012 + * Date: Fri Jan 6 23:58:33 PST 2012 */ html, body { margin: 0; @@ -382,20 +382,20 @@ h3 { h3 small { font-size: 14px; } +h4, h5, h6 { + line-height: 18px; +} h4 { - font-size: 16px; - line-height: 36px; + font-size: 14px; } h4 small { font-size: 12px; } h5 { - font-size: 14px; - line-height: 18px; + font-size: 12px; } h6 { - font-size: 13px; - line-height: 18px; + font-size: 11px; color: #999999; text-transform: uppercase; } @@ -625,6 +625,12 @@ textarea { .controls > .radio:first-child, .controls > .checkbox:first-child { padding-top: 6px; } +.radio.inline, .checkbox.inline { + display: inline-block; +} +.radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline { + margin-left: 10px; +} input, textarea { -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); @@ -1672,6 +1678,9 @@ i { .navbar .btn { margin-top: 5px; } +.navbar-form { + margin-bottom: 0; +} .navbar-search { position: relative; float: left; @@ -2111,19 +2120,22 @@ i { } .side-nav .nav-label, .side-nav .nav-item { display: block; - padding: 3px 16px; + padding: 3px 15px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); } .side-nav .nav-label { font-size: 11px; line-height: 18px; - color: #333333; + color: #999999; text-transform: uppercase; } .side-nav .nav-group { - margin: 0 -1px; + margin: 0; list-style: none; } +.side-nav .nav-group + .nav-label { + margin-top: 9px; +} .side-nav .nav-item { font-weight: bold; } @@ -2136,16 +2148,16 @@ i { .side-nav .active .nav-item { color: #fff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); - background-color: #aaaaaa; - background-image: -khtml-gradient(linear, left top, left bottom, from(#cccccc), to(#aaaaaa)); - background-image: -moz-linear-gradient(top, #cccccc, #aaaaaa); - background-image: -ms-linear-gradient(top, #cccccc, #aaaaaa); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #cccccc), color-stop(100%, #aaaaaa)); - background-image: -webkit-linear-gradient(top, #cccccc, #aaaaaa); - background-image: -o-linear-gradient(top, #cccccc, #aaaaaa); - background-image: linear-gradient(top, #cccccc, #aaaaaa); + background-color: #999999; + background-image: -khtml-gradient(linear, left top, left bottom, from(#cccccc), to(#999999)); + background-image: -moz-linear-gradient(top, #cccccc, #999999); + background-image: -ms-linear-gradient(top, #cccccc, #999999); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #cccccc), color-stop(100%, #999999)); + background-image: -webkit-linear-gradient(top, #cccccc, #999999); + background-image: -o-linear-gradient(top, #cccccc, #999999); + background-image: linear-gradient(top, #cccccc, #999999); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#aaaaaa', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#999999', GradientType=0); -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.05), inset 0 -1px 0 rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.05), inset 0 -1px 0 rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.05), inset 0 -1px 0 rgba(0, 0, 0, 0.05); -- cgit v1.2.3 From 36e7660383a7639f5d538efb7dc0f349e285b42d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 00:26:58 -0800 Subject: fix forms in navbars, fix examples' navbars --- bootstrap.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 85ed7961a..f10d872ac 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: Fri Jan 6 23:58:33 PST 2012 + * Date: Sat Jan 7 00:24:46 PST 2012 */ html, body { margin: 0; @@ -627,6 +627,7 @@ textarea { } .radio.inline, .checkbox.inline { display: inline-block; + margin-bottom: 0; } .radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline { margin-left: 10px; @@ -1681,6 +1682,10 @@ i { .navbar-form { margin-bottom: 0; } +.navbar-form input, .navbar-form select { + display: inline-block; + margin-bottom: 0; +} .navbar-search { position: relative; float: left; -- cgit v1.2.3 From 0cb2866409c674f834f8e0f4e204c3c3331abbcd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 00:29:36 -0800 Subject: fix reponsive 1200+ media query to resolve mismatched gutters and negative margins on the row --- bootstrap.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index f10d872ac..eb338c038 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 Jan 7 00:24:46 PST 2012 + * Date: Sat Jan 7 00:29:11 PST 2012 */ html, body { margin: 0; @@ -3160,6 +3160,9 @@ a.thumbnail:hover { .container { width: @siteWidth; } + .row { + margin-left: @gridGutterWidth * -1; + } [class*="span"] { margin-left: @gridGutterWidth; } @@ -3193,4 +3196,4 @@ a.thumbnail:hover { .offset12 { .offset(12); } } -*/ +*/ \ No newline at end of file -- cgit v1.2.3 From bcf1136f2c8236cd3fa28eac7e57a9a3fc17d104 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 00:47:53 -0800 Subject: fix form field sizing for selects, document form field grid sizing --- bootstrap.css | 155 ++++++++++++++++++++-------------------------------------- 1 file changed, 54 insertions(+), 101 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index eb338c038..4f086520a 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 Jan 7 00:29:11 PST 2012 + * Date: Sat Jan 7 00:47:37 PST 2012 */ html, body { margin: 0; @@ -601,8 +601,10 @@ select, input[type=file] { line-height: 27px; } select { - background-color: #ffffff; + width: 220px; + padding: 0; vertical-align: middle; + background-color: #ffffff; } select[multiple], select[size] { height: inherit; @@ -673,133 +675,84 @@ input[type=file]:focus, input[type=checkbox]:focus, select:focus { .input-xxlarge { width: 530px; } -input.span1, -textarea.span1, -select.span1, -.uneditable-input.span1 { +input[class*="span"], +select[class*="span"], +textarea[class*="span"], +.uneditable-input[class*="span"] { float: none; - width: 50px; margin-left: 0; } -input.span2, -textarea.span2, -select.span2, -.uneditable-input.span2 { - float: none; +input.span1, textarea.span1, .uneditable-input.span1 { + width: 50px; +} +input.span2, textarea.span2, .uneditable-input.span2 { width: 130px; - margin-left: 0; } -input.span3, -textarea.span3, -select.span3, -.uneditable-input.span3 { - float: none; +input.span3, textarea.span3, .uneditable-input.span3 { width: 210px; - margin-left: 0; } -input.span4, -textarea.span4, -select.span4, -.uneditable-input.span4 { - float: none; +input.span4, textarea.span4, .uneditable-input.span4 { width: 290px; - margin-left: 0; } -input.span5, -textarea.span5, -select.span5, -.uneditable-input.span5 { - float: none; +input.span5, textarea.span5, .uneditable-input.span5 { width: 370px; - margin-left: 0; } -input.span6, -textarea.span6, -select.span6, -.uneditable-input.span6 { - float: none; +input.span6, textarea.span6, .uneditable-input.span6 { width: 450px; - margin-left: 0; } -input.span7, -textarea.span7, -select.span7, -.uneditable-input.span7 { - float: none; +input.span7, textarea.span7, .uneditable-input.span7 { width: 530px; - margin-left: 0; } -input.span8, -textarea.span8, -select.span8, -.uneditable-input.span8 { - float: none; +input.span8, textarea.span8, .uneditable-input.span8 { width: 610px; - margin-left: 0; } -input.span9, -textarea.span9, -select.span9, -.uneditable-input.span9 { - float: none; +input.span9, textarea.span9, .uneditable-input.span9 { width: 690px; - margin-left: 0; } -input.span10, -textarea.span10, -select.span10, -.uneditable-input.span10 { - float: none; +input.span10, textarea.span10, .uneditable-input.span10 { width: 770px; - margin-left: 0; } -input.span11, -textarea.span11, -select.span11, -.uneditable-input.span11 { - float: none; +input.span11, textarea.span11, .uneditable-input.span11 { width: 850px; - margin-left: 0; } -input.span12, -textarea.span12, -select.span12, -.uneditable-input.span12 { - float: none; +input.span12, textarea.span12, .uneditable-input.span12 { width: 930px; - margin-left: 0; } -input.span13, -textarea.span13, -select.span13, -.uneditable-input.span13 { - float: none; - width: 1010px; - margin-left: 0; +select.span1 { + width: 70px; } -input.span14, -textarea.span14, -select.span14, -.uneditable-input.span14 { - float: none; - width: 1090px; - margin-left: 0; +select.span2 { + width: 150px; } -input.span15, -textarea.span15, -select.span15, -.uneditable-input.span15 { - float: none; - width: 1170px; - margin-left: 0; +select.span3 { + width: 230px; } -input.span16, -textarea.span16, -select.span16, -.uneditable-input.span16 { - float: none; - width: 1250px; - margin-left: 0; +select.span4 { + width: 310px; +} +select.span5 { + width: 390px; +} +select.span6 { + width: 470px; +} +select.span7 { + width: 550px; +} +select.span8 { + width: 630px; +} +select.span9 { + width: 710px; +} +select.span10 { + width: 790px; +} +select.span11 { + width: 870px; +} +select.span12 { + width: 950px; } input[disabled], select[disabled], -- cgit v1.2.3 From d6a1402f2af5111e11a87a6029b642dc0b814854 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 01:03:26 -0800 Subject: update form shadows and tweak prettyprint styles --- bootstrap.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 4f086520a..a5bdf2594 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 Jan 7 00:47:37 PST 2012 + * Date: Sat Jan 7 00:50:40 PST 2012 */ html, body { margin: 0; @@ -635,9 +635,9 @@ textarea { margin-left: 10px; } input, textarea { - -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1); -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; -moz-transition: border linear 0.2s, box-shadow linear 0.2s; -ms-transition: border linear 0.2s, box-shadow linear 0.2s; @@ -646,9 +646,9 @@ input, textarea { } input:focus, textarea:focus { border-color: rgba(82, 168, 236, 0.8); - -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); outline: 0; } input[type=file]:focus, input[type=checkbox]:focus, select:focus { -- cgit v1.2.3 From e23448ab1b2cc627a3cab54406ffce6c915297b6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 01:08:58 -0800 Subject: make fixed navbars have lower z-index --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index a5bdf2594..38ce72cba 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 Jan 7 00:50:40 PST 2012 + * Date: Sat Jan 7 01:08:05 PST 2012 */ html, body { margin: 0; @@ -1702,7 +1702,7 @@ i { top: 0; right: 0; left: 0; - z-index: 10000; + z-index: 999; } .nav { position: relative; -- cgit v1.2.3 From 45d671d97f4d448780729bbb6357e9ec776f980c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 01:22:52 -0800 Subject: tweak spacing once more on prettify; add support for uneditable inputs to input-append and prepend --- bootstrap.css | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 38ce72cba..411bc9c43 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 Jan 7 01:08:05 PST 2012 + * Date: Sat Jan 7 01:22:18 PST 2012 */ html, body { margin: 0; @@ -678,7 +678,7 @@ input[type=file]:focus, input[type=checkbox]:focus, select:focus { input[class*="span"], select[class*="span"], textarea[class*="span"], -.uneditable-input[class*="span"] { +.uneditable-input { float: none; margin-left: 0; } @@ -871,11 +871,17 @@ input::-webkit-input-placeholder { .input-prepend:after, .input-append:after { clear: both; } -.input-prepend input, .input-append input { +.input-prepend input, +.input-append input, +.input-prepend .uneditable-input, +.input-append .uneditable-input { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } +.input-prepend .uneditable-input, .input-append .uneditable-input { + border-left-color: #ccc; +} .input-prepend .add-on, .input-append .add-on { float: left; display: block; @@ -904,12 +910,15 @@ input::-webkit-input-placeholder { /* IE6-7 */ } -.input-append input { +.input-append input, .input-append .uneditable-input { float: left; -webkit-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } +.input-append .uneditable-input { + border-right-color: #ccc; +} .input-append .add-on { margin-right: 0; margin-left: -1px; -- cgit v1.2.3 From 5fb2c666acfd5e7d2f134d2cb5b65b828102c5a9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 01:59:53 -0800 Subject: update the fluid examples to use new classes and clear the floats properly from sidebar --- bootstrap.css | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 411bc9c43..2f57e5f95 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 Jan 7 01:22:18 PST 2012 + * Date: Sat Jan 7 01:58:07 PST 2012 */ html, body { margin: 0; @@ -209,21 +209,27 @@ body { .fluid-container:after { clear: both; } -.fluid-sidebar-left, .fluid-sidebar-right { +.fluid-sidebar { width: 220px; + margin: 0 20px 18px; } -.fluid-sidebar-left { +.sidebar-left { + padding-left: 260px; +} +.sidebar-right { + padding-right: 260px; +} +.sidebar-left .fluid-sidebar { float: left; + margin-left: -240px; } -.fluid-sidebar-right { +.sidebar-right .fluid-sidebar { float: right; + margin-right: -240px; } .fluid-content { - margin-left: 240px; -} -.fluid-container.reverse .fluid-content { - margin-left: 0; - margin-right: 240px; + float: left; + width: 100%; } a { font-weight: inherit; -- cgit v1.2.3 From 8ccc3bcf03fedbe8c3a19a96c08a5cad6ae456e8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 03:45:24 -0800 Subject: overhauled dropdowns now require use of .caret for dropdown arrow, redid the button group docs section, added the split button dropdown docs section --- bootstrap.css | 143 +++++++++++++++++++++++++++++++++------------------------- 1 file changed, 82 insertions(+), 61 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 2f57e5f95..98aec3f27 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 Jan 7 01:58:07 PST 2012 + * Date: Sat Jan 7 03:37:53 PST 2012 */ html, body { margin: 0; @@ -441,7 +441,7 @@ dl dd { margin-left: 9px; } hr { - margin: 27px 0; + margin: 18px 0; border: 0; border-top: 1px solid #e5e5e5; border-bottom: 1px solid #fff; @@ -1446,23 +1446,25 @@ i { .dropdown { position: relative; } -.dropdown-toggle:after { +.caret { display: inline-block; width: 0; height: 0; - margin-top: 8px; - margin-left: 6px; text-indent: -99999px; vertical-align: top; border-left: 4px solid transparent; border-right: 4px solid transparent; - border-top: 4px solid #ffffff; + border-top: 4px solid #000; filter: alpha(opacity=30); -moz-opacity: 0.3; opacity: 0.3; content: "\2193"; } -.dropdown:hover .dropdown-toggle:after { +.dropdown .caret { + margin-top: 8px; + margin-left: 2px; +} +.dropdown:hover .caret { filter: alpha(opacity=100); -moz-opacity: 1; opacity: 1; @@ -1476,62 +1478,57 @@ i { min-width: 160px; max-width: 220px; _width: 160px; - padding: 6px 0; - margin-left: 0; - margin-right: 0; + padding: 5px 0; + margin: 0; + list-style: none; background-color: #ffffff; border-color: #999; - border-color: rgba(0, 0, 0, 0.2); + border-color: rgba(0, 0, 0, 0.1); border-style: solid; - border-width: 0 1px 1px; - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - -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); + border-width: 1px; + -webkit-border-radius: 0 0 5px 5px; + -moz-border-radius: 0 0 5px 5px; + border-radius: 0 0 5px 5px; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; + -moz-background-clip: padding; background-clip: padding-box; zoom: 1; } -.dropdown-menu li { - float: none; - display: block; - background-color: none; -} .dropdown-menu .divider { height: 1px; - margin: 5px 0; + margin: 5px 1px; overflow: hidden; - background-color: #eee; + background-color: #e5e5e5; border-bottom: 1px solid #ffffff; } -.topbar .dropdown-menu a, .dropdown-menu a { +.dropdown-menu a { display: block; - padding: 4px 15px; + padding: 2px 15px; clear: both; font-weight: normal; line-height: 18px; color: #555555; - text-shadow: 0 1px 0 #ffffff; } -.topbar .dropdown-menu a:hover, .dropdown-menu a:hover { - color: #333333; +.dropdown-menu a:hover { + color: #fff; text-decoration: none; - background-color: #dddddd; - background-image: -khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd)); - background-image: -moz-linear-gradient(top, #eeeeee, #dddddd); - background-image: -ms-linear-gradient(top, #eeeeee, #dddddd); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd)); - background-image: -webkit-linear-gradient(top, #eeeeee, #dddddd); - background-image: -o-linear-gradient(top, #eeeeee, #dddddd); - background-image: linear-gradient(top, #eeeeee, #dddddd); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #0064cd; + background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd)); + background-image: -moz-linear-gradient(top, #049cdb, #0064cd); + background-image: -ms-linear-gradient(top, #049cdb, #0064cd); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd)); + background-image: -webkit-linear-gradient(top, #049cdb, #0064cd); + background-image: -o-linear-gradient(top, #049cdb, #0064cd); + background-image: linear-gradient(top, #049cdb, #0064cd); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0); - -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0); + -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075); } .dropdown.open .dropdown-toggle { color: #ffffff; @@ -2638,23 +2635,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { padding: 0; border: 0; } -.btn-toolbar { - zoom: 1; -} -.btn-toolbar:before, .btn-toolbar:after { - display: table; - *display: inline; - content: ""; - zoom: 1; -} -.btn-toolbar:after { - clear: both; -} -.btn-toolbar .btn-group { - float: left; - margin-right: 10px; -} .btn-group { + position: relative; zoom: 1; } .btn-group:before, .btn-group:after { @@ -2666,6 +2648,12 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .btn-group:after { clear: both; } +.btn-group + .btn-group { + margin-left: 5px; +} +.btn-toolbar .btn-group { + display: inline-block; +} .btn-group .btn { position: relative; float: left; @@ -2683,7 +2671,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-border-radius-bottomleft: 4px; border-bottom-left-radius: 4px; } -.btn-group .btn:last-child { +.btn-group .btn:last-child, .btn-group .dropdown-toggle { -webkit-border-top-right-radius: 4px; -moz-border-radius-topright: 4px; border-top-right-radius: 4px; @@ -2700,7 +2688,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-border-radius-bottomleft: 6px; border-bottom-left-radius: 6px; } -.btn-group .btn.large:last-child { +.btn-group .btn.large:last-child, .btn-group .large.dropdown-toggle { -webkit-border-top-right-radius: 6px; -moz-border-radius-topright: 6px; border-top-right-radius: 6px; @@ -2711,6 +2699,39 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .btn-group .btn:hover, .btn-group .btn:focus, .btn-group .btn:active { z-index: 2; } +.btn-group .dropdown-toggle { + padding-left: 8px; + padding-right: 8px; + -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), 0 1px 2px rgba(0, 0, 0, 0.05); +} +.btn-group.open .dropdown-menu { + display: block; + top: 30px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} +.btn-group.open .dropdown-toggle { + background-image: none; + -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); +} +.btn .caret { + margin-top: 6px; + margin-left: 0; +} +.primary .caret, +.danger .caret, +.info .caret, +.success .caret { + border-top-color: #fff; + filter: alpha(opacity=75); + -moz-opacity: 0.75; + opacity: 0.75; +} .alert-message { position: relative; padding: 7px 15px; -- cgit v1.2.3 From 33dad13014ae2272d3fcf799f114bfcf8256d968 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 03:53:20 -0800 Subject: update fluid layout to use variable for sidebar width --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 98aec3f27..8d80b4adf 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 Jan 7 03:37:53 PST 2012 + * Date: Sat Jan 7 03:52:42 PST 2012 */ html, body { margin: 0; -- cgit v1.2.3 From 2540caeddd59822cd8f7c805e777adc7504b87b3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 03:58:48 -0800 Subject: quick stab at fixing modal placement on 480px and down --- bootstrap.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 8d80b4adf..899e61a17 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 Jan 7 03:52:42 PST 2012 + * Date: Sat Jan 7 03:57:28 PST 2012 */ html, body { margin: 0; @@ -2962,6 +2962,9 @@ a.thumbnail:hover { width: auto; margin: 0; } + .modal.fade.in { + top: auto; + } .horizontal-form .control-group > label { float: none; width: auto; -- cgit v1.2.3 From 8bdaf1f36451266064ec460b87a12f21a2caa65b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 04:01:09 -0800 Subject: better ranking of z-indexes for tipsies so they appear above dropdown menus but below fixed topbar --- bootstrap.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 899e61a17..187c46918 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 Jan 7 03:57:28 PST 2012 + * Date: Sat Jan 7 04:00:34 PST 2012 */ html, body { margin: 0; @@ -1472,7 +1472,7 @@ i { .dropdown-menu { position: absolute; top: 40px; - z-index: 900; + z-index: 1000; float: left; display: none; min-width: 160px; @@ -2304,7 +2304,7 @@ i { } .twipsy { position: absolute; - z-index: 1000; + z-index: 1005; display: block; visibility: visible; padding: 5px; @@ -2382,7 +2382,7 @@ i { position: absolute; top: 0; left: 0; - z-index: 1000; + z-index: 1005; display: none; padding: 5px; } -- cgit v1.2.3 From 5ba7c14afe0fbe1eb9ba18e6a06cc298362ec159 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 04:07:53 -0800 Subject: another quick pass at ranking all zindexes and listing them in variables for quick overview and editing later --- bootstrap.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 187c46918..273cbfa69 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 Jan 7 04:00:34 PST 2012 + * Date: Sat Jan 7 04:06:22 PST 2012 */ html, body { margin: 0; @@ -1714,7 +1714,7 @@ i { top: 0; right: 0; left: 0; - z-index: 999; + z-index: 1010; } .nav { position: relative; @@ -2219,7 +2219,7 @@ i { right: 0; bottom: 0; left: 0; - z-index: 10000; + z-index: 1020; background-color: #000000; } .modal-backdrop.fade { @@ -2304,7 +2304,7 @@ i { } .twipsy { position: absolute; - z-index: 1005; + z-index: 1000; display: block; visibility: visible; padding: 5px; @@ -2382,7 +2382,7 @@ i { position: absolute; top: 0; left: 0; - z-index: 1005; + z-index: 1020; display: none; padding: 5px; } -- cgit v1.2.3 From e594107f37ede1ea8bee05d8f4b22aeba89bf458 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 04:17:33 -0800 Subject: change up the z-indexing and add some popover/twipsy content to the test modal on the js docs to help avoid future bugs --- bootstrap.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 273cbfa69..0b6a41118 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 Jan 7 04:06:22 PST 2012 + * Date: Sat Jan 7 04:15:19 PST 2012 */ html, body { margin: 0; @@ -2234,7 +2234,7 @@ i { position: fixed; top: 50%; left: 50%; - z-index: 11000; + z-index: 1030; max-height: 500px; overflow: auto; width: 560px; @@ -2304,7 +2304,7 @@ i { } .twipsy { position: absolute; - z-index: 1000; + z-index: 1050; display: block; visibility: visible; padding: 5px; @@ -2382,7 +2382,7 @@ i { position: absolute; top: 0; left: 0; - z-index: 1020; + z-index: 1040; display: none; padding: 5px; } -- cgit v1.2.3 From b6d50c892d6ae8ed42ff0bfbba4252c7dc47417e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 04:20:56 -0800 Subject: scope close icon in modal to modal-header to allow alerts in modals to use close icons --- bootstrap.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 0b6a41118..54c1b0651 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 Jan 7 04:15:19 PST 2012 + * Date: Sat Jan 7 04:20:37 PST 2012 */ html, body { margin: 0; @@ -2255,9 +2255,6 @@ i { -moz-background-clip: padding-box; background-clip: padding-box; } -.modal .close { - margin-top: 7px; -} .modal.fade { -webkit-transition: opacity .3s linear, top .3s ease-out; -moz-transition: opacity .3s linear, top .3s ease-out; @@ -2273,6 +2270,9 @@ i { padding: 5px 15px; border-bottom: 1px solid #eee; } +.modal-header .close { + margin-top: 7px; +} .modal-body { padding: 15px; } -- cgit v1.2.3 From 7728f7b8241dc43292c3f897fdfe08a13f58e40b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 04:28:30 -0800 Subject: add html5 invalid state for super fancy errors via browser --- bootstrap.css | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 54c1b0651..8b943e2d3 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 Jan 7 04:20:37 PST 2012 + * Date: Sat Jan 7 04:26:09 PST 2012 */ html, body { margin: 0; @@ -824,6 +824,16 @@ textarea[readonly] { background-color: #bcddbc; border-color: #468847; } +input:invalid, textarea:invalid, select:invalid { + color: #b94a48; + border-color: #ee5f5b; +} +input:invalid:focus, textarea:invalid:focus, select:invalid:focus { + border-color: #e9322d; + -webkit-box-shadow: 0 0 6px #f8b9b7; + -moz-box-shadow: 0 0 6px #f8b9b7; + box-shadow: 0 0 6px #f8b9b7; +} .form-actions { padding: 17px 20px 18px; margin-top: 18px; -- cgit v1.2.3 From 6dee40f46990b39bb33b4c42aa003df784cff8fc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 04:34:30 -0800 Subject: adding back table grid sizing; will need support for responsive perhaps --- bootstrap.css | 190 ++++++++++++++++++---------------------------------------- 1 file changed, 59 insertions(+), 131 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 8b943e2d3..71637d42f 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 Jan 7 04:26:09 PST 2012 + * Date: Sat Jan 7 04:34:04 PST 2012 */ html, body { margin: 0; @@ -1042,138 +1042,66 @@ td { .striped-table tbody tr:nth-child(odd) td, .striped-table tbody tr:nth-child(odd) th { background-color: #f9f9f9; } -/* -// ---------------- - -// This is a duplication of the main grid .columns() mixin, but subtracts 20px to account for input padding and border -.tableColumns(@columnSpan: 1) { - width: ((@gridColumnWidth - 20) * @columnSpan) + ((@gridColumnWidth - 20) * (@columnSpan - 1)); +table .span1 { + float: none; + width: 44px; + margin-left: 0; } -table { - // Default columns - .span1 { .tableColumns(1); } - .span2 { .tableColumns(2); } - .span3 { .tableColumns(3); } - .span4 { .tableColumns(4); } - .span5 { .tableColumns(5); } - .span6 { .tableColumns(6); } - .span7 { .tableColumns(7); } - .span8 { .tableColumns(8); } - .span9 { .tableColumns(9); } - .span10 { .tableColumns(10); } - .span11 { .tableColumns(11); } - .span12 { .tableColumns(12); } - .span13 { .tableColumns(13); } - .span14 { .tableColumns(14); } - .span15 { .tableColumns(15); } - .span16 { .tableColumns(16); } +table .span2 { + float: none; + width: 124px; + margin-left: 0; +} +table .span3 { + float: none; + width: 204px; + margin-left: 0; +} +table .span4 { + float: none; + width: 284px; + margin-left: 0; +} +table .span5 { + float: none; + width: 364px; + margin-left: 0; +} +table .span6 { + float: none; + width: 444px; + margin-left: 0; +} +table .span7 { + float: none; + width: 524px; + margin-left: 0; +} +table .span8 { + float: none; + width: 604px; + margin-left: 0; +} +table .span9 { + float: none; + width: 684px; + margin-left: 0; +} +table .span10 { + float: none; + width: 764px; + margin-left: 0; +} +table .span11 { + float: none; + width: 844px; + margin-left: 0; +} +table .span12 { + float: none; + width: 924px; + margin-left: 0; } - - -// TABLESORTER -// ----------- - -table { - // Tablesorting styles w/ jQuery plugin - .header { - cursor: pointer; - &:after { - float: right; - margin-top: 7px; - border-width: 0 4px 4px; - border-style: solid; - border-color: #000 transparent; - content: ""; - visibility: hidden; - } - } - // Style the sorted column headers (THs) - .headerSortUp, - .headerSortDown { - text-shadow: 0 1px 1px rgba(255,255,255,.75); - background-color: rgba(141,192,219,.25); - } - // Style the ascending (reverse alphabetical) column header - .header:hover { - &:after { - visibility: visible; - } - } - // Style the descending (alphabetical) column header - .headerSortDown, - .headerSortDown:hover { - &:after { - visibility: visible; - .opacity(60); - } - } - // Style the ascending (reverse alphabetical) column header - .headerSortUp { - &:after { - border-bottom: none; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid #000; - visibility:visible; - .box-shadow(none); //can't add boxshadow to downward facing arrow :( - .opacity(60); - } - } - // Blue Table Headings - .blue { - color: @blue; - border-bottom-color: @blue; - } - .headerSortUp.blue, - .headerSortDown.blue { - background-color: lighten(@blue, 40%); - } - // Green Table Headings - .green { - color: @green; - border-bottom-color: @green; - } - .headerSortUp.green, - .headerSortDown.green { - background-color: lighten(@green, 40%); - } - // Red Table Headings - .red { - color: @red; - border-bottom-color: @red; - } - .headerSortUp.red, - .headerSortDown.red { - background-color: lighten(@red, 50%); - } - // Yellow Table Headings - .yellow { - color: @yellow; - border-bottom-color: @yellow; - } - .headerSortUp.yellow, - .headerSortDown.yellow { - background-color: lighten(@yellow, 40%); - } - // Orange Table Headings - .orange { - color: @orange; - border-bottom-color: @orange; - } - .headerSortUp.orange, - .headerSortDown.orange { - background-color: lighten(@orange, 40%); - } - // Purple Table Headings - .purple { - color: @purple; - border-bottom-color: @purple; - } - .headerSortUp.purple, - .headerSortDown.purple { - background-color: lighten(@purple, 40%); - } -}*/ i { background-image: url(docs/assets/img/glyphicons-halflings-sprite.png); background-position: 0 0; -- cgit v1.2.3 From 3eb80591b2c8bb2850caf27da7d6b8c8b747063a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotrek=20Oko=C5=84ski?= Date: Sat, 26 Nov 2011 19:41:17 +0100 Subject: Progress bars --- bootstrap.css | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 173 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 54c1b0651..224e1a5a6 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 Jan 7 04:20:37 PST 2012 + * Date: Sat Jan 7 13:39:22 CET 2012 */ html, body { margin: 0; @@ -1598,6 +1598,178 @@ i { -moz-opacity: 0.4; opacity: 0.4; } +@-webkit-keyframes progress-bar-stripes { + from { + background-position: 0 0; + } + to { + background-position: 40px 0; + } +} +@-moz-keyframes progress-bar-stripes { + from { + background-position: 0 0; + } + to { + background-position: 40px 0; + } +} +@keyframes progress-bar-stripes { + from { + background-position: 0 0; + } + to { + background-position: 40px 0; + } +} +.progress { + height: 25px; + margin-bottom: 18px; + overflow: hidden; + -webkit-box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.3); + -moz-box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.3); + box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.3); + background-color: #f5f5f5; + background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5)); + background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); + background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5)); + background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); + background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); + background-image: linear-gradient(top, #ffffff, #f5f5f5); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border-radius: 10px; + border: 1px solid #ddd; + border-color: rgba(0, 0, 0, 0); +} +.progress.active .bar { + -webkit-animation: progress-bar-stripes 2s linear infinite; + -moz-animation: progress-bar-stripes 2s linear infinite; + animation: progress-bar-stripes 2s linear infinite; +} +.progress.animated .bar { + -webkit-transition: width 0.6s ease; + -moz-transition: width 0.6s ease; + -ms-transition: width 0.6s ease; + -o-transition: width 0.6s ease; + transition: width 0.6s ease; +} +.progress.danger .bar, .progress.error .bar { + background-color: #c43c35; + background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35)); + background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35)); + background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); + background-image: linear-gradient(top, #ee5f5b, #c43c35); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); +} +.progress.danger.striped .bar, .progress.error.striped .bar { + -webkit-background-size: 40px 40px; + -moz-background-size: 40px 40px; + -o-background-size: 40px 40px; + background-size: 40px 40px; + background-color: #ee5f5b; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.2)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.2)), color-stop(0.75, rgba(255, 255, 255, 0.2)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); + background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); +} +.progress.success .bar { + background-color: #57a957; + background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); + background-image: -moz-linear-gradient(top, #62c462, #57a957); + background-image: -ms-linear-gradient(top, #62c462, #57a957); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); + background-image: -webkit-linear-gradient(top, #62c462, #57a957); + background-image: -o-linear-gradient(top, #62c462, #57a957); + background-image: linear-gradient(top, #62c462, #57a957); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); +} +.progress.success.striped .bar { + -webkit-background-size: 40px 40px; + -moz-background-size: 40px 40px; + -o-background-size: 40px 40px; + background-size: 40px 40px; + background-color: #62c462; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.2)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.2)), color-stop(0.75, rgba(255, 255, 255, 0.2)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); + background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); +} +.progress.info .bar { + background-color: #339bb9; + background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); + background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); + background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9)); + background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); + background-image: -o-linear-gradient(top, #5bc0de, #339bb9); + background-image: linear-gradient(top, #5bc0de, #339bb9); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); +} +.progress.info.striped .bar { + -webkit-background-size: 40px 40px; + -moz-background-size: 40px 40px; + -o-background-size: 40px 40px; + background-size: 40px 40px; + background-color: #5bc0de; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.2)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.2)), color-stop(0.75, rgba(255, 255, 255, 0.2)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); + background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); +} +.progress.striped .bar { + -webkit-background-size: 40px 40px; + -moz-background-size: 40px 40px; + -o-background-size: 40px 40px; + background-size: 40px 40px; + background-color: #62c462; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.2)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.2)), color-stop(0.75, rgba(255, 255, 255, 0.2)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); + background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); +} +.progress .bar { + width: 0%; + height: 100%; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + background-color: #57a957; + background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); + background-image: -moz-linear-gradient(top, #62c462, #57a957); + background-image: -ms-linear-gradient(top, #62c462, #57a957); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); + background-image: -webkit-linear-gradient(top, #62c462, #57a957); + background-image: -o-linear-gradient(top, #62c462, #57a957); + background-image: linear-gradient(top, #62c462, #57a957); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); + border-color: #57a957 #57a957 #3d773d; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + -webkit-box-shadow: inset 0 2px 0 rgba(255, 255, 255, 0.2), inset -1px -1px 0 rgba(0, 0, 0, 0.25), inset 1px 1px 0 rgba(0, 0, 0, 0.25); + -moz-box-shadow: inset 0 2px 0 rgba(255, 255, 255, 0.2), inset -1px -1px 0 rgba(0, 0, 0, 0.25), inset 1px 1px 0 rgba(0, 0, 0, 0.25); + box-shadow: inset 0 2px 0 rgba(255, 255, 255, 0.2), inset -1px -1px 0 rgba(0, 0, 0, 0.25), inset 1px 1px 0 rgba(0, 0, 0, 0.25); + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border-radius: 10px; +} .navbar { overflow: visible; } -- cgit v1.2.3 From a339f0051b21f9e51d47c3eb1fd7d37f126e87a0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 12:22:51 -0800 Subject: fixing tablesorter styles by adding the jquery plugin back to the lib, fixing the docs examples --- bootstrap.css | 59 ++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 48 insertions(+), 11 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 71637d42f..4c56efca5 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 Jan 7 04:34:04 PST 2012 + * Date: Sat Jan 7 12:21:05 PST 2012 */ html, body { margin: 0; @@ -1102,6 +1102,44 @@ table .span12 { width: 924px; margin-left: 0; } +table .header { + cursor: pointer; +} +table .header:after { + content: ""; + float: right; + margin-top: 7px; + border-width: 0 4px 4px; + border-style: solid; + border-color: #000 transparent; + visibility: hidden; +} +table .headerSortUp, table .headerSortDown { + background-color: rgba(141, 192, 219, 0.25); + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); +} +table .header:hover:after { + visibility: visible; +} +table .headerSortDown:after, table .headerSortDown:hover:after { + visibility: visible; + filter: alpha(opacity=60); + -moz-opacity: 0.6; + opacity: 0.6; +} +table .headerSortUp:after { + border-bottom: none; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid #000; + visibility: visible; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + filter: alpha(opacity=60); + -moz-opacity: 0.6; + opacity: 0.6; +} i { background-image: url(docs/assets/img/glyphicons-halflings-sprite.png); background-position: 0 0; @@ -1891,23 +1929,22 @@ i { border-color: #ddd; border-left-color: transparent; } -.tabs .menu-dropdown, .tabs .dropdown-menu { - top: 35px; +.tabs .dropdown-menu { + top: 37px; border-width: 1px; - -webkit-border-radius: 0 6px 6px 6px; - -moz-border-radius: 0 6px 6px 6px; - border-radius: 0 6px 6px 6px; } -.tabs a.menu:after, .tabs .dropdown-toggle:after { - border-top-color: #999; +.tabs .dropdown-toggle .caret { margin-top: 15px; margin-left: 5px; } -.tabs li.open.menu .menu, .tabs .open.dropdown .dropdown-toggle { +.tabs .open .dropdown-toggle { border-color: #999; } -.tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after { - border-top-color: #555; +.tabs .open .dropdown-toggle .caret { + border-top-color: #fff; + filter: alpha(opacity=100); + -moz-opacity: 1; + opacity: 1; } .pills > li > a { padding: 0 15px; -- cgit v1.2.3 From 1438b14f74fc30c3b9bd63bd54d3bcfe5ce33c3c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 15:52:57 -0800 Subject: overhauled docs to include example markup, add language around browser support and classes --- bootstrap.css | 332 +++++++++++++++++++++++++++------------------------------- 1 file changed, 157 insertions(+), 175 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index cc58b2ab8..f6dd39226 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 Jan 7 13:52:27 PST 2012 + * Date: Sat Jan 7 15:52:40 PST 2012 */ html, body { margin: 0; @@ -1574,180 +1574,6 @@ i { -moz-opacity: 0.4; opacity: 0.4; } -@-webkit-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} -/* COMMENTED OUT SO LESS COMPILES -@-moz-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} -*/ -@keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} -.progress { - height: 25px; - margin-bottom: 18px; - overflow: hidden; - -webkit-box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.3); - -moz-box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.3); - box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.3); - background-color: #f5f5f5; - background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5)); - background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5)); - background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); - background-image: linear-gradient(top, #ffffff, #f5f5f5); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); - -webkit-border-radius: 10px; - -moz-border-radius: 10px; - border-radius: 10px; - border: 1px solid #ddd; - border-color: rgba(0, 0, 0, 0); -} -.progress.active .bar { - -webkit-animation: progress-bar-stripes 2s linear infinite; - -moz-animation: progress-bar-stripes 2s linear infinite; - animation: progress-bar-stripes 2s linear infinite; -} -.progress.animated .bar { - -webkit-transition: width 0.6s ease; - -moz-transition: width 0.6s ease; - -ms-transition: width 0.6s ease; - -o-transition: width 0.6s ease; - transition: width 0.6s ease; -} -.progress.danger .bar, .progress.error .bar { - background-color: #c43c35; - background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35)); - background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(top, #ee5f5b, #c43c35); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); -} -.progress.danger.striped .bar, .progress.error.striped .bar { - -webkit-background-size: 40px 40px; - -moz-background-size: 40px 40px; - -o-background-size: 40px 40px; - background-size: 40px 40px; - background-color: #ee5f5b; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.2)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.2)), color-stop(0.75, rgba(255, 255, 255, 0.2)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); -} -.progress.success .bar { - background-color: #57a957; - background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); - background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); - background-image: -webkit-linear-gradient(top, #62c462, #57a957); - background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); -} -.progress.success.striped .bar { - -webkit-background-size: 40px 40px; - -moz-background-size: 40px 40px; - -o-background-size: 40px 40px; - background-size: 40px 40px; - background-color: #62c462; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.2)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.2)), color-stop(0.75, rgba(255, 255, 255, 0.2)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); -} -.progress.info .bar { - background-color: #339bb9; - background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); - background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9)); - background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); - background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(top, #5bc0de, #339bb9); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); -} -.progress.info.striped .bar { - -webkit-background-size: 40px 40px; - -moz-background-size: 40px 40px; - -o-background-size: 40px 40px; - background-size: 40px 40px; - background-color: #5bc0de; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.2)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.2)), color-stop(0.75, rgba(255, 255, 255, 0.2)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); -} -.progress.striped .bar { - -webkit-background-size: 40px 40px; - -moz-background-size: 40px 40px; - -o-background-size: 40px 40px; - background-size: 40px 40px; - background-color: #62c462; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.2)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.2)), color-stop(0.75, rgba(255, 255, 255, 0.2)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); -} -.progress .bar { - width: 0%; - height: 100%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - background-color: #57a957; - background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); - background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); - background-image: -webkit-linear-gradient(top, #62c462, #57a957); - background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); - border-color: #57a957 #57a957 #3d773d; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - -webkit-box-shadow: inset 0 2px 0 rgba(255, 255, 255, 0.2), inset -1px -1px 0 rgba(0, 0, 0, 0.25), inset 1px 1px 0 rgba(0, 0, 0, 0.25); - -moz-box-shadow: inset 0 2px 0 rgba(255, 255, 255, 0.2), inset -1px -1px 0 rgba(0, 0, 0, 0.25), inset 1px 1px 0 rgba(0, 0, 0, 0.25); - box-shadow: inset 0 2px 0 rgba(255, 255, 255, 0.2), inset -1px -1px 0 rgba(0, 0, 0, 0.25), inset 1px 1px 0 rgba(0, 0, 0, 0.25); - -webkit-border-radius: 10px; - -moz-border-radius: 10px; - border-radius: 10px; -} .navbar { overflow: visible; } @@ -3102,6 +2928,162 @@ a.thumbnail:hover { .label.notice { background-color: #62cffc; } +@-webkit-keyframes progress-bar-stripes { + from { + background-position: 0 0; + } + to { + background-position: 40px 0; + } +} +@keyframes progress-bar-stripes { + from { + background-position: 0 0; + } + to { + background-position: 40px 0; + } +} +.progress, .progress .bar { + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.progress { + height: 18px; + margin-bottom: 18px; + background-color: #f9f9f9; + background-image: -khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#f9f9f9)); + background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #f9f9f9)); + background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: linear-gradient(top, #f5f5f5, #f9f9f9); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0); + border: 1px solid #ddd; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); +} +.progress .bar { + width: 0%; + height: 20px; + margin: -1px; + background-color: #57a957; + background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); + background-image: -moz-linear-gradient(top, #62c462, #57a957); + background-image: -ms-linear-gradient(top, #62c462, #57a957); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); + background-image: -webkit-linear-gradient(top, #62c462, #57a957); + background-image: -o-linear-gradient(top, #62c462, #57a957); + background-image: linear-gradient(top, #62c462, #57a957); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); + background-color: #0480be; + background-image: -khtml-gradient(linear, left top, left bottom, from(#149bdf), to(#0480be)); + background-image: -moz-linear-gradient(top, #149bdf, #0480be); + background-image: -ms-linear-gradient(top, #149bdf, #0480be); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #149bdf), color-stop(100%, #0480be)); + background-image: -webkit-linear-gradient(top, #149bdf, #0480be); + background-image: -o-linear-gradient(top, #149bdf, #0480be); + background-image: linear-gradient(top, #149bdf, #0480be); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0); + -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + -webkit-transition: width 0.6s ease; + -moz-transition: width 0.6s ease; + -ms-transition: width 0.6s ease; + -o-transition: width 0.6s ease; + transition: width 0.6s ease; +} +.progress.striped .bar { + background-color: #62c462; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + -webkit-background-size: 40px 40px; + -moz-background-size: 40px 40px; + -o-background-size: 40px 40px; + background-size: 40px 40px; +} +.progress.active .bar { + -webkit-animation: progress-bar-stripes 2s linear infinite; + -moz-animation: progress-bar-stripes 2s linear infinite; + animation: progress-bar-stripes 2s linear infinite; +} +.progress.danger .bar { + background-color: #c43c35; + background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35)); + background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35)); + background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); + background-image: linear-gradient(top, #ee5f5b, #c43c35); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); +} +.progress.danger.striped .bar { + background-color: #ee5f5b; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} +.progress.success .bar { + background-color: #57a957; + background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); + background-image: -moz-linear-gradient(top, #62c462, #57a957); + background-image: -ms-linear-gradient(top, #62c462, #57a957); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); + background-image: -webkit-linear-gradient(top, #62c462, #57a957); + background-image: -o-linear-gradient(top, #62c462, #57a957); + background-image: linear-gradient(top, #62c462, #57a957); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); +} +.progress.success.striped .bar { + background-color: #62c462; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} +.progress.info .bar { + background-color: #339bb9; + background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); + background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); + background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9)); + background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); + background-image: -o-linear-gradient(top, #5bc0de, #339bb9); + background-image: linear-gradient(top, #5bc0de, #339bb9); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); +} +.progress.info.striped .bar { + background-color: #5bc0de; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} .hidden { display: none; visibility: hidden; -- cgit v1.2.3 From 2948d1c3b247a5aff1fd1f15cf72540e3f492f57 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 20:40:28 -0800 Subject: overhaul the entire tabs component structure and docs; remove side nav and make it a nav list to build on new .nav base class --- bootstrap.css | 302 ++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 180 insertions(+), 122 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index f6dd39226..5c9d4aa97 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 Jan 7 15:52:40 PST 2012 + * Date: Sat Jan 7 20:25:41 PST 2012 */ html, body { margin: 0; @@ -516,9 +516,9 @@ pre { background-color: #f5f5f5; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; white-space: pre; white-space: pre-wrap; word-break: break-all; @@ -541,6 +541,7 @@ legend { line-height: 36px; color: #333333; border-bottom: 1px solid #eee; + -webkit-margin-collapse: separate; } label, input, @@ -1502,6 +1503,16 @@ i { background-image: linear-gradient(top, #049cdb, #0064cd); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0); + background-color: #0077b3; + background-image: -khtml-gradient(linear, left top, left bottom, from(#0088cc), to(#0077b3)); + background-image: -moz-linear-gradient(top, #0088cc, #0077b3); + background-image: -ms-linear-gradient(top, #0088cc, #0077b3); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #0088cc), color-stop(100%, #0077b3)); + background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); + background-image: -o-linear-gradient(top, #0088cc, #0077b3); + background-image: linear-gradient(top, #0088cc, #0077b3); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0077b3', GradientType=0); -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075); -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075); @@ -1692,19 +1703,51 @@ i { left: 0; z-index: 1010; } -.nav { +.navbar .nav { position: relative; left: 0; display: block; float: left; margin: 0 10px 0 0; + /* // Dropdowns within the .nav + .dropdown-toggle:hover, + .dropdown.open .dropdown-toggle { + background: #444; + background: rgba(255,255,255,.05); + } + .dropdown-menu { + background-color: #333; + .dropdown-toggle { + color: @white; + &.open { + background: #444; + background: rgba(255,255,255,.05); + } + } + li a { + padding: 4px 15px; + color: #999; + text-shadow: 0 1px 0 rgba(0,0,0,.5); + &:hover { + #gradient > .vertical(#292929,#191919); + color: @white; + } + } + .active a { + color: @white; + } + .divider { + background-color: #222; + border-color: #444; + } + }*/ + } -.nav > li { +.navbar .nav > li { display: block; float: left; } -.nav a { - display: block; +.navbar .nav a { float: none; padding: 10px 10px 11px; line-height: 19px; @@ -1712,15 +1755,15 @@ i { text-decoration: none; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } -.nav a:hover { +.navbar .nav a:hover { color: #ffffff; text-decoration: none; } -.nav .active > a { +.navbar .nav .active > a { background-color: #222; background-color: rgba(0, 0, 0, 0.5); } -.nav .vertical-divider { +.navbar .nav .vertical-divider { height: 40px; width: 1px; margin: 0 5px; @@ -1728,58 +1771,55 @@ i { background-color: #222; border-right: 1px solid #444; } -.nav.secondary-nav { +.navbar .nav.secondary-nav { float: right; margin-left: 10px; margin-right: 0; } -.nav.secondary-nav .dropdown-menu { +.navbar .nav.secondary-nav .dropdown-menu { right: 0; border: 0; } -.nav .dropdown-toggle:hover, .nav .dropdown.open .dropdown-toggle { - background: #444; - background: rgba(255, 255, 255, 0.05); +.nav { + margin-left: 0; + margin-bottom: 18px; + list-style: none; } -.nav .dropdown-menu { - background-color: #333; +.nav > li > a { + display: block; } -.nav .dropdown-menu .dropdown-toggle { - color: #ffffff; +.nav > li > a:hover { + text-decoration: none; + background-color: #eee; } -.nav .dropdown-menu .dropdown-toggle.open { - background: #444; - background: rgba(255, 255, 255, 0.05); -} -.nav .dropdown-menu li a { - padding: 4px 15px; - color: #999; - text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); -} -.nav .dropdown-menu li a:hover { - background-color: #191919; - background-image: -khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919)); - background-image: -moz-linear-gradient(top, #292929, #191919); - background-image: -ms-linear-gradient(top, #292929, #191919); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919)); - background-image: -webkit-linear-gradient(top, #292929, #191919); - background-image: -o-linear-gradient(top, #292929, #191919); - background-image: linear-gradient(top, #292929, #191919); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#292929', endColorstr='#191919', GradientType=0); - color: #ffffff; +.nav.list { + padding-left: 14px; + padding-right: 14px; + margin-bottom: 0; } -.nav .dropdown-menu .active a { - color: #ffffff; +.nav.list > li > a, .nav.list .nav-header { + display: block; + padding: 3px 15px; + margin-left: -15px; + margin-right: -15px; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); } -.nav .dropdown-menu .divider { - background-color: #222; - border-color: #444; +.nav.list .nav-header { + font-size: 11px; + font-weight: bold; + line-height: 18px; + color: #999999; + text-transform: uppercase; +} +.nav.list > li + .nav-header { + margin-top: 9px; +} +.nav.list .active > a { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); + background-color: #0088cc; } .tabs, .pills { - padding: 0; - margin: 0 0 20px; - list-style: none; zoom: 1; } .tabs:before, @@ -1798,29 +1838,26 @@ i { float: left; } .tabs > li > a, .pills > li > a { - display: block; + padding-right: 12px; + padding-left: 12px; + margin-right: 2px; + line-height: 14px; } .tabs { - border-color: #ddd; - border-style: solid; - border-width: 0 0 1px; + border-bottom: 1px solid #ddd; } .tabs > li { - position: relative; margin-bottom: -1px; } .tabs > li > a { - padding: 0 15px; - margin-right: 2px; - line-height: 36px; + padding-top: 9px; + padding-bottom: 9px; border: 1px solid transparent; -webkit-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0; } .tabs > li > a:hover { - text-decoration: none; - background-color: #eee; border-color: #eee #eee #ddd; } .tabs .active > a, .tabs .active > a:hover { @@ -1830,6 +1867,76 @@ i { border-bottom-color: transparent; cursor: default; } +.pills > li > a { + padding-top: 8px; + padding-bottom: 8px; + margin-top: 2px; + margin-bottom: 2px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} +.pills .active > a, .pills .active > a:hover { + color: #ffffff; + background-color: #0088cc; +} +.nav.stacked > li { + float: none; +} +.nav.stacked > li > a { + margin-right: 0; +} +.tabs.stacked { + border-bottom: 0; +} +.tabs.stacked > li > a { + border: 1px solid #ddd; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.tabs.stacked > li:first-child > a { + -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; +} +.tabs.stacked > li:last-child > a { + -webkit-border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + border-radius: 0 0 4px 4px; +} +.tabs.stacked > li > a:hover { + border-color: #ddd; + z-index: 2; +} +.pills.stacked > li > a { + margin-bottom: 3px; +} +.pills.stacked > li:last-child > a { + margin-bottom: 1px; +} +.tabs .dropdown-menu, .pills .dropdown-menu { + top: 33px; + border-width: 1px; +} +.pills .dropdown-menu { + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret { + margin-top: 6px; +} +.tabs .open .dropdown-toggle, .pills .open .dropdown-toggle { + background-color: #999; + border-color: #999; +} +.tabs .open .caret, .pills .open .caret { + border-top-color: #fff; + filter: alpha(opacity=100); + -moz-opacity: 1; + opacity: 1; +} .tabbable { margin-bottom: 18px; } @@ -1929,46 +2036,6 @@ i { border-color: #ddd; border-left-color: transparent; } -.tabs .dropdown-menu { - top: 37px; - border-width: 1px; -} -.tabs .dropdown-toggle .caret { - margin-top: 15px; - margin-left: 5px; -} -.tabs .open .dropdown-toggle { - border-color: #999; -} -.tabs .open .dropdown-toggle .caret { - border-top-color: #fff; - filter: alpha(opacity=100); - -moz-opacity: 1; - opacity: 1; -} -.pills > li > a { - padding: 0 15px; - margin: 5px 3px 5px 0; - line-height: 30px; - text-shadow: 0 1px 1px #ffffff; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} -.pills > li > a:hover { - color: #ffffff; - text-decoration: none; - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); - background-color: #005580; -} -.pills .active > a { - color: #ffffff; - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); - background-color: #0088cc; -} -.pills-vertical > li { - float: none; -} .tab-content > .tab-pane, .pill-content > .pill-pane { display: none; } @@ -2060,27 +2127,29 @@ i { color: #333333; background-color: #eee; } -.side-nav { - padding: 9px 0; +/*.side-nav { + padding: @baseLineHeight / 2 0; } -.side-nav .nav-label, .side-nav .nav-item { +.side-nav .nav-label, +.side-nav .nav-item { display: block; padding: 3px 15px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + text-shadow: 0 1px 0 rgba(255,255,255,.5); } .side-nav .nav-label { font-size: 11px; - line-height: 18px; - color: #999999; + line-height: @baseLineHeight; + color: @grayLight; text-transform: uppercase; } .side-nav .nav-group { - margin: 0; + margin: 0; // clear default ul margins list-style: none; } .side-nav .nav-group + .nav-label { margin-top: 9px; } + .side-nav .nav-item { font-weight: bold; } @@ -2092,22 +2161,11 @@ i { } .side-nav .active .nav-item { color: #fff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); - background-color: #999999; - background-image: -khtml-gradient(linear, left top, left bottom, from(#cccccc), to(#999999)); - background-image: -moz-linear-gradient(top, #cccccc, #999999); - background-image: -ms-linear-gradient(top, #cccccc, #999999); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #cccccc), color-stop(100%, #999999)); - background-image: -webkit-linear-gradient(top, #cccccc, #999999); - background-image: -o-linear-gradient(top, #cccccc, #999999); - background-image: linear-gradient(top, #cccccc, #999999); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#999999', GradientType=0); - -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.05), inset 0 -1px 0 rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.05), inset 0 -1px 0 rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.05), inset 0 -1px 0 rgba(0, 0, 0, 0.05); -} -.breadcrumb { + text-shadow: 0 -1px 0 rgba(0,0,0,.3); + #gradient > .vertical(#ccc, #999); + @shadow: inset 0 1px 0 rgba(0,0,0,.05), inset 0 -1px 0 rgba(0,0,0,.05); + .box-shadow(@shadow); +}*/.breadcrumb { padding: 7px 14px; margin: 0 0 18px; background-color: #f5f5f5; -- cgit v1.2.3 From 95f47026cf55dc029d266e80bb4fab00b85af0e8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 21:09:02 -0800 Subject: fix up dropdowns and navbar docs for the new dropdown styles --- bootstrap.css | 251 ++++++++++++++++++++-------------------------------------- 1 file changed, 85 insertions(+), 166 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 5c9d4aa97..f16ce9e3d 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 Jan 7 20:25:41 PST 2012 + * Date: Sat Jan 7 20:56:31 PST 2012 */ html, body { margin: 0; @@ -1441,7 +1441,7 @@ i { margin-top: 8px; margin-left: 2px; } -.dropdown:hover .caret { +.dropdown:hover .caret, .open.dropdown .caret { filter: alpha(opacity=100); -moz-opacity: 1; opacity: 1; @@ -1709,45 +1709,15 @@ i { display: block; float: left; margin: 0 10px 0 0; - /* // Dropdowns within the .nav - .dropdown-toggle:hover, - .dropdown.open .dropdown-toggle { - background: #444; - background: rgba(255,255,255,.05); - } - .dropdown-menu { - background-color: #333; - .dropdown-toggle { - color: @white; - &.open { - background: #444; - background: rgba(255,255,255,.05); - } - } - li a { - padding: 4px 15px; - color: #999; - text-shadow: 0 1px 0 rgba(0,0,0,.5); - &:hover { - #gradient > .vertical(#292929,#191919); - color: @white; - } - } - .active a { - color: @white; - } - .divider { - background-color: #222; - border-color: #444; - } - }*/ - +} +.navbar .nav.pull-right { + float: right; } .navbar .nav > li { display: block; float: left; } -.navbar .nav a { +.navbar .nav > li > a { float: none; padding: 10px 10px 11px; line-height: 19px; @@ -1755,7 +1725,8 @@ i { text-decoration: none; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } -.navbar .nav a:hover { +.navbar .nav > li > a:hover { + background-color: transparent; color: #ffffff; text-decoration: none; } @@ -1763,7 +1734,7 @@ i { background-color: #222; background-color: rgba(0, 0, 0, 0.5); } -.navbar .nav .vertical-divider { +.navbar .vertical-divider { height: 40px; width: 1px; margin: 0 5px; @@ -1771,15 +1742,86 @@ i { background-color: #222; border-right: 1px solid #444; } -.navbar .nav.secondary-nav { - float: right; +.navbar .nav.pull-right { margin-left: 10px; margin-right: 0; } -.navbar .nav.secondary-nav .dropdown-menu { +.navbar .dropdown-menu { + top: 42px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.navbar .dropdown-menu:before { + content: ''; + display: inline-block; + border-left: 7px solid transparent; + border-right: 7px solid transparent; + border-bottom: 7px solid #ccc; + border-bottom-color: rgba(0, 0, 0, 0.1); + position: absolute; + top: -7px; + left: 12px; +} +.navbar .dropdown-menu:after { + content: ''; + display: inline-block; + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-bottom: 6px solid #fff; + position: absolute; + top: -6px; + left: 13px; +} +.navbar .dropdown-toggle .caret, .navbar .open.dropdown .caret { + border-top-color: #fff; +} +.navbar .open .dropdown-toggle { + background-color: transparent; +} +.navbar .nav.pull-right .dropdown-menu { right: 0; - border: 0; } +.navbar .nav.pull-right .dropdown-menu:before { + left: auto; + right: 12px; +} +.navbar .nav.pull-right .dropdown-menu:after { + left: auto; + right: 13px; +} +/* // Dropdowns within the .nav + .dropdown-toggle:hover, + .dropdown.open .dropdown-toggle { + background: #444; + background: rgba(255,255,255,.05); + } + .dropdown-menu { + background-color: #333; + .dropdown-toggle { + color: @white; + &.open { + background: #444; + background: rgba(255,255,255,.05); + } + } + li a { + padding: 4px 15px; + color: #999; + text-shadow: 0 1px 0 rgba(0,0,0,.5); + &:hover { + #gradient > .vertical(#292929,#191919); + color: @white; + } + } + .active a { + color: @white; + } + .divider { + background-color: #222; + border-color: #444; + } + }*/ .nav { margin-left: 0; margin-bottom: 18px; @@ -2042,130 +2084,7 @@ i { .tab-content > .active, .pill-content > .active { display: block; } -.step-nav { - position: relative; - margin: 0 0 18px; - list-style: none; - line-height: 30px; - text-align: center; - background-color: #f5f5f5; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} -.step-nav li { - display: inline; - color: #999999; -} -.step-nav .prev, .step-nav .next { - position: absolute; - top: 6px; -} -.step-nav .prev { - left: 15px; -} -.step-nav .next { - right: 15px; -} -.step-nav .dot { - display: inline-block; - width: 10px; - height: 10px; - margin: 0 3px; - text-indent: -999em; - background-color: #999999; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25); -} -.step-nav .dot:hover, .step-nav .active .dot { - background-color: #333333; -} -.subnav { - background-color: #eeeeee; - background-image: -khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#eeeeee)); - background-image: -moz-linear-gradient(top, #f5f5f5, #eeeeee); - background-image: -ms-linear-gradient(top, #f5f5f5, #eeeeee); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #eeeeee)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #eeeeee); - background-image: -o-linear-gradient(top, #f5f5f5, #eeeeee); - background-image: linear-gradient(top, #f5f5f5, #eeeeee); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#eeeeee', GradientType=0); - -webkit-box-shadow: inset 0 1px 0 #ffffff, 0 0 5px rgba(0, 0, 0, 0.5); - -moz-box-shadow: inset 0 1px 0 #ffffff, 0 0 5px rgba(0, 0, 0, 0.5); - box-shadow: inset 0 1px 0 #ffffff, 0 0 5px rgba(0, 0, 0, 0.5); -} -.subnav a { - padding: 8px 10px; - font-size: 12px; - color: #0088cc; - text-shadow: 0 1px 0 #fff; - border-left: 1px solid #f9f9f9; - border-right: 1px solid #e5e5e5; -} -.subnav a:hover { - color: #005580; - background-color: #eee; -} -.subnav li:first-child a { - border-left: 0; - -webkit-border-radius: 6px 0 0 6px; - -moz-border-radius: 6px 0 0 6px; - border-radius: 6px 0 0 6px; -} -.subnav li:last-child a { - border-right: 0; - -webkit-border-radius: 0 6px 6px 0; - -moz-border-radius: 0 6px 6px 0; - border-radius: 0 6px 6px 0; -} -.subnav ul .active > a { - color: #333333; - background-color: #eee; -} -/*.side-nav { - padding: @baseLineHeight / 2 0; -} -.side-nav .nav-label, -.side-nav .nav-item { - display: block; - padding: 3px 15px; - text-shadow: 0 1px 0 rgba(255,255,255,.5); -} -.side-nav .nav-label { - font-size: 11px; - line-height: @baseLineHeight; - color: @grayLight; - text-transform: uppercase; -} -.side-nav .nav-group { - margin: 0; // clear default ul margins - list-style: none; -} -.side-nav .nav-group + .nav-label { - margin-top: 9px; -} - -.side-nav .nav-item { - font-weight: bold; -} -.side-nav .nav-item i { - vertical-align: -2px; -} -.side-nav .nav-item:hover { - text-decoration: none; -} -.side-nav .active .nav-item { - color: #fff; - text-shadow: 0 -1px 0 rgba(0,0,0,.3); - #gradient > .vertical(#ccc, #999); - @shadow: inset 0 1px 0 rgba(0,0,0,.05), inset 0 -1px 0 rgba(0,0,0,.05); - .box-shadow(@shadow); -}*/.breadcrumb { +.breadcrumb { padding: 7px 14px; margin: 0 0 18px; background-color: #f5f5f5; -- cgit v1.2.3 From ecffa038903412419163c7aed9299a7289ad14ad Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 21:10:17 -0800 Subject: nuke unused code, add to upgrading page --- bootstrap.css | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index f16ce9e3d..6d9d78ebb 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 Jan 7 20:56:31 PST 2012 + * Date: Sat Jan 7 21:10:08 PST 2012 */ html, body { margin: 0; @@ -1790,38 +1790,6 @@ i { left: auto; right: 13px; } -/* // Dropdowns within the .nav - .dropdown-toggle:hover, - .dropdown.open .dropdown-toggle { - background: #444; - background: rgba(255,255,255,.05); - } - .dropdown-menu { - background-color: #333; - .dropdown-toggle { - color: @white; - &.open { - background: #444; - background: rgba(255,255,255,.05); - } - } - li a { - padding: 4px 15px; - color: #999; - text-shadow: 0 1px 0 rgba(0,0,0,.5); - &:hover { - #gradient > .vertical(#292929,#191919); - color: @white; - } - } - .active a { - color: @white; - } - .divider { - background-color: #222; - border-color: #444; - } - }*/ .nav { margin-left: 0; margin-bottom: 18px; -- cgit v1.2.3 From 22e0c5f7c8c092531b111b6042a7d7ee87d406b6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 22:06:44 -0800 Subject: redoing the tabs on bottom, left, and right --- bootstrap.css | 180 ++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 118 insertions(+), 62 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 6d9d78ebb..ebb3cbe29 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 Jan 7 21:10:08 PST 2012 + * Date: Sat Jan 7 22:06:30 PST 2012 */ html, body { margin: 0; @@ -1948,104 +1948,160 @@ i { opacity: 1; } .tabbable { - margin-bottom: 18px; + zoom: 1; } -.tabbable .tabs { - margin-bottom: 0; +.tabbable:before, .tabbable:after { + display: table; + *display: inline; + content: ""; + zoom: 1; +} +.tabbable:after { + clear: both; +} +.tabs-below .tabs, .tabs-right .tabs, .tabs-left .tabs { border-bottom: 0; } -.tabbable .tab-content { - padding: 19px; - border: 1px solid #ddd; +.tabs-below .tabs { + border-top: 1px solid #ddd; } -.tabbable.tabs-bottom .tabs > li { +.tabs-below .tabs > li { margin-top: -1px; margin-bottom: 0; } -.tabbable.tabs-bottom .tabs > li > a { +.tabs-below .tabs > li > a { -webkit-border-radius: 0 0 4px 4px; -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px; } -.tabbable.tabs-bottom .tabs > li > a:hover { +.tabs-below .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 { +.tabs-below .tabs .active > a, .tabs-below .tabs .active > a:hover { border-color: transparent #ddd #ddd #ddd; } -.tabbable.tabs-left, .tabbable.tabs-right { - zoom: 1; -} -.tabbable.tabs-left:before, -.tabbable.tabs-right:before, -.tabbable.tabs-left:after, -.tabbable.tabs-right:after { - display: table; - *display: inline; - content: ""; - zoom: 1; -} -.tabbable.tabs-left:after, .tabbable.tabs-right:after { - clear: both; -} -.tabbable.tabs-left .tabs, .tabbable.tabs-right .tabs { - width: 100px; -} -.tabbable.tabs-left .tabs > li, .tabbable.tabs-right .tabs > li { +.tabs-left .tabs > li, .tabs-right .tabs > li { float: none; - margin-bottom: -1px; -} -.tabbable.tabs-left .tabs > li > a, .tabbable.tabs-right .tabs > li > a { - margin-bottom: 2px; -} -.tabbable.tabs-left .tabs > li > a:hover, .tabbable.tabs-right .tabs > li > a:hover { - border-color: transparent; } -.tabbable.tabs-left .tab-content { - margin-left: 100px; +.tabs-left .tabs > li > a, .tabs-right .tabs > li > a { + min-width: 74px; + margin-right: 0; + margin-bottom: 3px; } -.tabbable.tabs-left .tabs { +.tabs-left .tabs { float: left; + margin-right: 19px; + border-right: 1px solid #ddd; } -.tabbable.tabs-left .tabs > li { +.tabs-left .tabs > li > a { margin-right: -1px; -} -.tabbable.tabs-left .tabs > li > a { - margin-right: 0; -webkit-border-radius: 4px 0 0 4px; -moz-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; } -.tabbable.tabs-left .tabs > li > a:hover { - border-right-color: #ddd; -} -.tabbable.tabs-left .tabs .active > a, .tabbable.tabs-left .tabs .active > a:hover { - border-color: #ddd; - border-right-color: transparent; +.tabs-left .tabs > li > a:hover { + border-color: #eee #ddd #eee #eee; } -.tabbable.tabs-right .tab-content { - margin-right: 100px; +.tabs-left .tabs .active > a, .tabs-left .tabs .active > a:hover { + border-color: #ddd transparent #ddd #ddd; } -.tabbable.tabs-right .tabs { +.tabs-right .tabs { float: right; + margin-left: 19px; + border-left: 1px solid #ddd; } -.tabbable.tabs-right .tabs > li { +.tabs-right .tabs > li > a { margin-left: -1px; -} -.tabbable.tabs-right .tabs > li > a { - margin-left: 0; -webkit-border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; } -.tabbable.tabs-right .tabs > li > a:hover { - border-left-color: #ddd; +.tabs-right .tabs > li > a:hover { + border-color: #eee #eee #eee #ddd; } -.tabbable.tabs-right .tabs .active > a, .tabbable.tabs-right .tabs .active > a:hover { - border-color: #ddd; - border-left-color: transparent; +.tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover { + border-color: #ddd #ddd #ddd transparent; +} +/* +.tabbable { + + // Tabs on left and right + &.tabs-left, + &.tabs-right { + .clearfix(); + .tabs { + // Give a fixed width to avoid floating .tab-con + width: 100px; + // Unfloat them so they stack + > li { + float: none; + margin-bottom: -1px; + > a { + margin-bottom: 2px; + &:hover { + border-color: transparent; + } + } + } + } + } + + // Tabs on left + &.tabs-left { + .tab-content { + margin-left: 100px; + } + .tabs { + float: left; + > li { + margin-right: -1px; + > a { + margin-right: 0; + .border-radius(4px 0 0 4px); + + &:hover { + border-right-color: #ddd; + } + } + } + // Active state + .active > a, + .active > a:hover { + border-color: #ddd; + border-right-color: transparent; + } + } + } + + // Tabs on right + &.tabs-right { + .tab-content { + margin-right: 100px; + } + .tabs { + float: right; + > li { + margin-left: -1px; + > a { + margin-left: 0; + .border-radius(0 4px 4px 0); + + &:hover { + border-left-color: #ddd; + } + } + } + // Active state + .active > a, + .active > a:hover { + border-color: #ddd; + border-left-color: transparent; + } + } + } } +*/ .tab-content > .tab-pane, .pill-content > .pill-pane { display: none; } -- cgit v1.2.3 From d170224457581b6ab7305b29b4e2a15cb50ab853 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 23:21:40 -0800 Subject: fix progress bars by removing border and negative margins --- bootstrap.css | 108 +++++----------------------------------------------------- 1 file changed, 9 insertions(+), 99 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index ebb3cbe29..6417871fb 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 Jan 7 22:06:30 PST 2012 + * Date: Sat Jan 7 23:21:05 PST 2012 */ html, body { margin: 0; @@ -1962,6 +1962,12 @@ i { .tabs-below .tabs, .tabs-right .tabs, .tabs-left .tabs { border-bottom: 0; } +.tab-content > .tab-pane, .pill-content > .pill-pane { + display: none; +} +.tab-content > .active, .pill-content > .active { + display: block; +} .tabs-below .tabs { border-top: 1px solid #ddd; } @@ -2023,91 +2029,6 @@ i { .tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover { border-color: #ddd #ddd #ddd transparent; } -/* -.tabbable { - - // Tabs on left and right - &.tabs-left, - &.tabs-right { - .clearfix(); - .tabs { - // Give a fixed width to avoid floating .tab-con - width: 100px; - // Unfloat them so they stack - > li { - float: none; - margin-bottom: -1px; - > a { - margin-bottom: 2px; - &:hover { - border-color: transparent; - } - } - } - } - } - - // Tabs on left - &.tabs-left { - .tab-content { - margin-left: 100px; - } - .tabs { - float: left; - > li { - margin-right: -1px; - > a { - margin-right: 0; - .border-radius(4px 0 0 4px); - - &:hover { - border-right-color: #ddd; - } - } - } - // Active state - .active > a, - .active > a:hover { - border-color: #ddd; - border-right-color: transparent; - } - } - } - - // Tabs on right - &.tabs-right { - .tab-content { - margin-right: 100px; - } - .tabs { - float: right; - > li { - margin-left: -1px; - > a { - margin-left: 0; - .border-radius(0 4px 4px 0); - - &:hover { - border-left-color: #ddd; - } - } - } - // Active state - .active > a, - .active > a:hover { - border-color: #ddd; - border-left-color: transparent; - } - } - } -} -*/ -.tab-content > .tab-pane, .pill-content > .pill-pane { - display: none; -} -.tab-content > .active, .pill-content > .active { - display: block; -} .breadcrumb { padding: 7px 14px; margin: 0 0 18px; @@ -2963,25 +2884,14 @@ a.thumbnail:hover { background-image: linear-gradient(top, #f5f5f5, #f9f9f9); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0); - border: 1px solid #ddd; -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); } .progress .bar { width: 0%; - height: 20px; - margin: -1px; - background-color: #57a957; - background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); - background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); - background-image: -webkit-linear-gradient(top, #62c462, #57a957); - background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); + height: 18px; + margin: ; background-color: #0480be; background-image: -khtml-gradient(linear, left top, left bottom, from(#149bdf), to(#0480be)); background-image: -moz-linear-gradient(top, #149bdf, #0480be); -- cgit v1.2.3 From 3c2f82f469be4792e85eb73fd1e3b882dcadd48d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 23:31:00 -0800 Subject: recomment out the moz stuff for progress bars since less can't compile it right now --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 6417871fb..2881afefd 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 Jan 7 23:21:05 PST 2012 + * Date: Sat Jan 7 23:30:30 PST 2012 */ html, body { margin: 0; -- cgit v1.2.3 From 4478df768168fe41599508688046612bf5f1e526 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 8 Jan 2012 00:49:38 -0800 Subject: first pass at ultra basic autocomplete --- bootstrap.css | 243 ++-------------------------------------------------------- 1 file changed, 8 insertions(+), 235 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index ebb3cbe29..7d6263c6b 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 Jan 7 22:06:30 PST 2012 + * Date: Sat Jan 7 23:50:13 PST 2012 */ html, body { margin: 0; @@ -1489,7 +1489,7 @@ i { line-height: 18px; color: #555555; } -.dropdown-menu a:hover { +.dropdown-menu.typeahead .active a, .dropdown-menu a:hover { color: #fff; text-decoration: none; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); @@ -1962,6 +1962,12 @@ i { .tabs-below .tabs, .tabs-right .tabs, .tabs-left .tabs { border-bottom: 0; } +.tab-content > .tab-pane, .pill-content > .pill-pane { + display: none; +} +.tab-content > .active, .pill-content > .active { + display: block; +} .tabs-below .tabs { border-top: 1px solid #ddd; } @@ -2023,91 +2029,6 @@ i { .tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover { border-color: #ddd #ddd #ddd transparent; } -/* -.tabbable { - - // Tabs on left and right - &.tabs-left, - &.tabs-right { - .clearfix(); - .tabs { - // Give a fixed width to avoid floating .tab-con - width: 100px; - // Unfloat them so they stack - > li { - float: none; - margin-bottom: -1px; - > a { - margin-bottom: 2px; - &:hover { - border-color: transparent; - } - } - } - } - } - - // Tabs on left - &.tabs-left { - .tab-content { - margin-left: 100px; - } - .tabs { - float: left; - > li { - margin-right: -1px; - > a { - margin-right: 0; - .border-radius(4px 0 0 4px); - - &:hover { - border-right-color: #ddd; - } - } - } - // Active state - .active > a, - .active > a:hover { - border-color: #ddd; - border-right-color: transparent; - } - } - } - - // Tabs on right - &.tabs-right { - .tab-content { - margin-right: 100px; - } - .tabs { - float: right; - > li { - margin-left: -1px; - > a { - margin-left: 0; - .border-radius(0 4px 4px 0); - - &:hover { - border-left-color: #ddd; - } - } - } - // Active state - .active > a, - .active > a:hover { - border-color: #ddd; - border-left-color: transparent; - } - } - } -} -*/ -.tab-content > .tab-pane, .pill-content > .pill-pane { - display: none; -} -.tab-content > .active, .pill-content > .active { - display: block; -} .breadcrumb { padding: 7px 14px; margin: 0 0 18px; @@ -2937,154 +2858,6 @@ a.thumbnail:hover { background-position: 40px 0; } } -@keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} -.progress, .progress .bar { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.progress { - height: 18px; - margin-bottom: 18px; - background-color: #f9f9f9; - background-image: -khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#f9f9f9)); - background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #f9f9f9)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(top, #f5f5f5, #f9f9f9); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0); - border: 1px solid #ddd; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -} -.progress .bar { - width: 0%; - height: 20px; - margin: -1px; - background-color: #57a957; - background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); - background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); - background-image: -webkit-linear-gradient(top, #62c462, #57a957); - background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); - background-color: #0480be; - background-image: -khtml-gradient(linear, left top, left bottom, from(#149bdf), to(#0480be)); - background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -ms-linear-gradient(top, #149bdf, #0480be); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #149bdf), color-stop(100%, #0480be)); - background-image: -webkit-linear-gradient(top, #149bdf, #0480be); - background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(top, #149bdf, #0480be); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0); - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - -webkit-transition: width 0.6s ease; - -moz-transition: width 0.6s ease; - -ms-transition: width 0.6s ease; - -o-transition: width 0.6s ease; - transition: width 0.6s ease; -} -.progress.striped .bar { - background-color: #62c462; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - -webkit-background-size: 40px 40px; - -moz-background-size: 40px 40px; - -o-background-size: 40px 40px; - background-size: 40px 40px; -} -.progress.active .bar { - -webkit-animation: progress-bar-stripes 2s linear infinite; - -moz-animation: progress-bar-stripes 2s linear infinite; - animation: progress-bar-stripes 2s linear infinite; -} -.progress.danger .bar { - background-color: #c43c35; - background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35)); - background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(top, #ee5f5b, #c43c35); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); -} -.progress.danger.striped .bar { - background-color: #ee5f5b; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} -.progress.success .bar { - background-color: #57a957; - background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); - background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); - background-image: -webkit-linear-gradient(top, #62c462, #57a957); - background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); -} -.progress.success.striped .bar { - background-color: #62c462; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} -.progress.info .bar { - background-color: #339bb9; - background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); - background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9)); - background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); - background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(top, #5bc0de, #339bb9); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); -} -.progress.info.striped .bar { - background-color: #5bc0de; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} .hidden { display: none; visibility: hidden; -- cgit v1.2.3 From 19986b3dd8e921e9f0b4e238af6b4af83ef5bebe Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jan 2012 01:45:49 -0800 Subject: remove / on js, fix link to typeahead, remove old gradient on dropdown hover --- bootstrap.css | 149 +++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 138 insertions(+), 11 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index a46f6ca85..1439ad4bb 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 Jan 8 00:50:20 PST 2012 + * Date: Sun Jan 8 01:45:29 PST 2012 */ html, body { margin: 0; @@ -1493,16 +1493,6 @@ i { color: #fff; text-decoration: none; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0064cd; - background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd)); - background-image: -moz-linear-gradient(top, #049cdb, #0064cd); - background-image: -ms-linear-gradient(top, #049cdb, #0064cd); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd)); - background-image: -webkit-linear-gradient(top, #049cdb, #0064cd); - background-image: -o-linear-gradient(top, #049cdb, #0064cd); - background-image: linear-gradient(top, #049cdb, #0064cd); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0); background-color: #0077b3; background-image: -khtml-gradient(linear, left top, left bottom, from(#0088cc), to(#0077b3)); background-image: -moz-linear-gradient(top, #0088cc, #0077b3); @@ -2858,6 +2848,143 @@ a.thumbnail:hover { background-position: 40px 0; } } +@keyframes progress-bar-stripes { + from { + background-position: 0 0; + } + to { + background-position: 40px 0; + } +} +.progress, .progress .bar { + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.progress { + height: 18px; + margin-bottom: 18px; + background-color: #f9f9f9; + background-image: -khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#f9f9f9)); + background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #f9f9f9)); + background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: linear-gradient(top, #f5f5f5, #f9f9f9); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0); + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); +} +.progress .bar { + width: 0%; + height: 18px; + margin: ; + background-color: #0480be; + background-image: -khtml-gradient(linear, left top, left bottom, from(#149bdf), to(#0480be)); + background-image: -moz-linear-gradient(top, #149bdf, #0480be); + background-image: -ms-linear-gradient(top, #149bdf, #0480be); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #149bdf), color-stop(100%, #0480be)); + background-image: -webkit-linear-gradient(top, #149bdf, #0480be); + background-image: -o-linear-gradient(top, #149bdf, #0480be); + background-image: linear-gradient(top, #149bdf, #0480be); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0); + -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + -webkit-transition: width 0.6s ease; + -moz-transition: width 0.6s ease; + -ms-transition: width 0.6s ease; + -o-transition: width 0.6s ease; + transition: width 0.6s ease; +} +.progress.striped .bar { + background-color: #62c462; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + -webkit-background-size: 40px 40px; + -moz-background-size: 40px 40px; + -o-background-size: 40px 40px; + background-size: 40px 40px; +} +.progress.active .bar { + -webkit-animation: progress-bar-stripes 2s linear infinite; + -moz-animation: progress-bar-stripes 2s linear infinite; + animation: progress-bar-stripes 2s linear infinite; +} +.progress.danger .bar { + background-color: #c43c35; + background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35)); + background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35)); + background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); + background-image: linear-gradient(top, #ee5f5b, #c43c35); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); +} +.progress.danger.striped .bar { + background-color: #ee5f5b; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} +.progress.success .bar { + background-color: #57a957; + background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); + background-image: -moz-linear-gradient(top, #62c462, #57a957); + background-image: -ms-linear-gradient(top, #62c462, #57a957); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); + background-image: -webkit-linear-gradient(top, #62c462, #57a957); + background-image: -o-linear-gradient(top, #62c462, #57a957); + background-image: linear-gradient(top, #62c462, #57a957); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); +} +.progress.success.striped .bar { + background-color: #62c462; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} +.progress.info .bar { + background-color: #339bb9; + background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); + background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); + background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9)); + background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); + background-image: -o-linear-gradient(top, #5bc0de, #339bb9); + background-image: linear-gradient(top, #5bc0de, #339bb9); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); +} +.progress.info.striped .bar { + background-color: #5bc0de; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} .hidden { display: none; visibility: hidden; -- cgit v1.2.3 From b780034a65faf99acffb2c5cea27a98883ddf819 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jan 2012 01:50:12 -0800 Subject: clean up some spacing on the dropdown for typeahead --- bootstrap.css | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 1439ad4bb..5eb8a4a7c 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 Jan 8 01:45:29 PST 2012 + * Date: Sun Jan 8 01:50:02 PST 2012 */ html, body { margin: 0; @@ -1489,7 +1489,7 @@ i { line-height: 18px; color: #555555; } -.dropdown-menu.typeahead .active a, .dropdown-menu a:hover { +.dropdown-menu a:hover, .dropdown-menu .active > a { color: #fff; text-decoration: none; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); @@ -1515,6 +1515,12 @@ i { .dropdown.open .dropdown-menu { display: block; } +.typeahead { + margin-top: 2px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} .well { min-height: 20px; padding: 19px; -- cgit v1.2.3 From 9daf1661c5c9cce161e1981b484b7d7f04eac2e6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jan 2012 01:54:59 -0800 Subject: fix docs for fluid layout, update topbar to fix active text color for links --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 5eb8a4a7c..e55d6d544 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 Jan 8 01:50:02 PST 2012 + * Date: Sun Jan 8 01:54:42 PST 2012 */ html, body { margin: 0; @@ -1600,7 +1600,7 @@ i { -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 .brand:hover, .navbar ul .active > a { +.navbar .brand:hover, .navbar .nav .active > a { color: #ffffff; text-decoration: none; background-color: #333333; -- cgit v1.2.3 From 916761d56854ca4fcc8ea4afa68511fb26a93e4c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jan 2012 01:57:05 -0800 Subject: fix styles on right aligned blockquote to flip padding and border appropriately --- bootstrap.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index e55d6d544..550f7fdce 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 Jan 8 01:54:42 PST 2012 + * Date: Sun Jan 8 01:56:47 PST 2012 */ html, body { margin: 0; @@ -485,6 +485,10 @@ blockquote small:before { } blockquote.pull-right { float: right; + padding-left: 0; + padding-right: 15px; + border-left: 0; + border-right: 5px solid #eee; } blockquote.pull-right p, blockquote.pull-right small { text-align: right; -- cgit v1.2.3 From cf05dc86774ea05aa0f40aff771538e6e2f405d2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jan 2012 02:15:47 -0800 Subject: adjust navs for fine details on dropdowns in stacked nav and improved open state there --- bootstrap.css | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 550f7fdce..e60baa663 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 Jan 8 01:56:47 PST 2012 + * Date: Sun Jan 8 02:15:22 PST 2012 */ html, body { margin: 0; @@ -1925,7 +1925,7 @@ i { .pills.stacked > li:last-child > a { margin-bottom: 1px; } -.tabs .dropdown-menu, .pills .dropdown-menu { +.nav .dropdown-menu { top: 33px; border-width: 1px; } @@ -1934,19 +1934,26 @@ i { -moz-border-radius: 4px; border-radius: 4px; } -.tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret { +.nav .dropdown-toggle .caret { + border-top-color: #0088cc; margin-top: 6px; } -.tabs .open .dropdown-toggle, .pills .open .dropdown-toggle { +.nav .dropdown-toggle:hover .caret { + border-top-color: #005580; +} +.nav .open .dropdown-toggle { background-color: #999; border-color: #999; } -.tabs .open .caret, .pills .open .caret { +.nav .open .caret, .nav .open a:hover .caret { border-top-color: #fff; filter: alpha(opacity=100); -moz-opacity: 1; opacity: 1; } +.tabs.stacked .open > a:hover { + border-color: #999; +} .tabbable { zoom: 1; } -- cgit v1.2.3 From 9e7acc637057292205906edc99fb23a49c937afa Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jan 2012 02:30:18 -0800 Subject: fix responsive navbar nav treatment by using hover instead of click --- bootstrap.css | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index e60baa663..57acf8775 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 Jan 8 02:15:22 PST 2012 + * Date: Sun Jan 8 02:30:05 PST 2012 */ html, body { margin: 0; @@ -3054,7 +3054,7 @@ a.thumbnail:hover { width: auto; margin: 0; } - .nav { + .navbar .nav { position: absolute; top: 0; left: 0; @@ -3062,29 +3062,32 @@ a.thumbnail:hover { padding-top: 40px; list-style: none; } - .nav, .nav > li:last-child a { + .navbar .nav, .navbar .nav > li:last-child a { -webkit-border-radius: 0 0 4px 0; -moz-border-radius: 0 0 4px 0; border-radius: 0 0 4px 0; } - .nav > li { + .navbar .nav > li { float: none; display: none; } - .nav > li > a { + .navbar .nav > li > a { float: none; background-color: #222; } - .nav > .active { + .navbar .nav > .active { display: block; position: absolute; top: 0; left: 0; } - .navbar ul .active > a { + .navbar .nav > .active > a { background-color: transparent; } - .nav > .active a:after { + .navbar .nav > .active > a:hover { + background-color: #333; + } + .navbar .nav > .active > a:after { display: inline-block; width: 0; height: 0; @@ -3100,8 +3103,11 @@ a.thumbnail:hover { opacity: 1; content: "↓"; } - .nav > .active a:hover { - background-color: rgba(255, 255, 255, 0.05); + .navbar .nav:hover > li { + display: block; + } + .navbar .nav:hover > li > a:hover { + background-color: #333; } } @media (min-width: 768px) and (max-width: 940px) { -- cgit v1.2.3 From b7acbd8476060bc1f2da9837693b0b86b68423c5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jan 2012 03:00:06 -0800 Subject: move collapsing navbar nav to 480 and below, unfloat nav for 768 and below to wrap links with position absolute --- bootstrap.css | 102 +++++++++++++++++++++++++++++++--------------------------- 1 file changed, 54 insertions(+), 48 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 57acf8775..a9a104ccc 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 Jan 8 02:30:05 PST 2012 + * Date: Sun Jan 8 02:58:37 PST 2012 */ html, body { margin: 0; @@ -3007,53 +3007,6 @@ a.thumbnail:hover { visibility: hidden; } @media (max-width: 480px) { - .modal { - width: auto; - margin: 0; - } - .modal.fade.in { - top: auto; - } - .horizontal-form .control-group > label { - float: none; - width: auto; - padding-top: 0; - text-align: left; - } - .horizontal-form .controls { - margin-left: 0; - } - .horizontal-form .control-list { - padding-top: 0; - } - .horizontal-form .form-actions { - padding-left: 0; - } - .modal { - position: fixed; - top: 20px; - left: 20px; - right: 20px; - width: auto; - } - .modal .close { - padding: 10px; - } -} -@media (max-width: 768px) { - .container { - width: auto; - padding: 0 20px; - } - .row { - margin-left: 0; - } - .row > [class*="span"] { - float: none; - display: block; - width: auto; - margin: 0; - } .navbar .nav { position: absolute; top: 0; @@ -3109,6 +3062,59 @@ a.thumbnail:hover { .navbar .nav:hover > li > a:hover { background-color: #333; } + .modal { + width: auto; + margin: 0; + } + .modal.fade.in { + top: auto; + } + .horizontal-form .control-group > label { + float: none; + width: auto; + padding-top: 0; + text-align: left; + } + .horizontal-form .controls { + margin-left: 0; + } + .horizontal-form .control-list { + padding-top: 0; + } + .horizontal-form .form-actions { + padding-left: 0; + } + .modal { + position: fixed; + top: 20px; + left: 20px; + right: 20px; + width: auto; + } + .modal .close { + padding: 10px; + } +} +@media (max-width: 768px) { + .navbar-fixed { + position: absolute; + } + .navbar-fixed .nav { + float: none; + } + .container { + width: auto; + padding: 0 20px; + } + .row { + margin-left: 0; + } + .row > [class*="span"] { + float: none; + display: block; + width: auto; + margin: 0; + } } @media (min-width: 768px) and (max-width: 940px) { .container { -- cgit v1.2.3 From d4ded76a8fbd35ac66663a6b54f7ab6f85bf0350 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 8 Jan 2012 11:33:55 -0800 Subject: get carousel working in firefox --- bootstrap.css | 142 ++-------------------------------------------------------- 1 file changed, 4 insertions(+), 138 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index a9a104ccc..10612de2c 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 Jan 8 02:58:37 PST 2012 + * Date: Sun Jan 8 11:32:00 PST 2012 */ html, body { margin: 0; @@ -2789,6 +2789,9 @@ a.thumbnail:hover { .carousel .active, .carousel .next, .carousel .prev { display: block; } +.carousel .active { + left: 0; +} .carousel .next, .carousel .prev { position: absolute; top: 0; @@ -2865,143 +2868,6 @@ a.thumbnail:hover { background-position: 40px 0; } } -@keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} -.progress, .progress .bar { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.progress { - height: 18px; - margin-bottom: 18px; - background-color: #f9f9f9; - background-image: -khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#f9f9f9)); - background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #f9f9f9)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(top, #f5f5f5, #f9f9f9); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0); - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -} -.progress .bar { - width: 0%; - height: 18px; - margin: ; - background-color: #0480be; - background-image: -khtml-gradient(linear, left top, left bottom, from(#149bdf), to(#0480be)); - background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -ms-linear-gradient(top, #149bdf, #0480be); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #149bdf), color-stop(100%, #0480be)); - background-image: -webkit-linear-gradient(top, #149bdf, #0480be); - background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(top, #149bdf, #0480be); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0); - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - -webkit-transition: width 0.6s ease; - -moz-transition: width 0.6s ease; - -ms-transition: width 0.6s ease; - -o-transition: width 0.6s ease; - transition: width 0.6s ease; -} -.progress.striped .bar { - background-color: #62c462; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - -webkit-background-size: 40px 40px; - -moz-background-size: 40px 40px; - -o-background-size: 40px 40px; - background-size: 40px 40px; -} -.progress.active .bar { - -webkit-animation: progress-bar-stripes 2s linear infinite; - -moz-animation: progress-bar-stripes 2s linear infinite; - animation: progress-bar-stripes 2s linear infinite; -} -.progress.danger .bar { - background-color: #c43c35; - background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35)); - background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(top, #ee5f5b, #c43c35); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); -} -.progress.danger.striped .bar { - background-color: #ee5f5b; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} -.progress.success .bar { - background-color: #57a957; - background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); - background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); - background-image: -webkit-linear-gradient(top, #62c462, #57a957); - background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); -} -.progress.success.striped .bar { - background-color: #62c462; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} -.progress.info .bar { - background-color: #339bb9; - background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); - background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9)); - background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); - background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(top, #5bc0de, #339bb9); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); -} -.progress.info.striped .bar { - background-color: #5bc0de; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} .hidden { display: none; visibility: hidden; -- cgit v1.2.3 From 1ef9cbc6e4b2a002eea4515f3779318f2ee60666 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jan 2012 12:40:30 -0800 Subject: rejigger z-index ranks for popovers/topbar/etc --- bootstrap.css | 149 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 143 insertions(+), 6 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 10612de2c..f2ebd44c3 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 Jan 8 11:32:00 PST 2012 + * Date: Sun Jan 8 12:40:18 PST 2012 */ html, body { margin: 0; @@ -1701,7 +1701,7 @@ i { top: 0; right: 0; left: 0; - z-index: 1010; + z-index: 1030; } .navbar .nav { position: relative; @@ -2123,7 +2123,7 @@ i { right: 0; bottom: 0; left: 0; - z-index: 1020; + z-index: 1040; background-color: #000000; } .modal-backdrop.fade { @@ -2138,7 +2138,7 @@ i { position: fixed; top: 50%; left: 50%; - z-index: 1030; + z-index: 1050; max-height: 500px; overflow: auto; width: 560px; @@ -2208,7 +2208,7 @@ i { } .twipsy { position: absolute; - z-index: 1050; + z-index: 1020; display: block; visibility: visible; padding: 5px; @@ -2286,7 +2286,7 @@ i { position: absolute; top: 0; left: 0; - z-index: 1040; + z-index: 1010; display: none; padding: 5px; } @@ -2868,6 +2868,143 @@ a.thumbnail:hover { background-position: 40px 0; } } +@keyframes progress-bar-stripes { + from { + background-position: 0 0; + } + to { + background-position: 40px 0; + } +} +.progress, .progress .bar { + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.progress { + height: 18px; + margin-bottom: 18px; + background-color: #f9f9f9; + background-image: -khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#f9f9f9)); + background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #f9f9f9)); + background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: linear-gradient(top, #f5f5f5, #f9f9f9); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0); + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); +} +.progress .bar { + width: 0%; + height: 18px; + margin: ; + background-color: #0480be; + background-image: -khtml-gradient(linear, left top, left bottom, from(#149bdf), to(#0480be)); + background-image: -moz-linear-gradient(top, #149bdf, #0480be); + background-image: -ms-linear-gradient(top, #149bdf, #0480be); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #149bdf), color-stop(100%, #0480be)); + background-image: -webkit-linear-gradient(top, #149bdf, #0480be); + background-image: -o-linear-gradient(top, #149bdf, #0480be); + background-image: linear-gradient(top, #149bdf, #0480be); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0); + -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + -webkit-transition: width 0.6s ease; + -moz-transition: width 0.6s ease; + -ms-transition: width 0.6s ease; + -o-transition: width 0.6s ease; + transition: width 0.6s ease; +} +.progress.striped .bar { + background-color: #62c462; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + -webkit-background-size: 40px 40px; + -moz-background-size: 40px 40px; + -o-background-size: 40px 40px; + background-size: 40px 40px; +} +.progress.active .bar { + -webkit-animation: progress-bar-stripes 2s linear infinite; + -moz-animation: progress-bar-stripes 2s linear infinite; + animation: progress-bar-stripes 2s linear infinite; +} +.progress.danger .bar { + background-color: #c43c35; + background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35)); + background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35)); + background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); + background-image: linear-gradient(top, #ee5f5b, #c43c35); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); +} +.progress.danger.striped .bar { + background-color: #ee5f5b; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} +.progress.success .bar { + background-color: #57a957; + background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); + background-image: -moz-linear-gradient(top, #62c462, #57a957); + background-image: -ms-linear-gradient(top, #62c462, #57a957); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); + background-image: -webkit-linear-gradient(top, #62c462, #57a957); + background-image: -o-linear-gradient(top, #62c462, #57a957); + background-image: linear-gradient(top, #62c462, #57a957); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); +} +.progress.success.striped .bar { + background-color: #62c462; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} +.progress.info .bar { + background-color: #339bb9; + background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); + background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); + background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9)); + background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); + background-image: -o-linear-gradient(top, #5bc0de, #339bb9); + background-image: linear-gradient(top, #5bc0de, #339bb9); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); +} +.progress.info.striped .bar { + background-color: #5bc0de; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} .hidden { display: none; visibility: hidden; -- cgit v1.2.3 From cb9be7bd0cde19b3b401d2dcdfb6162dd00b5ab5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jan 2012 13:21:44 -0800 Subject: clean up dup css in responsive, fix navbar dropdown caret --- bootstrap.css | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index f2ebd44c3..baafd0dd9 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 Jan 8 12:40:18 PST 2012 + * Date: Sun Jan 8 13:21:31 PST 2012 */ html, body { margin: 0; @@ -1934,11 +1934,11 @@ i { -moz-border-radius: 4px; border-radius: 4px; } -.nav .dropdown-toggle .caret { +.tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret { border-top-color: #0088cc; margin-top: 6px; } -.nav .dropdown-toggle:hover .caret { +.tabs .dropdown-toggle:hover .caret, .pills .dropdown-toggle:hover .caret { border-top-color: #005580; } .nav .open .dropdown-toggle { @@ -3065,13 +3065,6 @@ a.thumbnail:hover { .navbar .nav:hover > li > a:hover { background-color: #333; } - .modal { - width: auto; - margin: 0; - } - .modal.fade.in { - top: auto; - } .horizontal-form .control-group > label { float: none; width: auto; @@ -3094,7 +3087,10 @@ a.thumbnail:hover { right: 20px; width: auto; } - .modal .close { + .modal.fade.in { + top: auto; + } + .modal-header .close { padding: 10px; } } -- cgit v1.2.3 From 6226b14e3b97819119da0f026e9d3ae6dd0a31c0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jan 2012 13:30:23 -0800 Subject: fix placement of dropdowns in navbar after getting to general in those styles --- bootstrap.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index baafd0dd9..1fc88441a 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 Jan 8 13:21:31 PST 2012 + * Date: Sun Jan 8 13:30:08 PST 2012 */ html, body { margin: 0; @@ -1925,7 +1925,7 @@ i { .pills.stacked > li:last-child > a { margin-bottom: 1px; } -.nav .dropdown-menu { +.pills .dropdown-menu, .tabs .dropdown-menu { top: 33px; border-width: 1px; } @@ -1941,7 +1941,7 @@ i { .tabs .dropdown-toggle:hover .caret, .pills .dropdown-toggle:hover .caret { border-top-color: #005580; } -.nav .open .dropdown-toggle { +.tabs .open .dropdown-toggle, .pills .open .dropdown-toggle { background-color: #999; border-color: #999; } -- cgit v1.2.3 From 2c790304393cce3ba7db3b3d5bc9385b1986b838 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jan 2012 14:33:14 -0800 Subject: fix navbar styles for .brand --- bootstrap.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 1fc88441a..d040f329b 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 Jan 8 13:30:08 PST 2012 + * Date: Sun Jan 8 14:33:06 PST 2012 */ html, body { margin: 0; @@ -1604,11 +1604,9 @@ i { -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 .brand:hover, .navbar .nav .active > a { +.navbar .brand:hover { color: #ffffff; text-decoration: none; - background-color: #333333; - background-color: rgba(255, 255, 255, 0.05); } .navbar .brand { float: left; @@ -1731,6 +1729,8 @@ i { text-decoration: none; } .navbar .nav .active > a { + color: #ffffff; + text-decoration: none; background-color: #222; background-color: rgba(0, 0, 0, 0.5); } -- cgit v1.2.3 From 4b79443bba6ad83d9da62e00765ef45121fb39ff Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jan 2012 15:33:44 -0800 Subject: fix dropdowns for active state in dropdown menus --- bootstrap.css | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index d040f329b..f4a604e01 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 Jan 8 14:33:06 PST 2012 + * Date: Sun Jan 8 15:33:29 PST 2012 */ html, body { margin: 0; @@ -1493,7 +1493,7 @@ i { line-height: 18px; color: #555555; } -.dropdown-menu a:hover, .dropdown-menu .active > a { +.dropdown-menu li > a:hover { color: #fff; text-decoration: none; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); @@ -1511,6 +1511,11 @@ i { -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075); } +.dropdown-menu .active > a, .dropdown-menu .active > a:hover { + color: #fff; + background-color: #999; + background-image: none; +} .dropdown.open .dropdown-toggle { color: #ffffff; background: #ccc; @@ -1870,7 +1875,7 @@ i { .tabs > li > a:hover { border-color: #eee #eee #ddd; } -.tabs .active > a, .tabs .active > a:hover { +.tabs > .active > a, .tabs > .active > a:hover { color: #555555; background-color: #ffffff; border: 1px solid #ddd; @@ -1941,11 +1946,19 @@ i { .tabs .dropdown-toggle:hover .caret, .pills .dropdown-toggle:hover .caret { border-top-color: #005580; } -.tabs .open .dropdown-toggle, .pills .open .dropdown-toggle { +.tabs .active .dropdown-toggle .caret, .pills .active .dropdown-toggle .caret { + border-top-color: #333; +} +.nav > .dropdown.active > a:hover { + color: #000; + cursor: pointer; +} +.tabs .open .dropdown-toggle, .pills .open .dropdown-toggle, .nav > .open.active > a:hover { + color: #fff; background-color: #999; border-color: #999; } -.nav .open .caret, .nav .open a:hover .caret { +.nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret { border-top-color: #fff; filter: alpha(opacity=100); -moz-opacity: 1; -- cgit v1.2.3 From eaa8220d70f84a710c9dfa1bd49a7c35bcab1a3b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jan 2012 15:38:57 -0800 Subject: add utilities.less file for generic classes --- bootstrap.css | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index f4a604e01..5fa1067a0 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 Jan 8 15:33:29 PST 2012 + * Date: Sun Jan 8 15:38:44 PST 2012 */ html, body { margin: 0; @@ -241,18 +241,6 @@ a:hover { color: #005580; text-decoration: underline; } -.pull-right { - float: right; -} -.pull-left { - float: left; -} -.hide { - display: none; -} -.show { - display: block; -} .row { margin-left: -20px; zoom: 1; @@ -3018,6 +3006,21 @@ a.thumbnail:hover { background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } +.pull-right { + float: right; +} +.pull-left { + float: left; +} +.hide { + display: none; +} +.show { + display: block; +} +.invisible { + visibility: hidden; +} .hidden { display: none; visibility: hidden; -- cgit v1.2.3 From 83c0896999c91f4d85bb75434f4a4ecfaff07fe0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jan 2012 21:48:07 -0800 Subject: updated js pages to put examples first --- bootstrap.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 5fa1067a0..b859657ef 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 Jan 8 15:38:44 PST 2012 + * Date: Sun Jan 8 19:32:37 PST 2012 */ html, body { margin: 0; @@ -2525,9 +2525,9 @@ i { padding: 9px 14px 9px; font-size: 15px; line-height: normal; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; } .btn.small { padding: 7px 9px 7px; -- cgit v1.2.3 From 5032ef9b54b92443f1dbaa2594468dcd84b6bd9e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jan 2012 23:14:07 -0800 Subject: remove static popovers, modals, and twipsies from components in favor of full javascript page --- bootstrap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index b859657ef..81ae2e6c4 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 Jan 8 19:32:37 PST 2012 + * Date: Sun Jan 8 21:54:13 PST 2012 */ html, body { margin: 0; @@ -1577,6 +1577,7 @@ i { filter: alpha(opacity=40); -moz-opacity: 0.4; opacity: 0.4; + cursor: pointer; } .navbar { overflow: visible; -- cgit v1.2.3 From 5c2bf0feef7f7f64584cbd0cb6a2ef74dbba80d2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 9 Jan 2012 09:15:42 -0800 Subject: remove empty margin property --- bootstrap.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 81ae2e6c4..32f8b9da4 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 Jan 8 21:54:13 PST 2012 + * Date: Mon Jan 9 09:15:32 PST 2012 */ html, body { margin: 0; @@ -2903,7 +2903,6 @@ a.thumbnail:hover { .progress .bar { width: 0%; height: 18px; - margin: ; background-color: #0480be; background-image: -khtml-gradient(linear, left top, left bottom, from(#149bdf), to(#0480be)); background-image: -moz-linear-gradient(top, #149bdf, #0480be); -- cgit v1.2.3 From a2ebf0c0c1381c38dda24bf12aebd5f9b4907e06 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 10 Jan 2012 21:54:11 -0800 Subject: account for multiple tbody with 2px border between --- bootstrap.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 32f8b9da4..561a70572 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 Jan 9 09:15:32 PST 2012 + * Date: Tue Jan 10 21:52:26 PST 2012 */ html, body { margin: 0; @@ -993,6 +993,9 @@ th { td { vertical-align: top; } +tbody + tbody { + border-top: 2px solid #ddd; +} .condensed-table th, .condensed-table td { padding: 4px 5px; } -- cgit v1.2.3 From 32c628725924ca014df208fa57de4c5a4050733e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 11 Jan 2012 09:43:13 -0800 Subject: comments and borders for multiple tbody --- bootstrap.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 561a70572..6ac110e29 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 Jan 10 21:52:26 PST 2012 + * Date: Wed Jan 11 09:43:04 PST 2012 */ html, body { margin: 0; @@ -993,6 +993,9 @@ th { td { vertical-align: top; } +thead:first-child tr th, thead:first-child tr td { + border-top: 0; +} tbody + tbody { border-top: 2px solid #ddd; } -- cgit v1.2.3 From 6f2f947a4309a8fdeb7067612447c0f1a15dcfd9 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 11 Jan 2012 21:42:55 -0800 Subject: add build tool for js + rename twipsy to tooltip + lots of little doc cleanup --- bootstrap.css | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 32f8b9da4..09b7b4182 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 Jan 9 09:15:32 PST 2012 + * Date: Wed Jan 11 20:37:24 PST 2012 */ html, body { margin: 0; @@ -2208,7 +2208,7 @@ i { float: right; margin-left: 5px; } -.twipsy { +.tooltip { position: absolute; z-index: 1020; display: block; @@ -2219,24 +2219,24 @@ i { -moz-opacity: 0; opacity: 0; } -.twipsy.in { +.tooltip.in { filter: alpha(opacity=80); -moz-opacity: 0.8; opacity: 0.8; } -.twipsy.top { +.tooltip.top { margin-top: -2px; } -.twipsy.right { +.tooltip.right { margin-left: 2px; } -.twipsy.bottom { +.tooltip.bottom { margin-top: 2px; } -.twipsy.left { +.tooltip.left { margin-left: -2px; } -.twipsy.top .twipsy-arrow { +.tooltip.top .tooltip-arrow { bottom: 0; left: 50%; margin-left: -5px; @@ -2244,7 +2244,7 @@ i { border-right: 5px solid transparent; border-top: 5px solid #000000; } -.twipsy.left .twipsy-arrow { +.tooltip.left .tooltip-arrow { top: 50%; right: 0; margin-top: -5px; @@ -2252,7 +2252,7 @@ i { border-bottom: 5px solid transparent; border-left: 5px solid #000000; } -.twipsy.bottom .twipsy-arrow { +.tooltip.bottom .tooltip-arrow { top: 0; left: 50%; margin-left: -5px; @@ -2260,7 +2260,7 @@ i { border-right: 5px solid transparent; border-bottom: 5px solid #000000; } -.twipsy.right .twipsy-arrow { +.tooltip.right .tooltip-arrow { top: 50%; left: 0; margin-top: -5px; @@ -2268,7 +2268,7 @@ i { border-bottom: 5px solid transparent; border-right: 5px solid #000000; } -.twipsy-inner { +.tooltip-inner { max-width: 200px; padding: 3px 8px; color: white; @@ -2279,7 +2279,7 @@ i { -moz-border-radius: 4px; border-radius: 4px; } -.twipsy-arrow { +.tooltip-arrow { position: absolute; width: 0; height: 0; @@ -2619,6 +2619,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-border-radius: 5px; border-radius: 5px; } +.btn-group.open .dropdown-menu.large { + top: 40px; +} .btn-group.open .dropdown-toggle { background-image: none; -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -- cgit v1.2.3 From 5e3c21133430112bf8361827dc7a6a29f3f56c72 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 12 Jan 2012 10:19:07 -0800 Subject: fix type shorthand in blockquote --- bootstrap.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 1250507b5..59cec1cd6 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: Wed Jan 11 21:59:22 PST 2012 + * Date: Thu Jan 12 10:18:57 PST 2012 */ html, body { margin: 0; @@ -459,8 +459,8 @@ blockquote { } blockquote p { margin-bottom: 0; - font-size: 300; - font-weight: 16px; + font-size: 16px; + font-weight: 300; line-height: 22.5px; } blockquote small { -- cgit v1.2.3 From ef8b27cdc7ad490b4b52003a7178bd1465ee5dc9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 12 Jan 2012 12:30:36 -0800 Subject: fix heading --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 59cec1cd6..8d0847012 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: Thu Jan 12 10:18:57 PST 2012 + * Date: Thu Jan 12 12:30:32 PST 2012 */ html, body { margin: 0; -- cgit v1.2.3 From 391248c0e3ba9b00b0b4a02e4d94475e9ae9877a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 12 Jan 2012 15:29:16 -0800 Subject: nuke uber footer, bring back topbar dropdowns --- bootstrap.css | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 8d0847012..8e5ad131c 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: Thu Jan 12 12:30:32 PST 2012 + * Date: Thu Jan 12 15:28:03 PST 2012 */ html, body { margin: 0; @@ -1453,12 +1453,12 @@ i { min-width: 160px; max-width: 220px; _width: 160px; - padding: 5px 0; + padding: 4px 0; margin: 0; list-style: none; background-color: #ffffff; border-color: #999; - border-color: rgba(0, 0, 0, 0.1); + border-color: rgba(0, 0, 0, 0.2); border-style: solid; border-width: 1px; -webkit-border-radius: 0 0 5px 5px; @@ -1486,24 +1486,12 @@ i { font-weight: normal; line-height: 18px; color: #555555; + white-space: nowrap; } .dropdown-menu li > a:hover { color: #fff; text-decoration: none; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0077b3; - background-image: -khtml-gradient(linear, left top, left bottom, from(#0088cc), to(#0077b3)); - background-image: -moz-linear-gradient(top, #0088cc, #0077b3); - background-image: -ms-linear-gradient(top, #0088cc, #0077b3); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #0088cc), color-stop(100%, #0077b3)); - background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); - background-image: -o-linear-gradient(top, #0088cc, #0077b3); - background-image: linear-gradient(top, #0088cc, #0077b3); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0077b3', GradientType=0); - -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075); + background-color: #0088cc; } .dropdown-menu .active > a, .dropdown-menu .active > a:hover { color: #fff; @@ -1747,7 +1735,7 @@ i { margin-right: 0; } .navbar .dropdown-menu { - top: 42px; + top: 41px; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -1758,10 +1746,10 @@ i { border-left: 7px solid transparent; border-right: 7px solid transparent; border-bottom: 7px solid #ccc; - border-bottom-color: rgba(0, 0, 0, 0.1); + border-bottom-color: rgba(0, 0, 0, 0.2); position: absolute; top: -7px; - left: 12px; + left: 9px; } .navbar .dropdown-menu:after { content: ''; @@ -1771,14 +1759,22 @@ i { border-bottom: 6px solid #fff; position: absolute; top: -6px; - left: 13px; + left: 10px; } .navbar .dropdown-toggle .caret, .navbar .open.dropdown .caret { border-top-color: #fff; } -.navbar .open .dropdown-toggle { +.navbar .nav .active .caret { + filter: alpha(opacity=100); + -moz-opacity: 1; + opacity: 1; +} +.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle { background-color: transparent; } +.navbar .nav .active > .dropdown-toggle:hover { + color: #fff; +} .navbar .nav.pull-right .dropdown-menu { right: 0; } -- cgit v1.2.3 From fc053ac8b27611e3dc7fae769ce28f154250d50e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 13 Jan 2012 10:07:56 -0800 Subject: update dropdowns spacing and docs section spacing --- bootstrap.css | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 8e5ad131c..ba51a7d45 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: Thu Jan 12 15:28:03 PST 2012 + * Date: Fri Jan 13 10:05:29 PST 2012 */ html, body { margin: 0; @@ -1481,23 +1481,18 @@ i { } .dropdown-menu a { display: block; - padding: 2px 15px; + padding: 3px 15px; clear: both; font-weight: normal; line-height: 18px; color: #555555; white-space: nowrap; } -.dropdown-menu li > a:hover { +.dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover { color: #fff; text-decoration: none; background-color: #0088cc; } -.dropdown-menu .active > a, .dropdown-menu .active > a:hover { - color: #fff; - background-color: #999; - background-image: none; -} .dropdown.open .dropdown-toggle { color: #ffffff; background: #ccc; -- cgit v1.2.3 From f587e81b7d72e47b16bf808c721c3dfe45ae1062 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Jan 2012 16:18:15 -0800 Subject: rewrite alert messages to use less code, combine the look of default and block messages, simplify docs --- bootstrap.css | 123 ++++++++++++++++++---------------------------------------- 1 file changed, 37 insertions(+), 86 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index ba51a7d45..556112c52 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: Fri Jan 13 10:05:29 PST 2012 + * Date: Sat Jan 14 16:13:25 PST 2012 */ html, body { margin: 0; @@ -410,7 +410,6 @@ ol { } li { line-height: 18px; - color: #555555; } ul.unstyled { margin-left: 0; @@ -2374,28 +2373,15 @@ i { margin-bottom: 0; } .btn.danger, -.alert-message.danger, .btn.danger:hover, -.alert-message.danger:hover, -.btn.error, -.alert-message.error, -.btn.error:hover, -.alert-message.error:hover, .btn.success, -.alert-message.success, .btn.success:hover, -.alert-message.success:hover, .btn.info, -.alert-message.info, -.btn.info:hover, -.alert-message.info:hover { +.btn.info:hover { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); color: #ffffff; } -.btn.danger, -.alert-message.danger, -.btn.error, -.alert-message.error { +.btn.danger { background-color: #c43c35; background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35)); background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); @@ -2409,7 +2395,7 @@ i { border-color: #c43c35 #c43c35 #882a25; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } -.btn.success, .alert-message.success { +.btn.success { background-color: #57a957; background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); background-image: -moz-linear-gradient(top, #62c462, #57a957); @@ -2423,7 +2409,7 @@ i { border-color: #57a957 #57a957 #3d773d; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } -.btn.info, .alert-message.info { +.btn.info { background-color: #339bb9; background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); @@ -2638,95 +2624,60 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-opacity: 0.75; opacity: 0.75; } -.alert-message { +.alert { position: relative; - padding: 7px 15px; + padding: 8px 35px 8px 14px; margin-bottom: 18px; - color: #333333; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - background-color: #eedc94; - background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94)); - background-image: -moz-linear-gradient(top, #fceec1, #eedc94); - background-image: -ms-linear-gradient(top, #fceec1, #eedc94); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94)); - background-image: -webkit-linear-gradient(top, #fceec1, #eedc94); - background-image: -o-linear-gradient(top, #fceec1, #eedc94); - background-image: linear-gradient(top, #fceec1, #eedc94); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0); - border-color: #eedc94 #eedc94 #e4c652; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - border-width: 1px; - border-style: solid; + background-color: #fcf8e3; + border: 1px solid #f3edd2; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -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); } -.alert-message .close { +.alert, .alert-heading { + color: #c09853; +} +.alert > .close { *margin-top: 3px; /* IE7 spacing */ + margin-right: -21px; } -.alert-message h5 { - line-height: 18px; +.success-alert { + background-color: #dff0d8; + border-color: #cfe8c4; } -.alert-message p { - margin-bottom: 0; +.success-alert, .success-alert .alert-heading { + color: #468847; } -.alert-message div { - margin-top: 5px; - margin-bottom: 2px; - line-height: 28px; +.danger-alert, .error-alert { + background-color: #f2dede; + border-color: #e9c7c7; } -.alert-message .btn { - -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); - -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); - box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); +.danger-alert, +.error-alert, +.danger-alert .alert-heading, +.error-alert .alert-heading { + color: #B94A48; } -.alert-message.error, .alert-message.success, .alert-message.info { - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +.info-alert { + background-color: #d9edf7; + border-color: #bfe1f2; } -.alert-message.block-message { - padding: 14px; - background-image: none; - background-color: #fdf5d9; - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - border-color: #fceec1; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; +.info-alert, .info-alert .alert-heading { + color: #3a87ad; } -.alert-message.block-message ul, .alert-message.block-message p { - margin-right: 30px; +.block-alert { + padding-top: 14px; + padding-bottom: 14px; } -.alert-message.block-message ul { +.block-alert > p, .block-alert > ul { margin-bottom: 0; } -.alert-message.block-message li { - color: #333333; -} -.alert-message.block-message .alert-actions { +.block-alert p + p { margin-top: 5px; } -.alert-message.block-message.error, .alert-message.block-message.success, .alert-message.block-message.info { - color: #333333; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -} -.alert-message.block-message.error { - background-color: #fddfde; - border-color: #fbc7c6; -} -.alert-message.block-message.success { - background-color: #d1eed1; - border-color: #bfe7bf; -} -.alert-message.block-message.info { - background-color: #ddf4fb; - border-color: #c6edf9; -} .thumbnails { margin-left: -20px; margin-bottom: 0; -- cgit v1.2.3 From ceb6836e03b03c757578c9e5614f535d9be2ad7f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Jan 2012 16:24:23 -0800 Subject: move up alert message close icon --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 556112c52..c5d011b7e 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 Jan 14 16:13:25 PST 2012 + * Date: Sat Jan 14 16:23:58 PST 2012 */ html, body { margin: 0; @@ -1552,7 +1552,7 @@ i { float: right; font-size: 20px; font-weight: bold; - line-height: 13.5px; + line-height: 12px; color: #000000; text-shadow: 0 1px 0 #ffffff; filter: alpha(opacity=20); -- cgit v1.2.3 From a40b2a636c908859c2bb7434f0c050be2dc7e70e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Jan 2012 16:38:40 -0800 Subject: make inline and search form labels inline-block --- bootstrap.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index c5d011b7e..8d7b08a35 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 Jan 14 16:23:58 PST 2012 + * Date: Sat Jan 14 16:38:32 PST 2012 */ html, body { margin: 0; @@ -957,6 +957,9 @@ input::-webkit-input-placeholder { display: inline-block; margin-bottom: 0; } +.search-form label, .inline-form label { + display: inline-block; +} .control-group { margin-bottom: 18px; } -- cgit v1.2.3 From 028726a9a3e2acd56195dacd903680db5d934b8e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Jan 2012 16:45:01 -0800 Subject: add user-select mixin --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 8d7b08a35..1fc0e9edd 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 Jan 14 16:38:32 PST 2012 + * Date: Sat Jan 14 16:44:52 PST 2012 */ html, body { margin: 0; -- cgit v1.2.3 From 55ea574f8a56534b1313b5f2d85e7ee22565ea27 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Jan 2012 16:50:36 -0800 Subject: update preventing double border line for bordered tables by account for th elements in tr elements --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 1fc0e9edd..dd0c028b8 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 Jan 14 16:44:52 PST 2012 + * Date: Sat Jan 14 16:50:17 PST 2012 */ html, body { margin: 0; @@ -1017,7 +1017,7 @@ tbody + tbody { .bordered-table td + th { border-left: 1px solid #ddd; } -.bordered-table thead:first-child tr:first-child th, .bordered-table tbody:first-child tr:first-child td { +.bordered-table thead:first-child tr:first-child th, .bordered-table tbody:first-child tr:first-child th, .bordered-table tbody:first-child tr:first-child td { border-top: 0; } .bordered-table thead:first-child tr:first-child th:first-child, .bordered-table tbody:first-child tr:first-child td:first-child { -- cgit v1.2.3 From 74c0fc17c826d3a16c1b3e45b71138c048f7d630 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Jan 2012 16:56:47 -0800 Subject: fix duplicate icons --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index dd0c028b8..6bfb8d2da 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 Jan 14 16:50:17 PST 2012 + * Date: Sat Jan 14 16:56:39 PST 2012 */ html, body { margin: 0; @@ -1183,7 +1183,7 @@ i { .th { background-position: -240px 0; } -.th-lines { +.th-list { background-position: -264px 0; } .ok { -- cgit v1.2.3 From 2c3365f99ef81e53d90593c45d10ebeb3426dea9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Jan 2012 17:16:46 -0800 Subject: allow btn-groups to work in navbars --- bootstrap.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 6bfb8d2da..da68a66a8 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 Jan 14 16:56:39 PST 2012 + * Date: Sat Jan 14 17:11:53 PST 2012 */ html, body { margin: 0; @@ -1611,9 +1611,12 @@ i { color: #ffffff; background-color: transparent; } -.navbar .btn { +.navbar .btn, .navbar .btn-group { margin-top: 5px; } +.navbar .btn-group .btn { + margin-top: 0; +} .navbar-form { margin-bottom: 0; } @@ -1758,7 +1761,7 @@ i { top: -6px; left: 10px; } -.navbar .dropdown-toggle .caret, .navbar .open.dropdown .caret { +.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret { border-top-color: #fff; } .navbar .nav .active .caret { -- cgit v1.2.3 From 6d916763f82be8c2d4f87842275170c12bea72ec Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Jan 2012 20:54:37 -0800 Subject: adding the pager component after rewriting the pagination docs and css --- bootstrap.css | 55 ++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 11 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index da68a66a8..a93aaaee6 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 Jan 14 17:11:53 PST 2012 + * Date: Sat Jan 14 20:53:46 PST 2012 */ html, body { margin: 0; @@ -2082,7 +2082,8 @@ i { /* IE7 inline-block hack */ *zoom: 1; - margin: 0; + margin-left: 0; + margin-bottom: 0; border: 1px solid #ddd; border: 1px solid rgba(0, 0, 0, 0.15); -webkit-border-radius: 3px; @@ -2100,26 +2101,58 @@ i { padding: 0 14px; line-height: 34px; text-decoration: none; - border-right: 1px solid; - border-right-color: #ddd; - border-right-color: rgba(0, 0, 0, 0.15); - *border-right-color: #ddd; - /* IE6-7 */ - + border-right: 1px solid #ddd; + border-right: 1px solid rgba(0, 0, 0, 0.15); } .pagination a:hover, .pagination .active a { - background-color: #c7eefe; + background-color: #f5f5f5; } .pagination .disabled a, .pagination .disabled a:hover { color: #999999; background-color: transparent; cursor: default; } -.pagination .next a { +.pagination li:last-child a { border: 0; } -.pagination.centered { +.pagination-centered { + text-align: center; +} +.pagination-right { + text-align: right; +} +.pager { + margin-left: 0; + margin-bottom: 18px; + list-style: none; text-align: center; + zoom: 1; +} +.pager:before, .pager:after { + display: table; + *display: inline; + content: ""; + zoom: 1; +} +.pager:after { + clear: both; +} +.pager li { + display: inline; +} +.pager a { + display: inline-block; + padding: 6px 15px; + background-color: #f5f5f5; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; +} +.pager .next a { + float: right; +} +.pager .previous a { + float: left; } .modal-backdrop { position: fixed; -- cgit v1.2.3 From dab6d2b17cc2fd67c2462b5a5eb84eb58d9c72bc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Jan 2012 21:28:47 -0800 Subject: change up classes on tables and forms, fix nav list styles in example --- bootstrap.css | 66 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index a93aaaee6..dd82e1247 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 Jan 14 20:53:46 PST 2012 + * Date: Sat Jan 14 21:26:13 PST 2012 */ html, body { margin: 0; @@ -942,22 +942,22 @@ input::-webkit-input-placeholder { -moz-border-radius: 14px; border-radius: 14px; } -.search-form input, -.inline-form input, -.horizontal-form input, -.search-form textarea, -.inline-form textarea, -.horizontal-form textarea, -.search-form select, -.inline-form select, -.horizontal-form select, -.search-form .uneditable-input, -.inline-form .uneditable-input, -.horizontal-form .uneditable-input { +.form-search input, +.form-inline input, +.form-horizontal input, +.form-search textarea, +.form-inline textarea, +.form-horizontal textarea, +.form-search select, +.form-inline select, +.form-horizontal select, +.form-search .uneditable-input, +.form-inline .uneditable-input, +.form-horizontal .uneditable-input { display: inline-block; margin-bottom: 0; } -.search-form label, .inline-form label { +.form-search label, .form-inline label { display: inline-block; } .control-group { @@ -966,16 +966,16 @@ input::-webkit-input-placeholder { .control-group > label { font-weight: bold; } -.horizontal-form .control-group > label { +.form-horizontal .control-group > label { float: left; width: 130px; padding-top: 5px; text-align: right; } -.horizontal-form .controls { +.form-horizontal .controls { margin-left: 150px; } -.horizontal-form .form-actions { +.form-horizontal .form-actions { padding-left: 150px; } table { @@ -1001,46 +1001,46 @@ thead:first-child tr th, thead:first-child tr td { tbody + tbody { border-top: 2px solid #ddd; } -.condensed-table th, .condensed-table td { +.table-condensed th, .table-condensed td { padding: 4px 5px; } -.bordered-table { +.table-bordered { border: 1px solid #ddd; border-collapse: separate; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; } -.bordered-table th + th, -.bordered-table td + td, -.bordered-table th + td, -.bordered-table td + th { +.table-bordered th + th, +.table-bordered td + td, +.table-bordered th + td, +.table-bordered td + th { border-left: 1px solid #ddd; } -.bordered-table thead:first-child tr:first-child th, .bordered-table tbody:first-child tr:first-child th, .bordered-table tbody:first-child tr:first-child td { +.table-bordered thead:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child td { border-top: 0; } -.bordered-table thead:first-child tr:first-child th:first-child, .bordered-table tbody:first-child tr:first-child td:first-child { +.table-bordered thead:first-child tr:first-child th:first-child, .table-bordered tbody:first-child 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; } -.bordered-table thead:first-child tr:first-child th:last-child, .bordered-table tbody:first-child tr:first-child td:last-child { +.table-bordered thead:first-child tr:first-child th:last-child, .table-bordered tbody:first-child 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; } -.bordered-table thead:last-child tr:last-child th:first-child, .bordered-table tbody:last-child tr:last-child td:first-child { +.table-bordered thead:last-child tr:last-child th:first-child, .table-bordered tbody:last-child 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; } -.bordered-table thead:last-child tr:last-child th:last-child, .bordered-table tbody:last-child tr:last-child td:last-child { +.table-bordered thead:last-child tr:last-child th:last-child, .table-bordered tbody:last-child 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; } -.striped-table tbody tr:nth-child(odd) td, .striped-table tbody tr:nth-child(odd) th { +.table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th { background-color: #f9f9f9; } table .span1 { @@ -3071,19 +3071,19 @@ a.thumbnail:hover { .navbar .nav:hover > li > a:hover { background-color: #333; } - .horizontal-form .control-group > label { + .form-horizontal .control-group > label { float: none; width: auto; padding-top: 0; text-align: left; } - .horizontal-form .controls { + .form-horizontal .controls { margin-left: 0; } - .horizontal-form .control-list { + .form-horizontal .control-list { padding-top: 0; } - .horizontal-form .form-actions { + .form-horizontal .form-actions { padding-left: 0; } .modal { -- cgit v1.2.3 From 16eccc43d9fa6317818b5d1621d0477150214488 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Jan 2012 23:28:48 -0800 Subject: dates updated to 2012 --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index dd82e1247..9a4e6e111 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -1,12 +1,12 @@ /*! * Bootstrap v2.0.0 * - * Copyright 2011 Twitter, Inc + * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 * 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 Jan 14 21:26:13 PST 2012 + * Date: Sat Jan 14 23:28:07 PST 2012 */ html, body { margin: 0; -- cgit v1.2.3 From f989c6892f690cf46b0e67158ebb621c3fe690fe Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Jan 2012 23:33:42 -0800 Subject: gray out links for active state on pagination --- bootstrap.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 9a4e6e111..37241baf0 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 Jan 14 23:28:07 PST 2012 + * Date: Sat Jan 14 23:33:26 PST 2012 */ html, body { margin: 0; @@ -2107,6 +2107,9 @@ i { .pagination a:hover, .pagination .active a { background-color: #f5f5f5; } +.pagination .active a { + color: #999999; +} .pagination .disabled a, .pagination .disabled a:hover { color: #999999; background-color: transparent; -- cgit v1.2.3 From 8ceea1f559fb432fc12df32153911de89caea36f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Jan 2012 11:26:06 -0800 Subject: fix some ie7 bugs, improve dropdowns for ie due to lack of a shadow, fix pager example code --- bootstrap.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 37241baf0..7e2ba8023 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 Jan 14 23:33:26 PST 2012 + * Date: Sun Jan 15 00:04:02 PST 2012 */ html, body { margin: 0; @@ -1116,7 +1116,7 @@ table .header:after { visibility: hidden; } table .headerSortUp, table .headerSortDown { - background-color: rgba(141, 192, 219, 0.25); + background-color: #f7f7f9; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); } table .header:hover:after { @@ -1440,6 +1440,7 @@ i { .dropdown .caret { margin-top: 8px; margin-left: 2px; + *margin-top: 7px; } .dropdown:hover .caret, .open.dropdown .caret { filter: alpha(opacity=100); @@ -1459,7 +1460,7 @@ i { margin: 0; list-style: none; background-color: #ffffff; - border-color: #999; + border-color: #ccc; border-color: rgba(0, 0, 0, 0.2); border-style: solid; border-width: 1px; @@ -1473,6 +1474,8 @@ i { -moz-background-clip: padding; background-clip: padding-box; zoom: 1; + *border-right-width: 2px; + *border-bottom-width: 2px; } .dropdown-menu .divider { height: 1px; -- cgit v1.2.3 From fe160261e460903cae251de25eaf41f236bd051e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Jan 2012 11:30:24 -0800 Subject: normalize the alert classes to match last night's flip for form and table classes --- bootstrap.css | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 7e2ba8023..c61c20987 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 Jan 15 00:04:02 PST 2012 + * Date: Sun Jan 15 11:29:00 PST 2012 */ html, body { margin: 0; @@ -2689,38 +2689,38 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { margin-right: -21px; } -.success-alert { +.alert-success { background-color: #dff0d8; border-color: #cfe8c4; } -.success-alert, .success-alert .alert-heading { +.alert-success, .alert-success .alert-heading { color: #468847; } -.danger-alert, .error-alert { +.alert-danger, .alert-error { background-color: #f2dede; border-color: #e9c7c7; } -.danger-alert, -.error-alert, -.danger-alert .alert-heading, -.error-alert .alert-heading { +.alert-danger, +.alert-error, +.alert-danger .alert-heading, +.alert-error .alert-heading { color: #B94A48; } -.info-alert { +.alert-info { background-color: #d9edf7; border-color: #bfe1f2; } -.info-alert, .info-alert .alert-heading { +.alert-info, .alert-info .alert-heading { color: #3a87ad; } -.block-alert { +.alert-block { padding-top: 14px; padding-bottom: 14px; } -.block-alert > p, .block-alert > ul { +.alert-block > p, .alert-block > ul { margin-bottom: 0; } -.block-alert p + p { +.alert-block p + p { margin-top: 5px; } .thumbnails { -- cgit v1.2.3 From 9f732e90d4e8f3a598a798fb8b29a4f59c0b7631 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Jan 2012 11:33:30 -0800 Subject: make horizontal form labels map to default grid sizing --- bootstrap.css | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index c61c20987..a11fed895 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 Jan 15 11:29:00 PST 2012 + * Date: Sun Jan 15 11:32:55 PST 2012 */ html, body { margin: 0; @@ -963,20 +963,17 @@ input::-webkit-input-placeholder { .control-group { margin-bottom: 18px; } -.control-group > label { - font-weight: bold; -} .form-horizontal .control-group > label { float: left; - width: 130px; + width: 120px; padding-top: 5px; text-align: right; } .form-horizontal .controls { - margin-left: 150px; + margin-left: 140px; } .form-horizontal .form-actions { - padding-left: 150px; + padding-left: 140px; } table { width: 100%; -- cgit v1.2.3 From 6077b7678c8d21eeb4bc33bbfede20a4cc41fa11 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Jan 2012 11:41:46 -0800 Subject: fix modal horizontal alignment --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index a11fed895..798f808b3 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 Jan 15 11:32:55 PST 2012 + * Date: Sun Jan 15 11:41:37 PST 2012 */ html, body { margin: 0; @@ -2182,7 +2182,7 @@ i { max-height: 500px; overflow: auto; width: 560px; - margin: -250px 0 0 -250px; + margin: -250px 0 0 -280px; background-color: #ffffff; border: 1px solid #999; border: 1px solid rgba(0, 0, 0, 0.3); -- cgit v1.2.3 From f43f2c0ea269e72251e7f858b44ccef966d079af Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Jan 2012 12:53:35 -0800 Subject: fix grid sized horizontal form layout --- bootstrap.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 798f808b3..a57618dc0 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 Jan 15 11:41:37 PST 2012 + * Date: Sun Jan 15 12:53:17 PST 2012 */ html, body { margin: 0; @@ -965,15 +965,15 @@ input::-webkit-input-placeholder { } .form-horizontal .control-group > label { float: left; - width: 120px; + width: 140px; padding-top: 5px; text-align: right; } .form-horizontal .controls { - margin-left: 140px; + margin-left: 160px; } .form-horizontal .form-actions { - padding-left: 140px; + padding-left: 160px; } table { width: 100%; -- cgit v1.2.3 From 127c0d0b52c52227dcd3f346d371e5cd4219a08f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Jan 2012 13:12:29 -0800 Subject: make dl and child elements less specific --- bootstrap.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index a57618dc0..b5f7949e5 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 Jan 15 12:53:17 PST 2012 + * Date: Sun Jan 15 13:11:42 PST 2012 */ html, body { margin: 0; @@ -418,13 +418,13 @@ ul.unstyled { dl { margin-bottom: 18px; } -dl dt, dl dd { +dt, dd { line-height: 18px; } -dl dt { +dt { font-weight: bold; } -dl dd { +dd { margin-left: 9px; } hr { -- cgit v1.2.3 From c02501e1b714ebb44c560483316ac36c4f709c50 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Jan 2012 16:27:36 -0800 Subject: move carousel to separate stylesheet, update popovers to fix ie7 bug, fix pagination, fix alerts --- bootstrap.css | 165 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 85 insertions(+), 80 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index b5f7949e5..aabc868d2 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 Jan 15 13:11:42 PST 2012 + * Date: Sun Jan 15 16:27:00 PST 2012 */ html, body { margin: 0; @@ -2084,8 +2084,6 @@ i { *zoom: 1; margin-left: 0; margin-bottom: 0; - border: 1px solid #ddd; - border: 1px solid rgba(0, 0, 0, 0.15); -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; @@ -2101,8 +2099,8 @@ i { padding: 0 14px; line-height: 34px; text-decoration: none; - border-right: 1px solid #ddd; - border-right: 1px solid rgba(0, 0, 0, 0.15); + border: 1px solid #ddd; + border-left-width: 0; } .pagination a:hover, .pagination .active a { background-color: #f5f5f5; @@ -2115,8 +2113,16 @@ i { background-color: transparent; cursor: default; } +.pagination li:first-child a { + border-left-width: 1px; + -webkit-border-radius: 3px 0 0 3px; + -moz-border-radius: 3px 0 0 3px; + border-radius: 3px 0 0 3px; +} .pagination li:last-child a { - border: 0; + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; } .pagination-centered { text-align: center; @@ -2383,8 +2389,8 @@ i { padding: 3px; width: 280px; overflow: hidden; - background-color: #000000; - background-color: rgba(0, 0, 0, 0.8); + background: #000000; + background: rgba(0, 0, 0, 0.8); -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -2667,7 +2673,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { opacity: 0.75; } .alert { - position: relative; padding: 8px 35px 8px 14px; margin-bottom: 18px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); @@ -2680,11 +2685,12 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .alert, .alert-heading { color: #c09853; } -.alert > .close { +.alert .close { *margin-top: 3px; /* IE7 spacing */ - margin-right: -21px; + position: relative; + right: -21px; } .alert-success { background-color: #dff0d8; @@ -2722,7 +2728,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .thumbnails { margin-left: -20px; - margin-bottom: 0; list-style: none; zoom: 1; } @@ -2764,74 +2769,6 @@ a.thumbnail:hover { .thumbnail .caption { padding: 9px; } -.carousel { - position: relative; -} -.carousel .carousel-inner { - overflow: hidden; - width: 100%; - position: relative; -} -.carousel .item { - display: none; - position: relative; - -webkit-transition: 0.6s ease-in-out left; - -moz-transition: 0.6s ease-in-out left; - -ms-transition: 0.6s ease-in-out left; - -o-transition: 0.6s ease-in-out left; - transition: 0.6s ease-in-out left; -} -.carousel .active, .carousel .next, .carousel .prev { - display: block; -} -.carousel .active { - left: 0; -} -.carousel .next, .carousel .prev { - position: absolute; - top: 0; - width: 100%; -} -.carousel .next { - left: 100%; -} -.carousel .prev { - left: -100%; -} -.carousel .next.left, .carousel .prev.right { - left: 0%; -} -.carousel .active.left { - left: -100%; -} -.carousel .active.right { - left: 100%; -} -.carousel .nav { - width: auto; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - height: 50px; - position: absolute; - top: 50%; - margin: -25px 0 0; - cursor: pointer; - background: rgba(0, 0, 0, 0.7); - color: white; - font-size: 42px; - left: 5px; - font-weight: 100; - padding: 0 15px; -} -.carousel .nav.right { - right: 5px; - left: auto; -} -.carousel .nav:hover { - text-decoration: none; - background: rgba(0, 0, 0, 0.8); -} .label { padding: 1px 3px 2px; font-size: 9.75px; @@ -2999,6 +2936,74 @@ a.thumbnail:hover { background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } +.carousel { + position: relative; +} +.carousel .carousel-inner { + overflow: hidden; + width: 100%; + position: relative; +} +.carousel .item { + display: none; + position: relative; + -webkit-transition: 0.6s ease-in-out left; + -moz-transition: 0.6s ease-in-out left; + -ms-transition: 0.6s ease-in-out left; + -o-transition: 0.6s ease-in-out left; + transition: 0.6s ease-in-out left; +} +.carousel .active, .carousel .next, .carousel .prev { + display: block; +} +.carousel .active { + left: 0; +} +.carousel .next, .carousel .prev { + position: absolute; + top: 0; + width: 100%; +} +.carousel .next { + left: 100%; +} +.carousel .prev { + left: -100%; +} +.carousel .next.left, .carousel .prev.right { + left: 0%; +} +.carousel .active.left { + left: -100%; +} +.carousel .active.right { + left: 100%; +} +.carousel .nav { + width: auto; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + height: 50px; + position: absolute; + top: 50%; + margin: -25px 0 0; + cursor: pointer; + background: rgba(0, 0, 0, 0.7); + color: white; + font-size: 42px; + left: 5px; + font-weight: 100; + padding: 0 15px; +} +.carousel .nav.right { + right: 5px; + left: auto; +} +.carousel .nav:hover { + text-decoration: none; + background: rgba(0, 0, 0, 0.8); +} .pull-right { float: right; } -- cgit v1.2.3 From f48278dac6ac89fcf9d1ab7526ec3029dd1a4d8e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Jan 2012 18:40:17 -0800 Subject: updated accordion and carousel; accordion still needs work --- bootstrap.css | 76 ++++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 55 insertions(+), 21 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index aabc868d2..8192b24c8 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 Jan 15 16:27:00 PST 2012 + * Date: Sun Jan 15 18:32:40 PST 2012 */ html, body { margin: 0; @@ -2936,10 +2936,29 @@ a.thumbnail:hover { background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } +.accordion { + padding: 0; +} +.accordion-heading { + padding: 5px 10px; + border: 1px solid #ddd; +} +.accordion-body { + padding: 10px; + margin-left: 0; + margin-bottom: 9px; + border: 1px solid #ddd; + border-top: 0; + display: none; +} +.accordion .in { + display: block; +} .carousel { position: relative; + line-height: 1; } -.carousel .carousel-inner { +.carousel-inner { overflow: hidden; width: 100%; position: relative; @@ -2971,7 +2990,7 @@ a.thumbnail:hover { left: -100%; } .carousel .next.left, .carousel .prev.right { - left: 0%; + left: 0; } .carousel .active.left { left: -100%; @@ -2979,30 +2998,45 @@ a.thumbnail:hover { .carousel .active.right { left: 100%; } -.carousel .nav { - width: auto; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - height: 50px; +.carousel-control { position: absolute; - top: 50%; - margin: -25px 0 0; - cursor: pointer; - background: rgba(0, 0, 0, 0.7); - color: white; - font-size: 42px; - left: 5px; + top: 40%; + left: 15px; + width: 40px; + height: 40px; + margin-top: -20px; + font-size: 60px; font-weight: 100; - padding: 0 15px; + line-height: 30px; + color: #ccc; + text-align: center; + background: #999; + background: rgba(0, 0, 0, 0.5); + -webkit-border-radius: 20px; + -moz-border-radius: 20px; + border-radius: 20px; } -.carousel .nav.right { - right: 5px; +.carousel-control.right { left: auto; + right: 15px; } -.carousel .nav:hover { +.carousel-control:hover { + color: #fff; text-decoration: none; - background: rgba(0, 0, 0, 0.8); + background: #333; + background: rgba(0, 0, 0, 0.75); +} +.carousel-caption { + position: absolute; + left: 0; + right: 0; + bottom: 0; + padding: 10px 15px 5px; + background: #333; + background: rgba(0, 0, 0, 0.75); +} +.carousel-caption h4, .carousel-caption p { + color: #fff; } .pull-right { float: right; -- cgit v1.2.3 From 810bba97a418ae641d9360c232c1492610463dcf Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 15 Jan 2012 21:48:58 -0800 Subject: make accordions little bit smoother --- bootstrap.css | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 8192b24c8..7a34c8d69 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 Jan 15 18:32:40 PST 2012 + * Date: Sun Jan 15 21:48:07 PST 2012 */ html, body { margin: 0; @@ -2942,17 +2942,18 @@ a.thumbnail:hover { .accordion-heading { padding: 5px 10px; border: 1px solid #ddd; + margin-bottom: 1px; } .accordion-body { - padding: 10px; margin-left: 0; - margin-bottom: 9px; +} +.accordion-inner { + padding: 10px; border: 1px solid #ddd; border-top: 0; - display: none; } .accordion .in { - display: block; + margin-bottom: 9px; } .carousel { position: relative; -- cgit v1.2.3 From 036b98535711941ba64d9bb507f57ca60ec3cdc3 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 15 Jan 2012 21:50:04 -0800 Subject: fix margin --- bootstrap.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 7a34c8d69..6e8d32be5 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 Jan 15 21:48:07 PST 2012 + * Date: Sun Jan 15 21:49:43 PST 2012 */ html, body { margin: 0; @@ -2942,10 +2942,9 @@ a.thumbnail:hover { .accordion-heading { padding: 5px 10px; border: 1px solid #ddd; - margin-bottom: 1px; } .accordion-body { - margin-left: 0; + margin: 0 0 1px 0; } .accordion-inner { padding: 10px; -- cgit v1.2.3 From 87bd0e0b88b9c5a836bfde1478839e542c74ac05 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 15 Jan 2012 21:54:58 -0800 Subject: do some trickery to get borders looking right --- bootstrap.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 6e8d32be5..efc134317 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 Jan 15 21:49:43 PST 2012 + * Date: Sun Jan 15 21:54:32 PST 2012 */ html, body { margin: 0; @@ -2942,14 +2942,17 @@ a.thumbnail:hover { .accordion-heading { padding: 5px 10px; border: 1px solid #ddd; + border-bottom: 0; } .accordion-body { + border-bottom: 1px solid #ddd; margin: 0 0 1px 0; } .accordion-inner { padding: 10px; border: 1px solid #ddd; - border-top: 0; + border-bottom: 0; + margin-bottom: 0; } .accordion .in { margin-bottom: 9px; -- cgit v1.2.3 From 7ec4e91324e6e490291f3de22e1127c4fa55f82a Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 15 Jan 2012 21:58:45 -0800 Subject: reorder properties --- bootstrap.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index efc134317..8b82efd57 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 Jan 15 21:54:32 PST 2012 + * Date: Sun Jan 15 21:58:40 PST 2012 */ html, body { margin: 0; @@ -2945,14 +2945,14 @@ a.thumbnail:hover { border-bottom: 0; } .accordion-body { - border-bottom: 1px solid #ddd; margin: 0 0 1px 0; + border-bottom: 1px solid #ddd; } .accordion-inner { padding: 10px; + margin-bottom: 0; border: 1px solid #ddd; border-bottom: 0; - margin-bottom: 0; } .accordion .in { margin-bottom: 9px; -- cgit v1.2.3 From f1a88eede391cbb4beaadce60768a351724d7633 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 16 Jan 2012 17:27:30 -0800 Subject: fix js link in docs nav, restyle accordion with new css --- bootstrap.css | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 8192b24c8..acd0ae5c8 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 Jan 15 18:32:40 PST 2012 + * Date: Mon Jan 16 16:01:19 PST 2012 */ html, body { margin: 0; @@ -2939,17 +2939,25 @@ a.thumbnail:hover { .accordion { padding: 0; } +.accordion-group { + margin-bottom: 9px; + background-color: #eee; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} .accordion-heading { - padding: 5px 10px; - border: 1px solid #ddd; + display: block; + padding: 9px 15px; } .accordion-body { - padding: 10px; - margin-left: 0; - margin-bottom: 9px; - border: 1px solid #ddd; - border-top: 0; display: none; + padding: 15px; + margin-left: 0; + border-top: 1px solid #ddd; + -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); } .accordion .in { display: block; -- cgit v1.2.3 From 51f5b7b8af6e0f6ef0dbe86528209cd664af240a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 17 Jan 2012 23:24:59 -0800 Subject: cleanup accordion css and add comments --- bootstrap.css | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 9d3f9d9b6..d573d3436 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 Jan 17 23:17:49 PST 2012 + * Date: Tue Jan 17 23:24:38 PST 2012 */ html, body { margin: 0; @@ -2937,7 +2937,7 @@ a.thumbnail:hover { background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .accordion { - padding: 0; + margin-bottom: 18px; } .accordion-group { background-color: #f5f5f5; @@ -2950,15 +2950,12 @@ a.thumbnail:hover { border-bottom: 0; } .accordion-body { - margin: 0 0 2px; + margin-bottom: 2px; } .accordion-inner { padding: 9px 15px; border-top: 1px solid #e5e5e5; } -.accordion .in { - margin-bottom: 9px; -} .carousel { position: relative; line-height: 1; -- cgit v1.2.3 From 47b8184bbb5784eb373ffbb905c8a1756eba3c6d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 17 Jan 2012 23:39:18 -0800 Subject: scope table styles to a class, .table, instead of on the generic element as a smarter default --- bootstrap.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index d573d3436..c184d1332 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 Jan 17 23:24:38 PST 2012 + * Date: Tue Jan 17 23:38:42 PST 2012 */ html, body { margin: 0; @@ -975,27 +975,27 @@ input::-webkit-input-placeholder { .form-horizontal .form-actions { padding-left: 160px; } -table { +.table { width: 100%; margin-bottom: 18px; } -th, td { +.table th, .table td { padding: 8px; line-height: 18px; text-align: left; border-top: 1px solid #ddd; } -th { +.table th { font-weight: bold; vertical-align: bottom; } -td { +.table td { vertical-align: top; } -thead:first-child tr th, thead:first-child tr td { +.table thead:first-child tr th, .table thead:first-child tr td { border-top: 0; } -tbody + tbody { +.table tbody + tbody { border-top: 2px solid #ddd; } .table-condensed th, .table-condensed td { -- cgit v1.2.3 From dd4140319ab4380dd21f5e90e65ef855c54c3420 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 17 Jan 2012 23:52:49 -0800 Subject: revamp the mixins file to organize things a bit more, make placeholder text use a new variable instead of relying solely on @grayLight --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index c184d1332..e2fd3539d 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 Jan 17 23:38:42 PST 2012 + * Date: Tue Jan 17 23:52:18 PST 2012 */ html, body { margin: 0; -- cgit v1.2.3 From f2fadf1f0a3f444893fec394fd0180d03e1058a3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jan 2012 00:24:10 -0800 Subject: rename navbar variables, change navbar search placeholder to mixin --- bootstrap.css | 434 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 217 insertions(+), 217 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index e2fd3539d..681605a88 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 Jan 17 23:52:18 PST 2012 + * Date: Wed Jan 18 00:23:51 PST 2012 */ html, body { margin: 0; @@ -1570,222 +1570,6 @@ i { opacity: 0.4; cursor: pointer; } -.navbar { - overflow: visible; -} -.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 .brand:hover { - color: #ffffff; - text-decoration: none; -} -.navbar .brand { - float: left; - display: block; - padding: 8px 20px 12px; - margin-left: -20px; - font-size: 20px; - font-weight: 200; - line-height: 1; - color: #ffffff; -} -.navbar p { - margin: 0; - line-height: 40px; -} -.navbar p a:hover { - color: #ffffff; - background-color: transparent; -} -.navbar .btn, .navbar .btn-group { - margin-top: 5px; -} -.navbar .btn-group .btn { - margin-top: 0; -} -.navbar-form { - margin-bottom: 0; -} -.navbar-form input, .navbar-form select { - display: inline-block; - margin-bottom: 0; -} -.navbar-search { - position: relative; - float: left; - margin-top: 6px; - margin-bottom: 0; -} -.navbar-search .search-query { - padding: 4px 9px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: normal; - line-height: 1; - color: #ffffff; - color: rgba(255, 255, 255, 0.75); - background-color: #444; - background-color: rgba(255, 255, 255, 0.3); - border: 1px solid #111; - -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 .search-query:-moz-placeholder { - color: #eeeeee; -} -.navbar-search .search-query::-webkit-input-placeholder { - color: #eeeeee; -} -.navbar-search .search-query:hover { - color: #ffffff; - background-color: #999999; - background-color: rgba(255, 255, 255, 0.5); -} -.navbar-search .search-query:focus, .navbar-search .search-query.focused { - padding: 5px 10px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - outline: 0; -} -.navbar-static { - margin-bottom: 18px; -} -.navbar-static .navbar-inner { - padding-left: 20px; - padding-right: 20px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.navbar-fixed { - position: fixed; - top: 0; - right: 0; - left: 0; - z-index: 1030; -} -.navbar .nav { - position: relative; - left: 0; - display: block; - float: left; - margin: 0 10px 0 0; -} -.navbar .nav.pull-right { - float: right; -} -.navbar .nav > li { - display: block; - float: left; -} -.navbar .nav > li > a { - float: none; - padding: 10px 10px 11px; - line-height: 19px; - color: #999999; - text-decoration: none; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.navbar .nav > li > a:hover { - background-color: transparent; - color: #ffffff; - text-decoration: none; -} -.navbar .nav .active > a { - color: #ffffff; - text-decoration: none; - background-color: #222; - background-color: rgba(0, 0, 0, 0.5); -} -.navbar .vertical-divider { - height: 40px; - width: 1px; - margin: 0 5px; - overflow: hidden; - background-color: #222; - border-right: 1px solid #444; -} -.navbar .nav.pull-right { - margin-left: 10px; - margin-right: 0; -} -.navbar .dropdown-menu { - top: 41px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.navbar .dropdown-menu:before { - content: ''; - display: inline-block; - border-left: 7px solid transparent; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-bottom-color: rgba(0, 0, 0, 0.2); - position: absolute; - top: -7px; - left: 9px; -} -.navbar .dropdown-menu:after { - content: ''; - display: inline-block; - border-left: 6px solid transparent; - border-right: 6px solid transparent; - border-bottom: 6px solid #fff; - position: absolute; - top: -6px; - left: 10px; -} -.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret { - border-top-color: #fff; -} -.navbar .nav .active .caret { - filter: alpha(opacity=100); - -moz-opacity: 1; - opacity: 1; -} -.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle { - background-color: transparent; -} -.navbar .nav .active > .dropdown-toggle:hover { - color: #fff; -} -.navbar .nav.pull-right .dropdown-menu { - right: 0; -} -.navbar .nav.pull-right .dropdown-menu:before { - left: auto; - right: 12px; -} -.navbar .nav.pull-right .dropdown-menu:after { - left: auto; - right: 13px; -} .nav { margin-left: 0; margin-bottom: 18px; @@ -2040,6 +1824,222 @@ i { .tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover { border-color: #ddd #ddd #ddd transparent; } +.navbar { + overflow: visible; +} +.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 .brand:hover { + color: #ffffff; + text-decoration: none; +} +.navbar .brand { + float: left; + display: block; + padding: 8px 20px 12px; + margin-left: -20px; + font-size: 20px; + font-weight: 200; + line-height: 1; + color: #ffffff; +} +.navbar p { + margin: 0; + line-height: 40px; +} +.navbar p a:hover { + color: #ffffff; + background-color: transparent; +} +.navbar .btn, .navbar .btn-group { + margin-top: 5px; +} +.navbar .btn-group .btn { + margin-top: 0; +} +.navbar-form { + margin-bottom: 0; +} +.navbar-form input, .navbar-form select { + display: inline-block; + margin-bottom: 0; +} +.navbar-search { + position: relative; + float: left; + margin-top: 6px; + margin-bottom: 0; +} +.navbar-search .search-query { + padding: 4px 9px; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 13px; + font-weight: normal; + line-height: 1; + color: #ffffff; + color: rgba(255, 255, 255, 0.75); + background: #444; + background: rgba(255, 255, 255, 0.3); + border: 1px solid #111; + -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 .search-query :-moz-placeholder { + color: #eeeeee; +} +.navbar-search .search-query ::-webkit-input-placeholder { + color: #eeeeee; +} +.navbar-search .search-query:hover { + color: #ffffff; + background-color: #999999; + background-color: rgba(255, 255, 255, 0.5); +} +.navbar-search .search-query:focus, .navbar-search .search-query.focused { + padding: 5px 10px; + color: #333333; + text-shadow: 0 1px 0 #ffffff; + background-color: #ffffff; + border: 0; + -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + outline: 0; +} +.navbar-static { + margin-bottom: 18px; +} +.navbar-static .navbar-inner { + padding-left: 20px; + padding-right: 20px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.navbar-fixed { + position: fixed; + top: 0; + right: 0; + left: 0; + z-index: 1030; +} +.navbar .nav { + position: relative; + left: 0; + display: block; + float: left; + margin: 0 10px 0 0; +} +.navbar .nav.pull-right { + float: right; +} +.navbar .nav > li { + display: block; + float: left; +} +.navbar .nav > li > a { + float: none; + padding: 10px 10px 11px; + line-height: 19px; + color: #999999; + text-decoration: none; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +} +.navbar .nav > li > a:hover { + background-color: transparent; + color: #ffffff; + text-decoration: none; +} +.navbar .nav .active > a { + color: #ffffff; + text-decoration: none; + background-color: #222; + background-color: rgba(0, 0, 0, 0.5); +} +.navbar .vertical-divider { + height: 40px; + width: 1px; + margin: 0 5px; + overflow: hidden; + background-color: #222; + border-right: 1px solid #444; +} +.navbar .nav.pull-right { + margin-left: 10px; + margin-right: 0; +} +.navbar .dropdown-menu { + top: 41px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.navbar .dropdown-menu:before { + content: ''; + display: inline-block; + border-left: 7px solid transparent; + border-right: 7px solid transparent; + border-bottom: 7px solid #ccc; + border-bottom-color: rgba(0, 0, 0, 0.2); + position: absolute; + top: -7px; + left: 9px; +} +.navbar .dropdown-menu:after { + content: ''; + display: inline-block; + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-bottom: 6px solid #fff; + position: absolute; + top: -6px; + left: 10px; +} +.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret { + border-top-color: #fff; +} +.navbar .nav .active .caret { + filter: alpha(opacity=100); + -moz-opacity: 1; + opacity: 1; +} +.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle { + background-color: transparent; +} +.navbar .nav .active > .dropdown-toggle:hover { + color: #fff; +} +.navbar .nav.pull-right .dropdown-menu { + right: 0; +} +.navbar .nav.pull-right .dropdown-menu:before { + left: auto; + right: 12px; +} +.navbar .nav.pull-right .dropdown-menu:after { + left: auto; + right: 13px; +} .breadcrumb { padding: 7px 14px; margin: 0 0 18px; -- cgit v1.2.3 From d12560c0ee77e69011012095b04332aeb97b9c42 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jan 2012 00:30:49 -0800 Subject: make button active state clearer by lightening the inner shadow and removing the background image --- bootstrap.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 681605a88..2ba50f1de 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: Wed Jan 18 00:23:51 PST 2012 + * Date: Wed Jan 18 00:30:09 PST 2012 */ html, body { margin: 0; @@ -2527,9 +2527,10 @@ i { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } .btn.active, .btn:active { - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); + background-image: none; + -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); } .btn.disabled { cursor: default; -- cgit v1.2.3 From ab8f2e2767be77120fedb07269dc7db078101dba Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jan 2012 00:35:14 -0800 Subject: don't scope placeholder text color to just inputs --- bootstrap.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 2ba50f1de..460cd7ba0 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: Wed Jan 18 00:30:09 PST 2012 + * Date: Wed Jan 18 00:34:59 PST 2012 */ html, body { margin: 0; @@ -842,10 +842,10 @@ input:invalid:focus, textarea:invalid:focus, select:invalid:focus { box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); cursor: not-allowed; } -input:-moz-placeholder { +:-moz-placeholder { color: #999999; } -input::-webkit-input-placeholder { +::-webkit-input-placeholder { color: #999999; } .help-block { -- cgit v1.2.3 From 25ac318d33329a0fb532d5f9ec922ad76d791959 Mon Sep 17 00:00:00 2001 From: Nicolas Gallagher Date: Thu, 19 Jan 2012 20:33:22 +0000 Subject: Remove unnecessary CSS properties from the clearfix mixin. --- bootstrap.css | 44 ++++++++++++-------------------------------- 1 file changed, 12 insertions(+), 32 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 460cd7ba0..4dcf33955 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: Wed Jan 18 00:34:59 PST 2012 + * Date: Thu 19 Jan 2012 20:33:11 GMT */ html, body { margin: 0; @@ -182,13 +182,11 @@ body { width: 940px; margin-left: auto; margin-right: auto; - zoom: 1; + *zoom: 1; } .container:before, .container:after { display: table; - *display: inline; content: ""; - zoom: 1; } .container:after { clear: both; @@ -198,13 +196,11 @@ body { min-width: 940px; padding-left: 20px; padding-right: 20px; - zoom: 1; + *zoom: 1; } .fluid-container:before, .fluid-container:after { display: table; - *display: inline; content: ""; - zoom: 1; } .fluid-container:after { clear: both; @@ -243,13 +239,11 @@ a:hover { } .row { margin-left: -20px; - zoom: 1; + *zoom: 1; } .row:before, .row:after { display: table; - *display: inline; content: ""; - zoom: 1; } .row:after { clear: both; @@ -865,16 +859,14 @@ input:invalid:focus, textarea:invalid:focus, select:invalid:focus { } .input-prepend, .input-append { margin-bottom: 5px; - zoom: 1; + *zoom: 1; } .input-prepend:before, .input-append:before, .input-prepend:after, .input-append:after { display: table; - *display: inline; content: ""; - zoom: 1; } .input-prepend:after, .input-append:after { clear: both; @@ -1610,16 +1602,14 @@ i { background-color: #0088cc; } .tabs, .pills { - zoom: 1; + *zoom: 1; } .tabs:before, .pills:before, .tabs:after, .pills:after { display: table; - *display: inline; content: ""; - zoom: 1; } .tabs:after, .pills:after { clear: both; @@ -1743,13 +1733,11 @@ i { border-color: #999; } .tabbable { - zoom: 1; + *zoom: 1; } .tabbable:before, .tabbable:after { display: table; - *display: inline; content: ""; - zoom: 1; } .tabbable:after { clear: both; @@ -1907,7 +1895,7 @@ i { .navbar-search .search-query :-moz-placeholder { color: #eeeeee; } -.navbar-search .search-query ::-webkit-input-placeholder { +.navbar-search .search-query::-webkit-input-placeholder { color: #eeeeee; } .navbar-search .search-query:hover { @@ -2135,13 +2123,11 @@ i { margin-bottom: 18px; list-style: none; text-align: center; - zoom: 1; + *zoom: 1; } .pager:before, .pager:after { display: table; - *display: inline; content: ""; - zoom: 1; } .pager:after { clear: both; @@ -2237,13 +2223,11 @@ i { -webkit-box-shadow: inset 0 1px 0 #ffffff; -moz-box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff; - zoom: 1; + *zoom: 1; } .modal-footer:before, .modal-footer:after { display: table; - *display: inline; content: ""; - zoom: 1; } .modal-footer:after { clear: both; @@ -2575,13 +2559,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .btn-group { position: relative; - zoom: 1; + *zoom: 1; } .btn-group:before, .btn-group:after { display: table; - *display: inline; content: ""; - zoom: 1; } .btn-group:after { clear: both; @@ -2730,13 +2712,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .thumbnails { margin-left: -20px; list-style: none; - zoom: 1; + *zoom: 1; } .thumbnails:before, .thumbnails:after { display: table; - *display: inline; content: ""; - zoom: 1; } .thumbnails:after { clear: both; -- cgit v1.2.3 From 8825443d6e6ff28a97e092f46b42ec508e58cb05 Mon Sep 17 00:00:00 2001 From: Nicolas Gallagher Date: Thu, 19 Jan 2012 21:02:00 +0000 Subject: Remove search input cancel button in WebKit-OSX. On input elements with a `type` of `search`, WebKit on OS X will display a cancel button after text has been entered. This can look ugly or be poorly position when you've added other styles to the input (especially additional padding). --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 4dcf33955..959eb2421 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: Thu 19 Jan 2012 20:33:11 GMT + * Date: Thu 19 Jan 2012 22:27:04 GMT */ html, body { margin: 0; @@ -163,7 +163,7 @@ input[type="search"] { -moz-box-sizing: content-box; box-sizing: content-box; } -input[type="search"]::-webkit-search-decoration { +input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button { -webkit-appearance: none; } textarea { -- cgit v1.2.3 From 782c994060a984c10d73fdd3cc8e3fe33a2e4477 Mon Sep 17 00:00:00 2001 From: Nicolas Gallagher Date: Fri, 20 Jan 2012 21:16:40 +0000 Subject: Remove global reset in favour of contextual reset. Rather than having a partial reset with individual elements having their styles built back up, only elements without replacement styles have specific properties 'reset'. This commit also includes: a correction to the font mixin arguments used on forms (the output is now valid CSS); the removal of `overflow-y:scroll` from the `html` element which is now known to cause some problems for jQuery modal plugins in Firefox. --- bootstrap.css | 146 +++++++++++++++++++--------------------------------------- 1 file changed, 47 insertions(+), 99 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 959eb2421..b2aaece91 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,95 +6,8 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Thu 19 Jan 2012 22:27:04 GMT + * Date: Fri 20 Jan 2012 21:21:51 GMT */ -html, body { - margin: 0; - padding: 0; -} -h1, -h2, -h3, -h4, -h5, -h6, -p, -blockquote, -pre, -a, -abbr, -acronym, -address, -cite, -code, -del, -dfn, -em, -img, -q, -s, -samp, -small, -strike, -strong, -sub, -sup, -tt, -var, -dd, -dl, -dt, -li, -ol, -ul, -fieldset, -form, -label, -legend, -button, -table, -caption, -tbody, -tfoot, -thead, -tr, -th, -td { - margin: 0; - padding: 0; - border: 0; - font-weight: normal; - font-style: normal; - font-size: 100%; - line-height: 1; - font-family: inherit; -} -table { - max-width: 100%; - border-collapse: collapse; - border-spacing: 0; -} -ol, ul { - list-style: none; -} -q:before, -q:after, -blockquote:before, -blockquote:after { - content: ""; -} -html { - overflow-y: scroll; - font-size: 100%; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; -} -a:focus { - outline: thin dotted; -} -a:hover, a:active { - outline: 0; -} article, aside, details, @@ -115,6 +28,17 @@ audio, canvas, video { audio:not([controls]) { display: none; } +html { + font-size: 100%; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; +} +a:focus { + outline: thin dotted; +} +a:hover, a:active { + outline: 0; +} sub, sup { position: relative; font-size: 75%; @@ -228,8 +152,6 @@ body { width: 100%; } a { - font-weight: inherit; - line-height: inherit; color: #0088cc; text-decoration: none; } @@ -322,7 +244,7 @@ a:hover { margin-left: 900px; } p { - margin-bottom: 9px; + margin: 0 0 9px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; line-height: 18px; @@ -337,6 +259,7 @@ h3, h4, h5, h6 { + margin: 0; font-weight: bold; color: #333333; text-rendering: optimizelegibility; @@ -347,6 +270,7 @@ h3 small, h4 small, h5 small, h6 small { + font-weight: normal; color: #999999; } h1 { @@ -388,6 +312,7 @@ h6 { text-transform: uppercase; } ul, ol { + padding: 0; margin: 0 0 9px 25px; } ul ul, @@ -428,13 +353,10 @@ hr { border-bottom: 1px solid #fff; } strong { - font-style: inherit; font-weight: bold; } em { font-style: italic; - font-weight: inherit; - line-height: inherit; } .muted { color: #999999; @@ -446,8 +368,8 @@ abbr { cursor: help; } blockquote { - padding-left: 15px; - margin-bottom: 18px; + padding: 0 0 0 15px; + margin: 0 0 18px; border-left: 5px solid #eee; } blockquote p { @@ -474,10 +396,17 @@ blockquote.pull-right { blockquote.pull-right p, blockquote.pull-right small { text-align: right; } +q:before, +q:after, +blockquote:before, +blockquote:after { + content: ""; +} address { display: block; margin-bottom: 18px; line-height: 18px; + font-style: normal; } code, pre { padding: 0 3px 2px; @@ -515,26 +444,40 @@ pre code { padding: 0; background-color: transparent; } +small { + font-size: 100%; +} +cite { + font-style: normal; +} form { - margin-bottom: 18px; + margin: 0 0 18px; +} +fieldset { + padding: 0; + margin: 0; + border: 0; } legend { display: block; width: 100%; + padding: 0; margin-bottom: 27px; font-size: 19.5px; line-height: 36px; color: #333333; + border: 0; border-bottom: 1px solid #eee; -webkit-margin-collapse: separate; } label, input, +button, select, textarea { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: normal; - font-weight: 13px; + font-size: 13px; + font-weight: normal; line-height: 18px; } label { @@ -967,6 +910,11 @@ input:invalid:focus, textarea:invalid:focus, select:invalid:focus { .form-horizontal .form-actions { padding-left: 160px; } +table { + max-width: 100%; + border-collapse: collapse; + border-spacing: 0; +} .table { width: 100%; margin-bottom: 18px; -- cgit v1.2.3 From 155b72e8730e9b8badb5fa80c8d7f8990f10cc82 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 22 Jan 2012 20:02:56 -0800 Subject: share -> share-alt --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 959eb2421..b27045169 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: Thu 19 Jan 2012 22:27:04 GMT + * Date: Sun Jan 22 20:02:42 PST 2012 */ html, body { margin: 0; @@ -1391,7 +1391,7 @@ i { .arrow-down { background-position: -312px -96px; } -.share { +.share-alt { background-position: -336px -96px; } .resize-full { -- cgit v1.2.3 From b8c0388f8af8ae93a514efaa352f63ecdffde279 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 22 Jan 2012 20:07:17 -0800 Subject: fix sans-serif order in forms.less and rebuild --- bootstrap.css | 68 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index b27045169..fcfcf02f7 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 Jan 22 20:02:42 PST 2012 + * Date: Sun Jan 22 20:06:46 PST 2012 */ html, body { margin: 0; @@ -425,7 +425,7 @@ hr { margin: 18px 0; border: 0; border-top: 1px solid #e5e5e5; - border-bottom: 1px solid #fff; + border-bottom: 1px solid #ffffff; } strong { font-style: inherit; @@ -448,7 +448,7 @@ abbr { blockquote { padding-left: 15px; margin-bottom: 18px; - border-left: 5px solid #eee; + border-left: 5px solid #eeeeee; } blockquote p { margin-bottom: 0; @@ -469,7 +469,7 @@ blockquote.pull-right { padding-left: 0; padding-right: 15px; border-left: 0; - border-right: 5px solid #eee; + border-right: 5px solid #eeeeee; } blockquote.pull-right p, blockquote.pull-right small { text-align: right; @@ -533,8 +533,8 @@ input, select, textarea { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: normal; - font-weight: 13px; + font-size: 13px; + font-weight: normal; line-height: 18px; } label { @@ -1101,7 +1101,7 @@ table .header:after { margin-top: 7px; border-width: 0 4px 4px; border-style: solid; - border-color: #000 transparent; + border-color: #000000 transparent; visibility: hidden; } table .headerSortUp, table .headerSortDown { @@ -1121,7 +1121,7 @@ table .headerSortUp:after { border-bottom: none; border-left: 4px solid transparent; border-right: 4px solid transparent; - border-top: 4px solid #000; + border-top: 4px solid #000000; visibility: visible; -webkit-box-shadow: none; -moz-box-shadow: none; @@ -1420,7 +1420,7 @@ i { vertical-align: top; border-left: 4px solid transparent; border-right: 4px solid transparent; - border-top: 4px solid #000; + border-top: 4px solid #000000; filter: alpha(opacity=30); -moz-opacity: 0.3; opacity: 0.3; @@ -1483,7 +1483,7 @@ i { white-space: nowrap; } .dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover { - color: #fff; + color: #ffffff; text-decoration: none; background-color: #0088cc; } @@ -1572,7 +1572,7 @@ i { } .nav > li > a:hover { text-decoration: none; - background-color: #eee; + background-color: #eeeeee; } .nav.list { padding-left: 14px; @@ -1638,7 +1638,7 @@ i { border-radius: 4px 4px 0 0; } .tabs > li > a:hover { - border-color: #eee #eee #ddd; + border-color: #eeeeee #eeeeee #dddddd; } .tabs > .active > a, .tabs > .active > a:hover { color: #555555; @@ -1712,25 +1712,25 @@ i { border-top-color: #005580; } .tabs .active .dropdown-toggle .caret, .pills .active .dropdown-toggle .caret { - border-top-color: #333; + border-top-color: #333333; } .nav > .dropdown.active > a:hover { - color: #000; + color: #000000; cursor: pointer; } .tabs .open .dropdown-toggle, .pills .open .dropdown-toggle, .nav > .open.active > a:hover { - color: #fff; - background-color: #999; - border-color: #999; + color: #ffffff; + background-color: #999999; + border-color: #999999; } .nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret { - border-top-color: #fff; + border-top-color: #ffffff; filter: alpha(opacity=100); -moz-opacity: 1; opacity: 1; } .tabs.stacked .open > a:hover { - border-color: #999; + border-color: #999999; } .tabbable { *zoom: 1; @@ -1790,7 +1790,7 @@ i { border-radius: 4px 0 0 4px; } .tabs-left .tabs > li > a:hover { - border-color: #eee #ddd #eee #eee; + border-color: #eeeeee #dddddd #eeeeee #eeeeee; } .tabs-left .tabs .active > a, .tabs-left .tabs .active > a:hover { border-color: #ddd transparent #ddd #ddd; @@ -1807,7 +1807,7 @@ i { border-radius: 0 4px 4px 0; } .tabs-right .tabs > li > a:hover { - border-color: #eee #eee #eee #ddd; + border-color: #eeeeee #eeeeee #eeeeee #dddddd; } .tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover { border-color: #ddd #ddd #ddd transparent; @@ -1961,7 +1961,7 @@ i { .navbar .nav .active > a { color: #ffffff; text-decoration: none; - background-color: #222; + background-color: #222222; background-color: rgba(0, 0, 0, 0.5); } .navbar .vertical-divider { @@ -1969,7 +1969,7 @@ i { width: 1px; margin: 0 5px; overflow: hidden; - background-color: #222; + background-color: #222222; border-right: 1px solid #444; } .navbar .nav.pull-right { @@ -1998,13 +1998,13 @@ i { display: inline-block; border-left: 6px solid transparent; border-right: 6px solid transparent; - border-bottom: 6px solid #fff; + border-bottom: 6px solid #ffffff; position: absolute; top: -6px; left: 10px; } .navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret { - border-top-color: #fff; + border-top-color: #ffffff; } .navbar .nav .active .caret { filter: alpha(opacity=100); @@ -2015,7 +2015,7 @@ i { background-color: transparent; } .navbar .nav .active > .dropdown-toggle:hover { - color: #fff; + color: #ffffff; } .navbar .nav.pull-right .dropdown-menu { right: 0; @@ -2299,7 +2299,7 @@ i { .tooltip-inner { max-width: 200px; padding: 3px 8px; - color: white; + color: #ffffff; text-align: center; text-decoration: none; background-color: #000000; @@ -2460,7 +2460,7 @@ i { padding: 5px 10px 6px; font-size: 13px; line-height: normal; - color: #333; + color: #333333; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); background-color: #e6e6e6; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); @@ -2650,7 +2650,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .danger .caret, .info .caret, .success .caret { - border-top-color: #fff; + border-top-color: #ffffff; filter: alpha(opacity=75); -moz-opacity: 0.75; opacity: 0.75; @@ -2993,7 +2993,7 @@ a.thumbnail:hover { line-height: 30px; color: #ccc; text-align: center; - background: #999; + background: #999999; background: rgba(0, 0, 0, 0.5); -webkit-border-radius: 20px; -moz-border-radius: 20px; @@ -3004,9 +3004,9 @@ a.thumbnail:hover { right: 15px; } .carousel-control:hover { - color: #fff; + color: #ffffff; text-decoration: none; - background: #333; + background: #333333; background: rgba(0, 0, 0, 0.75); } .carousel-caption { @@ -3015,11 +3015,11 @@ a.thumbnail:hover { right: 0; bottom: 0; padding: 10px 15px 5px; - background: #333; + background: #333333; background: rgba(0, 0, 0, 0.75); } .carousel-caption h4, .carousel-caption p { - color: #fff; + color: #ffffff; } .pull-right { float: right; -- cgit v1.2.3 From 36d56fb1ba803358e8244189fbef883290af87d0 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 22 Jan 2012 20:12:26 -0800 Subject: don't use negative margin - use first child to set to 0 --- bootstrap.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index fcfcf02f7..d96c2277b 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 Jan 22 20:06:46 PST 2012 + * Date: Sun Jan 22 20:11:39 PST 2012 */ html, body { margin: 0; @@ -238,7 +238,6 @@ a:hover { text-decoration: underline; } .row { - margin-left: -20px; *zoom: 1; } .row:before, .row:after { @@ -248,6 +247,9 @@ a:hover { .row:after { clear: both; } +[class*="span"]:first-child { + margin-left: 0; +} [class*="span"] { float: left; margin-left: 20px; -- cgit v1.2.3 From 36d2679f8358f91d8a2c746e0f14b3500b73c163 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 22 Jan 2012 20:31:58 -0800 Subject: give default valuse for border-radius-custom --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index d96c2277b..c40172304 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 Jan 22 20:11:39 PST 2012 + * Date: Sun Jan 22 20:31:51 PST 2012 */ html, body { margin: 0; -- cgit v1.2.3 From 2355ea034b2d2c46dde5faf01fd53aa324d13cae Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 22 Jan 2012 20:47:24 -0800 Subject: rebuild --- bootstrap.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index c40172304..732e0afc8 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 Jan 22 20:31:51 PST 2012 + * Date: Sun Jan 22 20:42:19 PST 2012 */ html, body { margin: 0; @@ -1440,7 +1440,7 @@ i { } .dropdown-menu { position: absolute; - top: 40px; + top: 100%; z-index: 1000; float: left; display: none; @@ -1698,7 +1698,7 @@ i { margin-bottom: 1px; } .pills .dropdown-menu, .tabs .dropdown-menu { - top: 33px; + margin-top: 1px; border-width: 1px; } .pills .dropdown-menu { @@ -1979,7 +1979,7 @@ i { margin-right: 0; } .navbar .dropdown-menu { - top: 41px; + margin-top: 1px; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -2630,7 +2630,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .btn-group.open .dropdown-menu { display: block; - top: 30px; + margin-top: 1px; -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; -- cgit v1.2.3 From 1209a3756c88043008950f74dd287b837e00f7d8 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 22 Jan 2012 20:50:35 -0800 Subject: :focus:required:invalid: http://www.alistapart.com/articles/forward-thinking-form-validation --- bootstrap.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 732e0afc8..aa68f04b9 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 Jan 22 20:42:19 PST 2012 + * Date: Sun Jan 22 20:50:28 PST 2012 */ html, body { margin: 0; @@ -812,11 +812,11 @@ textarea[readonly] { background-color: #bcddbc; border-color: #468847; } -input:invalid, textarea:invalid, select:invalid { +input:focus:required:invalid, textarea:focus:required:invalid, select:focus:required:invalid { color: #b94a48; border-color: #ee5f5b; } -input:invalid:focus, textarea:invalid:focus, select:invalid:focus { +input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, select:focus:required:invalid:focus { border-color: #e9322d; -webkit-box-shadow: 0 0 6px #f8b9b7; -moz-box-shadow: 0 0 6px #f8b9b7; -- cgit v1.2.3 From 00d925819405ef46fb09d4bef83761ea121a9364 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 23 Jan 2012 11:35:39 -0800 Subject: revert to negative margin on grid row --- bootstrap.css | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 85a3edb6f..fc0337f6d 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 Jan 23 11:25:06 PST 2012 + * Date: Mon Jan 23 11:35:22 PST 2012 */ article, aside, @@ -160,6 +160,7 @@ a:hover { text-decoration: underline; } .row { + margin-left: -20px; *zoom: 1; } .row:before, .row:after { @@ -169,9 +170,6 @@ a:hover { .row:after { clear: both; } -[class*="span"]:first-child { - margin-left: 0; -} [class*="span"] { float: left; margin-left: 20px; @@ -2673,7 +2671,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .thumbnails > li { float: left; - margin: 0 0 20px 20px; + margin: 0 0 18px 20px; } .thumbnail { display: block; -- cgit v1.2.3 From ff113acba88806380b995fba894d77b562ca0e0a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 23 Jan 2012 12:21:00 -0800 Subject: cut margin in half on default forms --- bootstrap.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index fc0337f6d..6f2a8c751 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 Jan 23 11:35:22 PST 2012 + * Date: Mon Jan 23 12:20:49 PST 2012 */ article, aside, @@ -896,6 +896,9 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec display: inline-block; } .control-group { + margin-bottom: 9px; +} +.form-horizontal .control-group { margin-bottom: 18px; } .form-horizontal .control-group > label { -- cgit v1.2.3 From cd5ffbe39626303a395448a6c9a507f3ad04ff5e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 23 Jan 2012 13:50:55 -0800 Subject: fix up the modals in responsive a bit --- bootstrap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 6f2a8c751..91c4ca701 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 Jan 23 12:20:49 PST 2012 + * Date: Mon Jan 23 13:48:03 PST 2012 */ article, aside, @@ -3068,6 +3068,7 @@ a.thumbnail:hover { left: 20px; right: 20px; width: auto; + margin: 0; } .modal.fade.in { top: auto; -- cgit v1.2.3 From f764aee4b919c28974dba7b91edac9a04172ba25 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 23 Jan 2012 14:14:16 -0800 Subject: add templates for doc generation --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index aa68f04b9..b911730eb 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 Jan 22 20:50:28 PST 2012 + * Date: Mon Jan 23 14:12:25 PST 2012 */ html, body { margin: 0; -- cgit v1.2.3 From 9a68f115e7d850c47297bc7931fcbd1125b39f59 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 23 Jan 2012 15:07:07 -0800 Subject: rebuild --- bootstrap.css | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 2908ac296..c1ac5102f 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,11 +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. -<<<<<<< HEAD - * Date: Mon Jan 23 14:12:25 PST 2012 -======= - * Date: Mon Jan 23 13:48:03 PST 2012 ->>>>>>> a074087034716804610637a5ad9cc0447a2cccb2 + * Date: Mon Jan 23 15:07:02 PST 2012 */ article, aside, @@ -1850,7 +1846,7 @@ i { .navbar-search .search-query :-moz-placeholder { color: #eeeeee; } -.navbar-search .search-query ::-webkit-input-placeholder { +.navbar-search .search-query::-webkit-input-placeholder { color: #eeeeee; } .navbar-search .search-query:hover { @@ -2505,7 +2501,7 @@ i { padding: 7px 9px 7px; font-size: 11px; } -:root .alert-message, :root .btn { +:root .btn { border-radius: 0 \0; } button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { @@ -3067,7 +3063,7 @@ a.thumbnail:hover { padding-left: 0; } .modal { - position: fixed; + position: absolute; top: 20px; left: 20px; right: 20px; -- cgit v1.2.3 From b4b1ef68398b68dcdfa29465d06cd76d6bf2c49d Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 23 Jan 2012 15:17:32 -0800 Subject: rebuild with new templates --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index c1ac5102f..c448c33c5 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 Jan 23 15:07:02 PST 2012 + * Date: Mon Jan 23 15:15:08 PST 2012 */ article, aside, -- cgit v1.2.3 From 7d2e13f1b4e0de55f3107f2aaa22326e26866541 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 10:43:13 -0800 Subject: remake css --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index c448c33c5..cce7b7442 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 Jan 23 15:15:08 PST 2012 + * Date: Tue Jan 24 10:43:08 PST 2012 */ article, aside, @@ -1846,7 +1846,7 @@ i { .navbar-search .search-query :-moz-placeholder { color: #eeeeee; } -.navbar-search .search-query::-webkit-input-placeholder { +.navbar-search .search-query ::-webkit-input-placeholder { color: #eeeeee; } .navbar-search .search-query:hover { -- cgit v1.2.3 From b0bd1d82035c22031e75627df0d3853c9d1e285c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 10:45:29 -0800 Subject: add bottom-up styles to the dropdown menus --- bootstrap.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index cce7b7442..ee88e9d4c 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 Jan 24 10:43:08 PST 2012 + * Date: Tue Jan 24 10:45:20 PST 2012 */ article, aside, @@ -1417,6 +1417,11 @@ i { *border-right-width: 2px; *border-bottom-width: 2px; } +.dropdown-menu.bottom-up { + top: auto; + bottom: 100%; + margin-bottom: 2px; +} .dropdown-menu .divider { height: 1px; margin: 5px 1px; -- cgit v1.2.3 From e829001e5cb488a7708878b074205fc41e82fc82 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 12:28:20 -0800 Subject: attempt to fix select list alignment in Firefox by removing padding. not quite fixed 100%, but getting there. --- bootstrap.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index ee88e9d4c..71d942401 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 Jan 24 10:45:20 PST 2012 + * Date: Tue Jan 24 12:27:30 PST 2012 */ article, aside, @@ -537,7 +537,6 @@ select, input[type=file] { } select { width: 220px; - padding: 0; vertical-align: middle; background-color: #ffffff; } -- cgit v1.2.3 From 3f54db9c6ac0126b071a1874cd2f5c0379a4f393 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 12:53:30 -0800 Subject: remake --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 71d942401..845598de2 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 Jan 24 12:27:30 PST 2012 + * Date: Tue Jan 24 12:53:25 PST 2012 */ article, aside, -- cgit v1.2.3 From fecd4ddd135a893f2c5c103d565e9d1ab110d247 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 14:25:30 -0800 Subject: docs updates to make the getting started section more responsive, updated the benefits to be clearer and swap x for checkmark --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 845598de2..fb3a3f2ab 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 Jan 24 12:53:25 PST 2012 + * Date: Tue Jan 24 13:58:10 PST 2012 */ article, aside, -- cgit v1.2.3 From 8ff621aa26dee69088b527089cdd719bce68be31 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 16:07:30 -0800 Subject: fix broken index page heading, update variables and less pages --- bootstrap.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index fb3a3f2ab..a33bd7312 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 Jan 24 13:58:10 PST 2012 + * Date: Tue Jan 24 16:01:37 PST 2012 */ article, aside, @@ -411,15 +411,18 @@ address { code, pre { padding: 0 3px 2px; font-family: Menlo, Monaco, "Courier New", monospace; - font-size: 12px; + font-size: 11px; color: #333333; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } code { - padding: 1px 3px; + padding: 3px 4px; background-color: #fee9cc; + color: #d14; + background-color: #f7f7f9; + border: 1px solid #e1e1e8; } pre { display: block; -- cgit v1.2.3 From c2312220e4e1da3939c9fa79e97d79f693058ea2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 16:19:01 -0800 Subject: fix code type size --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index a33bd7312..5802262f0 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 Jan 24 16:01:37 PST 2012 + * Date: Tue Jan 24 16:18:56 PST 2012 */ article, aside, @@ -411,7 +411,7 @@ address { code, pre { padding: 0 3px 2px; font-family: Menlo, Monaco, "Courier New", monospace; - font-size: 11px; + font-size: 12px; color: #333333; -webkit-border-radius: 3px; -moz-border-radius: 3px; -- cgit v1.2.3 From 40e92221a616bfe4e9500bcf2b72c86844f7f03f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 16:54:35 -0800 Subject: revamp alert message and error state color/text/bg to be variables --- bootstrap.css | 64 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 5802262f0..d7594416b 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 Jan 24 16:18:56 PST 2012 + * Date: Tue Jan 24 16:50:16 PST 2012 */ article, aside, @@ -701,58 +701,58 @@ textarea[readonly] { border-color: #ddd; cursor: not-allowed; } -.control-group.error > label, .control-group.error .help-block, .control-group.error .help-inline { - color: #b94a48; -} -.control-group.error input, .control-group.error textarea { - color: #b94a48; - border-color: #ee5f5b; -} -.control-group.error input:focus, .control-group.error textarea:focus { - border-color: #e9322d; - -webkit-box-shadow: 0 0 6px #f8b9b7; - -moz-box-shadow: 0 0 6px #f8b9b7; - box-shadow: 0 0 6px #f8b9b7; -} -.control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { - color: #b94a48; - background-color: #fce6e6; - border-color: #b94a48; -} .control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline { color: #c09853; } .control-group.warning input, .control-group.warning textarea { color: #c09853; - border-color: #ccae64; + border-color: #f3edd2; } .control-group.warning input:focus, .control-group.warning textarea:focus { - border-color: #be9a3f; - -webkit-box-shadow: 0 0 6px #e5d6b1; - -moz-box-shadow: 0 0 6px #e5d6b1; - box-shadow: 0 0 6px #e5d6b1; + border-color: #e8ddaa; + -webkit-box-shadow: 0 0 6px #ffffff; + -moz-box-shadow: 0 0 6px #ffffff; + box-shadow: 0 0 6px #ffffff; } .control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { color: #c09853; - background-color: #d2b877; + background-color: #fcf8e3; border-color: #c09853; } +.control-group.error > label, .control-group.error .help-block, .control-group.error .help-inline { + color: #b94a48; +} +.control-group.error input, .control-group.error textarea { + color: #b94a48; + border-color: #e9c7c7; +} +.control-group.error input:focus, .control-group.error textarea:focus { + border-color: #dba2a2; + -webkit-box-shadow: 0 0 6px #ffffff; + -moz-box-shadow: 0 0 6px #ffffff; + box-shadow: 0 0 6px #ffffff; +} +.control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { + color: #b94a48; + background-color: #f2dede; + border-color: #b94a48; +} .control-group.success > label, .control-group.success .help-block, .control-group.success .help-inline { color: #468847; } .control-group.success input, .control-group.success textarea { color: #468847; - border-color: #57a957; + border-color: #cfe8c4; } .control-group.success input:focus, .control-group.success textarea:focus { - border-color: #458845; - -webkit-box-shadow: 0 0 6px #9acc9a; - -moz-box-shadow: 0 0 6px #9acc9a; - box-shadow: 0 0 6px #9acc9a; + border-color: #b1da9f; + -webkit-box-shadow: 0 0 6px #ffffff; + -moz-box-shadow: 0 0 6px #ffffff; + box-shadow: 0 0 6px #ffffff; } .control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { color: #468847; - background-color: #bcddbc; + background-color: #dff0d8; border-color: #468847; } input:focus:required:invalid, textarea:focus:required:invalid, select:focus:required:invalid { @@ -2648,7 +2648,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .alert-error, .alert-danger .alert-heading, .alert-error .alert-heading { - color: #B94A48; + color: #b94a48; } .alert-info { background-color: #d9edf7; -- cgit v1.2.3 From 805a965f2e7373db42d99376d4dc3c1ca9ea509d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 17:14:19 -0800 Subject: finish updating form state and alert variables in less docs page --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index d7594416b..0cc74c8e2 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 Jan 24 16:50:16 PST 2012 + * Date: Tue Jan 24 17:04:46 PST 2012 */ article, aside, -- cgit v1.2.3 From 26ed8202ee270ce8b103491613fb2f5053472a70 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 18:24:38 -0800 Subject: modify the scaffolding page to fix the language around preboot/grid variables --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 0cc74c8e2..c626cb0f5 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 Jan 24 17:04:46 PST 2012 + * Date: Tue Jan 24 18:24:24 PST 2012 */ article, aside, -- cgit v1.2.3 From 672ba4c2fd9a42d4f178e795ebc162cce81bbc2f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 19:19:50 -0800 Subject: update the subnav on all pages --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index c626cb0f5..49f31bc1d 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 Jan 24 18:24:24 PST 2012 + * Date: Tue Jan 24 19:19:33 PST 2012 */ article, aside, -- cgit v1.2.3 From 4a6d9106b8f92a85a528971c70f132c32b6c43cf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 19:36:42 -0800 Subject: fix the thumbnails more examples section --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 49f31bc1d..48f370d51 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 Jan 24 19:19:33 PST 2012 + * Date: Tue Jan 24 19:36:20 PST 2012 */ article, aside, -- cgit v1.2.3 From a03fbc18cb50c7735b80e3ced6a6ebbe2ea05d2b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 20:30:26 -0800 Subject: allow for text in progress bars --- bootstrap.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 48f370d51..3de652f55 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 Jan 24 19:36:20 PST 2012 + * Date: Tue Jan 24 20:30:11 PST 2012 */ article, aside, @@ -2772,6 +2772,10 @@ a.thumbnail:hover { .progress .bar { width: 0%; height: 18px; + color: #fff; + font-size: 12px; + text-align: center; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #0480be; background-image: -khtml-gradient(linear, left top, left bottom, from(#149bdf), to(#0480be)); background-image: -moz-linear-gradient(top, #149bdf, #0480be); -- cgit v1.2.3 From a5c1d1f1828c333e373cdc5da5da2f6d946ad45e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 20:45:38 -0800 Subject: adding actual images to carousel to ensure you can see things are animating; updated styles of carousel controls to work on light and dark backgrounds and use opacity for effects --- bootstrap.css | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 3de652f55..62690e42f 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 Jan 24 20:30:11 PST 2012 + * Date: Tue Jan 24 20:44:12 PST 2012 */ article, aside, @@ -2953,13 +2953,21 @@ a.thumbnail:hover { font-size: 60px; font-weight: 100; line-height: 30px; - color: #ccc; + color: #fff; text-align: center; - background: #999999; - background: rgba(0, 0, 0, 0.5); - -webkit-border-radius: 20px; - -moz-border-radius: 20px; - border-radius: 20px; + background: #222222; + border: 3px solid #fff; + -webkit-border-radius: 23px; + -moz-border-radius: 23px; + border-radius: 23px; + filter: alpha(opacity=50); + -moz-opacity: 0.5; + opacity: 0.5; + -webkit-transition: all 0.2s linear; + -moz-transition: all 0.2s linear; + -ms-transition: all 0.2s linear; + -o-transition: all 0.2s linear; + transition: all 0.2s linear; } .carousel-control.right { left: auto; @@ -2968,8 +2976,9 @@ a.thumbnail:hover { .carousel-control:hover { color: #ffffff; text-decoration: none; - background: #333333; - background: rgba(0, 0, 0, 0.75); + filter: alpha(opacity=90); + -moz-opacity: 0.9; + opacity: 0.9; } .carousel-caption { position: absolute; -- cgit v1.2.3 From f2fe2b1798380ab65e88281ab4db47965cd5aaf8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 21:11:20 -0800 Subject: remove top margin from alert close, chance close line height to 18px (baseLineHeight) --- bootstrap.css | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 62690e42f..4bda5047e 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 Jan 24 20:44:12 PST 2012 + * Date: Tue Jan 24 21:10:54 PST 2012 */ article, aside, @@ -1505,7 +1505,7 @@ i { float: right; font-size: 20px; font-weight: bold; - line-height: 12px; + line-height: 18px; color: #000000; text-shadow: 0 1px 0 #ffffff; filter: alpha(opacity=20); @@ -2627,11 +2627,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { color: #c09853; } .alert .close { - *margin-top: 3px; - /* IE7 spacing */ - position: relative; right: -21px; + line-height: 18px; } .alert-success { background-color: #dff0d8; -- cgit v1.2.3 From 6ab56051fdf916f03efb8aa6675e50bdd1cc3155 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 23:35:34 -0800 Subject: fix up docs css for responsive and subnav, fix forms error states --- bootstrap.css | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 4bda5047e..33be3d966 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 Jan 24 21:10:54 PST 2012 + * Date: Tue Jan 24 23:35:08 PST 2012 */ article, aside, @@ -253,6 +253,12 @@ p small { font-size: 11px; color: #999999; } +.lead { + margin-bottom: 18px; + font-size: 20px; + font-weight: 200; + line-height: 27px; +} h1, h2, h3, @@ -419,7 +425,6 @@ code, pre { } code { padding: 3px 4px; - background-color: #fee9cc; color: #d14; background-color: #f7f7f9; border: 1px solid #e1e1e8; @@ -706,13 +711,13 @@ textarea[readonly] { } .control-group.warning input, .control-group.warning textarea { color: #c09853; - border-color: #f3edd2; + border-color: #c09853; } .control-group.warning input:focus, .control-group.warning textarea:focus { - border-color: #e8ddaa; - -webkit-box-shadow: 0 0 6px #ffffff; - -moz-box-shadow: 0 0 6px #ffffff; - box-shadow: 0 0 6px #ffffff; + border-color: #a47e3c; + -webkit-box-shadow: 0 0 6px #dbc59e; + -moz-box-shadow: 0 0 6px #dbc59e; + box-shadow: 0 0 6px #dbc59e; } .control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { color: #c09853; @@ -724,13 +729,13 @@ textarea[readonly] { } .control-group.error input, .control-group.error textarea { color: #b94a48; - border-color: #e9c7c7; + border-color: #b94a48; } .control-group.error input:focus, .control-group.error textarea:focus { - border-color: #dba2a2; - -webkit-box-shadow: 0 0 6px #ffffff; - -moz-box-shadow: 0 0 6px #ffffff; - box-shadow: 0 0 6px #ffffff; + border-color: #953b39; + -webkit-box-shadow: 0 0 6px #d59392; + -moz-box-shadow: 0 0 6px #d59392; + box-shadow: 0 0 6px #d59392; } .control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { color: #b94a48; @@ -742,13 +747,13 @@ textarea[readonly] { } .control-group.success input, .control-group.success textarea { color: #468847; - border-color: #cfe8c4; + border-color: #468847; } .control-group.success input:focus, .control-group.success textarea:focus { - border-color: #b1da9f; - -webkit-box-shadow: 0 0 6px #ffffff; - -moz-box-shadow: 0 0 6px #ffffff; - box-shadow: 0 0 6px #ffffff; + border-color: #356635; + -webkit-box-shadow: 0 0 6px #7aba7b; + -moz-box-shadow: 0 0 6px #7aba7b; + box-shadow: 0 0 6px #7aba7b; } .control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { color: #468847; -- cgit v1.2.3 From b8fa6cfacf61a02ab769b9031253c7b06111fa7c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 01:22:29 -0800 Subject: move css builder and downloader to dedicated page, start to update remaining sections on LESS docs page --- bootstrap.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 33be3d966..3b04dc30e 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 Jan 24 23:35:08 PST 2012 + * Date: Wed Jan 25 01:02:35 PST 2012 */ article, aside, @@ -577,9 +577,9 @@ textarea { margin-left: 10px; } input, textarea { - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; -moz-transition: border linear 0.2s, box-shadow linear 0.2s; -ms-transition: border linear 0.2s, box-shadow linear 0.2s; @@ -588,9 +588,9 @@ input, textarea { } input:focus, textarea:focus { border-color: rgba(82, 168, 236, 0.8); - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); outline: 0; } input[type=file]:focus, input[type=checkbox]:focus, select:focus { -- cgit v1.2.3 From d8041f7c8f5f6fcb7777383429464f39879ba916 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 08:34:20 -0800 Subject: fix margin on input buttons in modals --- bootstrap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 3b04dc30e..616e90bb1 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: Wed Jan 25 01:02:35 PST 2012 + * Date: Wed Jan 25 08:34:06 PST 2012 */ article, aside, @@ -2198,6 +2198,7 @@ i { .modal-footer .btn { float: right; margin-left: 5px; + margin-bottom: 0; } .tooltip { position: absolute; -- cgit v1.2.3 From b01de5fc56ab031df8a08be9ce720c68ced7a5c1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 09:51:03 -0800 Subject: updated icons to require a base class .icon --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 616e90bb1..ffdf19f2e 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: Wed Jan 25 08:34:06 PST 2012 + * Date: Wed Jan 25 09:50:58 PST 2012 */ article, aside, @@ -1088,7 +1088,7 @@ table .headerSortUp:after { -moz-opacity: 0.6; opacity: 0.6; } -i { +.icon { background-image: url(docs/assets/img/glyphicons-halflings-sprite.png); background-position: 0 0; background-repeat: no-repeat; -- cgit v1.2.3 From 29b4ba0fc5a07ecbde11054dfa4406384a360d32 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 09:53:53 -0800 Subject: fix modal examples on js page, update modal close button positioning --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index ffdf19f2e..85b515ecc 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: Wed Jan 25 09:50:58 PST 2012 + * Date: Wed Jan 25 09:53:40 PST 2012 */ article, aside, @@ -2170,7 +2170,7 @@ table .headerSortUp:after { border-bottom: 1px solid #eee; } .modal-header .close { - margin-top: 7px; + margin-top: 2px; } .modal-body { padding: 15px; -- cgit v1.2.3 From 9553b1e3e9457a48b6da3724c906a36f935aa526 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 10:02:52 -0800 Subject: update docs to include separate responsive css, update docs to highlight proper file name, updated makefile to build responsive separately --- bootstrap.css | 247 +--------------------------------------------------------- 1 file changed, 1 insertion(+), 246 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 85b515ecc..d90ec9188 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: Wed Jan 25 09:53:40 PST 2012 + * Date: Wed Jan 25 10:01:08 PST 2012 */ article, aside, @@ -3011,248 +3011,3 @@ a.thumbnail:hover { .invisible { visibility: hidden; } -.hidden { - display: none; - visibility: hidden; -} -@media (max-width: 480px) { - .navbar .nav { - position: absolute; - top: 0; - left: 0; - width: 180px; - padding-top: 40px; - list-style: none; - } - .navbar .nav, .navbar .nav > li:last-child a { - -webkit-border-radius: 0 0 4px 0; - -moz-border-radius: 0 0 4px 0; - border-radius: 0 0 4px 0; - } - .navbar .nav > li { - float: none; - display: none; - } - .navbar .nav > li > a { - float: none; - background-color: #222; - } - .navbar .nav > .active { - display: block; - position: absolute; - top: 0; - left: 0; - } - .navbar .nav > .active > a { - background-color: transparent; - } - .navbar .nav > .active > a:hover { - background-color: #333; - } - .navbar .nav > .active > a:after { - display: inline-block; - width: 0; - height: 0; - margin-top: 8px; - margin-left: 6px; - text-indent: -99999px; - vertical-align: top; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid #ffffff; - filter: alpha(opacity=100); - -moz-opacity: 1; - opacity: 1; - content: "↓"; - } - .navbar .nav:hover > li { - display: block; - } - .navbar .nav:hover > li > a:hover { - background-color: #333; - } - .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; - } - .modal { - position: absolute; - top: 20px; - left: 20px; - right: 20px; - width: auto; - margin: 0; - } - .modal.fade.in { - top: auto; - } - .modal-header .close { - padding: 10px; - } -} -@media (max-width: 768px) { - .navbar-fixed { - position: absolute; - } - .navbar-fixed .nav { - float: none; - } - .container { - width: auto; - padding: 0 20px; - } - .row { - margin-left: 0; - } - .row > [class*="span"] { - float: none; - display: block; - width: auto; - margin: 0; - } -} -@media (min-width: 768px) and (max-width: 940px) { - .container { - width: 748px; - } - .span1 { - width: 44px; - } - .span2 { - width: 108px; - } - .span3 { - width: 172px; - } - .span4 { - width: 236px; - } - .span5 { - width: 300px; - } - .span6 { - width: 364px; - } - .span7 { - width: 428px; - } - .span8 { - width: 492px; - } - .span9 { - width: 556px; - } - .span10 { - width: 620px; - } - .span11 { - width: 684px; - } - .span12 { - width: 748px; - } - .offset1 { - margin-left: 64px; - } - .offset2 { - margin-left: 128px; - } - .offset3 { - margin-left: 192px; - } - .offset4 { - margin-left: 256px; - } - .offset5 { - margin-left: 320px; - } - .offset6 { - margin-left: 384px; - } - .offset7 { - margin-left: 448px; - } - .offset8 { - margin-left: 512px; - } - .offset9 { - margin-left: 576px; - } - .offset10 { - margin-left: 640px; - } - .offset11 { - margin-left: 704px; - } - .offset12 { - margin-left: 768px; - } -} -/* -@media (min-width: 1210px) { - - // 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; - } - - .container { - width: @siteWidth; - } - .row { - margin-left: @gridGutterWidth * -1; - } - [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 324ebb59900fd69411aec323a85953aec8c55bb6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 10:47:08 -0800 Subject: spec'ed out an examples overview page with links to current examples; examples still need work themselves though --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index d90ec9188..d028d2b3e 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: Wed Jan 25 10:01:08 PST 2012 + * Date: Wed Jan 25 10:46:38 PST 2012 */ article, aside, -- cgit v1.2.3 From 4a3ad1aa891f65547bd2e3e6de8862e3b26f47c9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 10:48:08 -0800 Subject: update responsive to use latest grid mixins --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index d028d2b3e..767624b14 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: Wed Jan 25 10:46:38 PST 2012 + * Date: Wed Jan 25 10:47:55 PST 2012 */ article, aside, -- cgit v1.2.3 From 603aaa01ef487d912569459adc69bc06eb0ade52 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 11:05:23 -0800 Subject: remake after updating variables from @lookfirst --- bootstrap.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 767624b14..33260da9e 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: Wed Jan 25 10:47:55 PST 2012 + * Date: Wed Jan 25 11:05:15 PST 2012 */ article, aside, @@ -2776,7 +2776,7 @@ a.thumbnail:hover { .progress .bar { width: 0%; height: 18px; - color: #fff; + color: #ffffff; font-size: 12px; text-align: center; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); @@ -2957,10 +2957,10 @@ a.thumbnail:hover { font-size: 60px; font-weight: 100; line-height: 30px; - color: #fff; + color: #ffffff; text-align: center; background: #222222; - border: 3px solid #fff; + border: 3px solid #ffffff; -webkit-border-radius: 23px; -moz-border-radius: 23px; border-radius: 23px; -- cgit v1.2.3 From cfa925cab6dbb10af28ddca6d38e76aed97bb1ef Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 11:15:48 -0800 Subject: remake after merging large button group fix --- bootstrap.css | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 33260da9e..8069c5d25 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: Wed Jan 25 11:05:15 PST 2012 + * Date: Wed Jan 25 11:15:41 PST 2012 */ article, aside, @@ -2597,9 +2597,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-border-radius: 5px; border-radius: 5px; } -.btn-group.open .dropdown-menu.large { - top: 40px; -} .btn-group.open .dropdown-toggle { background-image: none; -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -- cgit v1.2.3 From d3c5dd4e6acc421e06ef72680e794cfd9d52a04a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 11:21:44 -0800 Subject: updated comments in forms.less and added uneditable-textarea class to extend uneditable-input --- bootstrap.css | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 8069c5d25..0166a3201 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: Wed Jan 25 11:15:41 PST 2012 + * Date: Wed Jan 25 11:21:22 PST 2012 */ article, aside, @@ -510,13 +510,17 @@ select, -moz-border-radius: 3px; border-radius: 3px; } +.uneditable-textarea { + width: auto; + height: auto; +} input[type=image], input[type=checkbox], input[type=radio] { width: auto; height: auto; padding: 0; margin: 3px 0; *margin-top: 0; - /* IE6-7 */ + /* IE7 */ line-height: normal; border: none; @@ -538,6 +542,8 @@ input[type=button], input[type=reset], input[type=submit] { } select, input[type=file] { height: 27px; + /* In IE7, the height of the select element cannot be changed by height, only font-size */ + *margin-top: 4px; /* For IE7, add top margin to align select with labels */ -- cgit v1.2.3 From 25519bacd56ee2507cdde727d85458e5e5ef7949 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 25 Jan 2012 11:25:35 -0800 Subject: rebuild + add spy to template --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 0166a3201..e548f5afc 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: Wed Jan 25 11:21:22 PST 2012 + * Date: Wed Jan 25 11:23:36 PST 2012 */ article, aside, @@ -1864,7 +1864,7 @@ table .headerSortUp:after { .navbar-search .search-query :-moz-placeholder { color: #eeeeee; } -.navbar-search .search-query ::-webkit-input-placeholder { +.navbar-search .search-query::-webkit-input-placeholder { color: #eeeeee; } .navbar-search .search-query:hover { -- cgit v1.2.3 From b8511568637dfa4decb3f0475436a3dfa637a57d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 11:26:45 -0800 Subject: change form fields back to inline-block to allow for inline-help text in default form markup --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 0166a3201..39add8696 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: Wed Jan 25 11:21:22 PST 2012 + * Date: Wed Jan 25 11:24:56 PST 2012 */ article, aside, @@ -497,7 +497,7 @@ input, textarea, select, .uneditable-input { - display: block; + display: inline-block; width: 210px; height: 18px; padding: 4px; -- cgit v1.2.3 From 58d08a2db3e2ed1b789a5290ced2f0327c9c163b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 11:35:08 -0800 Subject: enable support for form states on select elements --- bootstrap.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 730167f51..4bffde24d 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: Wed Jan 25 11:27:15 PST 2012 + * Date: Wed Jan 25 11:31:57 PST 2012 */ article, aside, @@ -715,11 +715,11 @@ textarea[readonly] { .control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline { color: #c09853; } -.control-group.warning input, .control-group.warning textarea { +.control-group.warning input, .control-group.warning select, .control-group.warning textarea { color: #c09853; border-color: #c09853; } -.control-group.warning input:focus, .control-group.warning textarea:focus { +.control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { border-color: #a47e3c; -webkit-box-shadow: 0 0 6px #dbc59e; -moz-box-shadow: 0 0 6px #dbc59e; @@ -733,11 +733,11 @@ textarea[readonly] { .control-group.error > label, .control-group.error .help-block, .control-group.error .help-inline { color: #b94a48; } -.control-group.error input, .control-group.error textarea { +.control-group.error input, .control-group.error select, .control-group.error textarea { color: #b94a48; border-color: #b94a48; } -.control-group.error input:focus, .control-group.error textarea:focus { +.control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus { border-color: #953b39; -webkit-box-shadow: 0 0 6px #d59392; -moz-box-shadow: 0 0 6px #d59392; @@ -751,11 +751,11 @@ textarea[readonly] { .control-group.success > label, .control-group.success .help-block, .control-group.success .help-inline { color: #468847; } -.control-group.success input, .control-group.success textarea { +.control-group.success input, .control-group.success select, .control-group.success textarea { color: #468847; border-color: #468847; } -.control-group.success input:focus, .control-group.success textarea:focus { +.control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus { border-color: #356635; -webkit-box-shadow: 0 0 6px #7aba7b; -moz-box-shadow: 0 0 6px #7aba7b; -- cgit v1.2.3 From 06017b26ca5a9c835edb9d42188431fa30c7e499 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 11:47:36 -0800 Subject: fix bottom visual bug on carousel images --- bootstrap.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 4bffde24d..7a538c717 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: Wed Jan 25 11:31:57 PST 2012 + * Date: Wed Jan 25 11:47:25 PST 2012 */ article, aside, @@ -2924,6 +2924,10 @@ a.thumbnail:hover { -o-transition: 0.6s ease-in-out left; transition: 0.6s ease-in-out left; } +.carousel .item > img { + display: block; + line-height: 1; +} .carousel .active, .carousel .next, .carousel .prev { display: block; } -- cgit v1.2.3 From 04f84997c18f2f132c8173f728f72b6b7aef52d1 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 25 Jan 2012 11:49:34 -0800 Subject: rebuil --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 7a538c717..b9cd608ae 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: Wed Jan 25 11:47:25 PST 2012 + * Date: Wed Jan 25 11:49:21 PST 2012 */ article, aside, @@ -1864,7 +1864,7 @@ table .headerSortUp:after { .navbar-search .search-query :-moz-placeholder { color: #eeeeee; } -.navbar-search .search-query ::-webkit-input-placeholder { +.navbar-search .search-query::-webkit-input-placeholder { color: #eeeeee; } .navbar-search .search-query:hover { -- cgit v1.2.3 From 86191d898b2520611b537892e33be3b179f83199 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 11:51:13 -0800 Subject: height auto on mutli select --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 7a538c717..1556d7704 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: Wed Jan 25 11:47:25 PST 2012 + * Date: Wed Jan 25 11:50:14 PST 2012 */ article, aside, @@ -555,7 +555,7 @@ select { background-color: #ffffff; } select[multiple], select[size] { - height: inherit; + height: auto; } input[type=image] { -webkit-box-shadow: none; -- cgit v1.2.3 From 2b2c72b9aae6db9505d0fdb3abc1832de8e0ce7f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 12:04:19 -0800 Subject: fix select alignment and height --- bootstrap.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 1556d7704..c53264a2d 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: Wed Jan 25 11:50:14 PST 2012 + * Date: Wed Jan 25 12:03:47 PST 2012 */ article, aside, @@ -541,17 +541,17 @@ input[type=button], input[type=reset], input[type=submit] { height: auto; } select, input[type=file] { - height: 27px; + height: 28px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ *margin-top: 4px; /* For IE7, add top margin to align select with labels */ - line-height: 27px; + line-height: 28px; } select { width: 220px; - vertical-align: middle; + vertical-align: baseline; background-color: #ffffff; } select[multiple], select[size] { -- cgit v1.2.3 From 0db2d45350a67bc1a98c0f2d1c4706e3bd25ca50 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 15:04:41 -0800 Subject: update mixins to use slightly diff variables within some parametric mixins --- bootstrap.css | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 931d0c017..0d81b9b03 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,11 +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. -<<<<<<< HEAD - * Date: Wed Jan 25 12:03:47 PST 2012 -======= - * Date: Wed Jan 25 11:49:21 PST 2012 ->>>>>>> 04f84997c18f2f132c8173f728f72b6b7aef52d1 + * Date: Wed Jan 25 15:04:24 PST 2012 */ article, aside, @@ -1868,7 +1864,7 @@ table .headerSortUp:after { .navbar-search .search-query :-moz-placeholder { color: #eeeeee; } -.navbar-search .search-query::-webkit-input-placeholder { +.navbar-search .search-query ::-webkit-input-placeholder { color: #eeeeee; } .navbar-search .search-query:hover { -- cgit v1.2.3 From e877d125d7a2c673fec4e63600c2d8544c3128f6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 20:02:32 -0800 Subject: fix button group shadows, update js docs to fix alert js file link --- bootstrap.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 0d81b9b03..4ece30d20 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: Wed Jan 25 15:04:24 PST 2012 + * Date: Wed Jan 25 15:27:50 PST 2012 */ article, aside, @@ -2592,9 +2592,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .btn-group .dropdown-toggle { padding-left: 8px; padding-right: 8px; - -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn-group.open .dropdown-menu { display: block; -- cgit v1.2.3 From f62c9379fb60bfb70435517b4569f586ec729d5b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 20:07:27 -0800 Subject: remove all tablesorter assets and css --- bootstrap.css | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 4ece30d20..921cd18c0 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: Wed Jan 25 15:27:50 PST 2012 + * Date: Wed Jan 25 20:07:19 PST 2012 */ article, aside, @@ -1056,44 +1056,6 @@ table .span12 { width: 924px; margin-left: 0; } -table .header { - cursor: pointer; -} -table .header:after { - content: ""; - float: right; - margin-top: 7px; - border-width: 0 4px 4px; - border-style: solid; - border-color: #000000 transparent; - visibility: hidden; -} -table .headerSortUp, table .headerSortDown { - background-color: #f7f7f9; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); -} -table .header:hover:after { - visibility: visible; -} -table .headerSortDown:after, table .headerSortDown:hover:after { - visibility: visible; - filter: alpha(opacity=60); - -moz-opacity: 0.6; - opacity: 0.6; -} -table .headerSortUp:after { - border-bottom: none; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid #000000; - visibility: visible; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - filter: alpha(opacity=60); - -moz-opacity: 0.6; - opacity: 0.6; -} .icon { background-image: url(docs/assets/img/glyphicons-halflings-sprite.png); background-position: 0 0; -- cgit v1.2.3 From b6b19866ac82089b9d3964f7fe9bbb3457306495 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 20:32:19 -0800 Subject: remove some old -moz- prefixes from mixins while we're at it, dropping FF3.6 support --- bootstrap.css | 157 ++++++++++------------------------------------------------ 1 file changed, 26 insertions(+), 131 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 921cd18c0..6068875fd 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: Wed Jan 25 20:07:19 PST 2012 + * Date: Wed Jan 25 20:31:53 PST 2012 */ article, aside, @@ -420,7 +420,6 @@ code, pre { font-size: 12px; color: #333333; -webkit-border-radius: 3px; - -moz-border-radius: 3px; border-radius: 3px; } code { @@ -439,7 +438,6 @@ pre { border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.15); -webkit-border-radius: 4px; - -moz-border-radius: 4px; border-radius: 4px; white-space: pre; white-space: pre-wrap; @@ -507,7 +505,6 @@ select, color: #555555; border: 1px solid #ccc; -webkit-border-radius: 3px; - -moz-border-radius: 3px; border-radius: 3px; } .uneditable-textarea { @@ -533,7 +530,6 @@ input[type=file] { background-color: #ffffff; background-color: initial; -webkit-box-shadow: none; - -moz-box-shadow: none; box-shadow: none; } input[type=button], input[type=reset], input[type=submit] { @@ -559,7 +555,6 @@ select[multiple], select[size] { } input[type=image] { -webkit-box-shadow: none; - -moz-box-shadow: none; box-shadow: none; } textarea { @@ -584,7 +579,6 @@ textarea { } input, textarea { -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; -moz-transition: border linear 0.2s, box-shadow linear 0.2s; @@ -595,13 +589,11 @@ input, textarea { input:focus, textarea:focus { border-color: rgba(82, 168, 236, 0.8); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); outline: 0; } input[type=file]:focus, input[type=checkbox]:focus, select:focus { -webkit-box-shadow: none; - -moz-box-shadow: none; box-shadow: none; outline: 1px dotted #666; } @@ -722,7 +714,6 @@ textarea[readonly] { .control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { border-color: #a47e3c; -webkit-box-shadow: 0 0 6px #dbc59e; - -moz-box-shadow: 0 0 6px #dbc59e; box-shadow: 0 0 6px #dbc59e; } .control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { @@ -740,7 +731,6 @@ textarea[readonly] { .control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus { border-color: #953b39; -webkit-box-shadow: 0 0 6px #d59392; - -moz-box-shadow: 0 0 6px #d59392; box-shadow: 0 0 6px #d59392; } .control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { @@ -758,7 +748,6 @@ textarea[readonly] { .control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus { border-color: #356635; -webkit-box-shadow: 0 0 6px #7aba7b; - -moz-box-shadow: 0 0 6px #7aba7b; box-shadow: 0 0 6px #7aba7b; } .control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { @@ -773,7 +762,6 @@ input:focus:required:invalid, textarea:focus:required:invalid, select:focus:requ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, select:focus:required:invalid:focus { border-color: #e9322d; -webkit-box-shadow: 0 0 6px #f8b9b7; - -moz-box-shadow: 0 0 6px #f8b9b7; box-shadow: 0 0 6px #f8b9b7; } .form-actions { @@ -788,7 +776,6 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec background-color: #ffffff; border-color: #eee; -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); cursor: not-allowed; } @@ -832,7 +819,6 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec .input-prepend .uneditable-input, .input-append .uneditable-input { -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } .input-prepend .uneditable-input, .input-append .uneditable-input { @@ -854,7 +840,6 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec background-color: #f5f5f5; border: 1px solid #ccc; -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } .input-prepend .active, .input-append .active { @@ -869,7 +854,6 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec .input-append input, .input-append .uneditable-input { float: left; -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } .input-append .uneditable-input { @@ -879,7 +863,6 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec margin-right: 0; margin-left: -1px; -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } .search-query { @@ -887,7 +870,6 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec padding-right: 14px; margin-bottom: 0; -webkit-border-radius: 14px; - -moz-border-radius: 14px; border-radius: 14px; } .form-search input, @@ -961,7 +943,6 @@ table { border: 1px solid #ddd; border-collapse: separate; -webkit-border-radius: 4px; - -moz-border-radius: 4px; border-radius: 4px; } .table-bordered th + th, @@ -975,22 +956,18 @@ table { } .table-bordered thead:first-child tr:first-child th:first-child, .table-bordered tbody:first-child 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; } .table-bordered thead:first-child tr:first-child th:last-child, .table-bordered tbody:first-child 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; } .table-bordered thead:last-child tr:last-child th:first-child, .table-bordered tbody:last-child 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; } .table-bordered thead:last-child tr:last-child th:last-child, .table-bordered tbody:last-child 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; } .table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th { @@ -1347,9 +1324,8 @@ table .span12 { border-left: 4px solid transparent; border-right: 4px solid transparent; border-top: 4px solid #000000; - filter: alpha(opacity=30); - -moz-opacity: 0.3; opacity: 0.3; + filter: alpha(opacity=30); content: "\2193"; } .dropdown .caret { @@ -1358,9 +1334,8 @@ table .span12 { *margin-top: 7px; } .dropdown:hover .caret, .open.dropdown .caret { - filter: alpha(opacity=100); - -moz-opacity: 1; opacity: 1; + filter: alpha(opacity=100); } .dropdown-menu { position: absolute; @@ -1380,10 +1355,8 @@ table .span12 { border-style: solid; border-width: 1px; -webkit-border-radius: 0 0 5px 5px; - -moz-border-radius: 0 0 5px 5px; border-radius: 0 0 5px 5px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -webkit-background-clip: padding-box; -moz-background-clip: padding; @@ -1429,7 +1402,6 @@ table .span12 { .typeahead { margin-top: 2px; -webkit-border-radius: 4px; - -moz-border-radius: 4px; border-radius: 4px; } .well { @@ -1440,10 +1412,8 @@ table .span12 { border: 1px solid #eee; border: 1px solid rgba(0, 0, 0, 0.05); -webkit-border-radius: 4px; - -moz-border-radius: 4px; border-radius: 4px; -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); } .well blockquote { @@ -1481,16 +1451,14 @@ table .span12 { line-height: 18px; color: #000000; text-shadow: 0 1px 0 #ffffff; - filter: alpha(opacity=20); - -moz-opacity: 0.2; opacity: 0.2; + filter: alpha(opacity=20); } .close:hover { color: #000000; text-decoration: none; - filter: alpha(opacity=40); - -moz-opacity: 0.4; opacity: 0.4; + filter: alpha(opacity=40); cursor: pointer; } .nav { @@ -1565,7 +1533,6 @@ table .span12 { padding-bottom: 9px; border: 1px solid transparent; -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0; } .tabs > li > a:hover { @@ -1584,7 +1551,6 @@ table .span12 { margin-top: 2px; margin-bottom: 2px; -webkit-border-radius: 5px; - -moz-border-radius: 5px; border-radius: 5px; } .pills .active > a, .pills .active > a:hover { @@ -1603,17 +1569,14 @@ table .span12 { .tabs.stacked > li > a { border: 1px solid #ddd; -webkit-border-radius: 0; - -moz-border-radius: 0; border-radius: 0; } .tabs.stacked > li:first-child > a { -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0; } .tabs.stacked > li:last-child > a { -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px; } .tabs.stacked > li > a:hover { @@ -1632,7 +1595,6 @@ table .span12 { } .pills .dropdown-menu { -webkit-border-radius: 4px; - -moz-border-radius: 4px; border-radius: 4px; } .tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret { @@ -1656,9 +1618,8 @@ table .span12 { } .nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret { border-top-color: #ffffff; - filter: alpha(opacity=100); - -moz-opacity: 1; opacity: 1; + filter: alpha(opacity=100); } .tabs.stacked .open > a:hover { border-color: #999999; @@ -1691,7 +1652,6 @@ table .span12 { } .tabs-below .tabs > li > a { -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px; } .tabs-below .tabs > li > a:hover { @@ -1717,7 +1677,6 @@ table .span12 { .tabs-left .tabs > li > a { margin-right: -1px; -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; } .tabs-left .tabs > li > a:hover { @@ -1734,7 +1693,6 @@ table .span12 { .tabs-right .tabs > li > a { margin-left: -1px; -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; } .tabs-right .tabs > li > a:hover { @@ -1749,17 +1707,15 @@ table .span12 { .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-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-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 .brand:hover { @@ -1815,7 +1771,6 @@ table .span12 { background: rgba(255, 255, 255, 0.3); border: 1px solid #111; -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; @@ -1841,7 +1796,6 @@ table .span12 { background-color: #ffffff; border: 0; -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); outline: 0; } @@ -1852,7 +1806,6 @@ table .span12 { padding-left: 20px; padding-right: 20px; -webkit-border-radius: 4px; - -moz-border-radius: 4px; border-radius: 4px; } .navbar-fixed { @@ -1910,7 +1863,6 @@ table .span12 { .navbar .dropdown-menu { margin-top: 1px; -webkit-border-radius: 4px; - -moz-border-radius: 4px; border-radius: 4px; } .navbar .dropdown-menu:before { @@ -1938,9 +1890,8 @@ table .span12 { border-top-color: #ffffff; } .navbar .nav .active .caret { - filter: alpha(opacity=100); - -moz-opacity: 1; opacity: 1; + filter: alpha(opacity=100); } .navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle { background-color: transparent; @@ -1963,10 +1914,9 @@ table .span12 { padding: 7px 14px; margin: 0 0 18px; background-color: #f5f5f5; - background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5)); background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5)); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5)); background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); background-image: linear-gradient(top, #ffffff, #f5f5f5); @@ -1974,10 +1924,8 @@ table .span12 { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); border: 1px solid #ddd; -webkit-border-radius: 3px; - -moz-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff; } .breadcrumb li { @@ -2004,10 +1952,8 @@ table .span12 { margin-left: 0; margin-bottom: 0; -webkit-border-radius: 3px; - -moz-border-radius: 3px; border-radius: 3px; -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); } .pagination li { @@ -2035,12 +1981,10 @@ table .span12 { .pagination li:first-child a { border-left-width: 1px; -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } .pagination li:last-child a { -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } .pagination-centered { @@ -2071,7 +2015,6 @@ table .span12 { padding: 6px 15px; background-color: #f5f5f5; -webkit-border-radius: 15px; - -moz-border-radius: 15px; border-radius: 15px; } .pager .next a { @@ -2093,9 +2036,8 @@ table .span12 { opacity: 0; } .modal-backdrop, .modal-backdrop.fade.in { - filter: alpha(opacity=80); - -moz-opacity: 0.8; opacity: 0.8; + filter: alpha(opacity=80); } .modal { position: fixed; @@ -2113,13 +2055,10 @@ table .span12 { /* IE6-7 */ -webkit-border-radius: 6px; - -moz-border-radius: 6px; border-radius: 6px; -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); -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; background-clip: padding-box; } .modal.fade { @@ -2149,10 +2088,8 @@ table .span12 { background-color: #f5f5f5; border-top: 1px solid #ddd; -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; border-radius: 0 0 6px 6px; -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff; *zoom: 1; } @@ -2175,14 +2112,12 @@ table .span12 { visibility: visible; padding: 5px; font-size: 11px; - filter: alpha(opacity=0); - -moz-opacity: 0; opacity: 0; + filter: alpha(opacity=0); } .tooltip.in { - filter: alpha(opacity=80); - -moz-opacity: 0.8; opacity: 0.8; + filter: alpha(opacity=80); } .tooltip.top { margin-top: -2px; @@ -2236,7 +2171,6 @@ table .span12 { text-decoration: none; background-color: #000000; -webkit-border-radius: 4px; - -moz-border-radius: 4px; border-radius: 4px; } .tooltip-arrow { @@ -2308,10 +2242,8 @@ table .span12 { background: #000000; background: rgba(0, 0, 0, 0.8); -webkit-border-radius: 6px; - -moz-border-radius: 6px; border-radius: 6px; -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); } .popover .title { @@ -2320,17 +2252,14 @@ table .span12 { background-color: #f5f5f5; border-bottom: 1px solid #eee; -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0; } .popover .content { padding: 14px; background-color: #ffffff; -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px; -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; background-clip: padding-box; } .popover .content p, .popover .content ul, .popover .content ol { @@ -2347,10 +2276,9 @@ table .span12 { } .btn.danger { background-color: #c43c35; - background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35)); background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35)); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); background-image: linear-gradient(top, #ee5f5b, #c43c35); @@ -2361,10 +2289,9 @@ table .span12 { } .btn.success { background-color: #57a957; - background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); background-image: -moz-linear-gradient(top, #62c462, #57a957); background-image: -ms-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); background-image: -webkit-linear-gradient(top, #62c462, #57a957); background-image: -o-linear-gradient(top, #62c462, #57a957); background-image: linear-gradient(top, #62c462, #57a957); @@ -2375,10 +2302,9 @@ table .span12 { } .btn.info { background-color: #339bb9; - background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9)); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); background-image: -o-linear-gradient(top, #5bc0de, #339bb9); background-image: linear-gradient(top, #5bc0de, #339bb9); @@ -2406,10 +2332,8 @@ table .span12 { border: 1px solid #ccc; border-bottom-color: #bbb; -webkit-border-radius: 4px; - -moz-border-radius: 4px; border-radius: 4px; -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); cursor: pointer; -webkit-transition: 0.1s linear all; @@ -2430,10 +2354,9 @@ table .span12 { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #0064cd; - background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd)); background-image: -moz-linear-gradient(top, #049cdb, #0064cd); background-image: -ms-linear-gradient(top, #049cdb, #0064cd); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd)); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#049cdb), to(#0064cd)); background-image: -webkit-linear-gradient(top, #049cdb, #0064cd); background-image: -o-linear-gradient(top, #049cdb, #0064cd); background-image: linear-gradient(top, #049cdb, #0064cd); @@ -2445,29 +2368,24 @@ table .span12 { .btn.active, .btn:active { background-image: none; -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); } .btn.disabled { cursor: default; background-image: none; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - filter: alpha(opacity=65); - -moz-opacity: 0.65; opacity: 0.65; + filter: alpha(opacity=65); -webkit-box-shadow: none; - -moz-box-shadow: none; box-shadow: none; } .btn[disabled] { cursor: default; background-image: none; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - filter: alpha(opacity=65); - -moz-opacity: 0.65; opacity: 0.65; + filter: alpha(opacity=65); -webkit-box-shadow: none; - -moz-box-shadow: none; box-shadow: none; } .btn.large { @@ -2475,7 +2393,6 @@ table .span12 { font-size: 15px; line-height: normal; -webkit-border-radius: 5px; - -moz-border-radius: 5px; border-radius: 5px; } .btn.small { @@ -2511,7 +2428,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { float: left; margin-left: -1px; -webkit-border-radius: 0; - -moz-border-radius: 0; border-radius: 0; } .btn-group .btn:first-child { @@ -2555,20 +2471,17 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { padding-left: 8px; padding-right: 8px; -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn-group.open .dropdown-menu { display: block; margin-top: 1px; -webkit-border-radius: 5px; - -moz-border-radius: 5px; border-radius: 5px; } .btn-group.open .dropdown-toggle { background-image: none; -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn .caret { @@ -2580,9 +2493,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .info .caret, .success .caret { border-top-color: #ffffff; - filter: alpha(opacity=75); - -moz-opacity: 0.75; opacity: 0.75; + filter: alpha(opacity=75); } .alert { padding: 8px 35px 8px 14px; @@ -2591,7 +2503,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { background-color: #fcf8e3; border: 1px solid #f3edd2; -webkit-border-radius: 4px; - -moz-border-radius: 4px; border-radius: 4px; } .alert, .alert-heading { @@ -2658,16 +2569,13 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { line-height: 1; 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); } a.thumbnail:hover { border-color: #0088cc; -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); } .thumbnail > img { @@ -2685,7 +2593,6 @@ a.thumbnail:hover { text-transform: uppercase; background-color: #999999; -webkit-border-radius: 3px; - -moz-border-radius: 3px; border-radius: 3px; } .label.important { @@ -2718,24 +2625,21 @@ a.thumbnail:hover { } .progress, .progress .bar { -webkit-border-radius: 4px; - -moz-border-radius: 4px; border-radius: 4px; } .progress { height: 18px; margin-bottom: 18px; background-color: #f9f9f9; - background-image: -khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#f9f9f9)); background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #f9f9f9)); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: linear-gradient(top, #f5f5f5, #f9f9f9); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0); -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); } .progress .bar { @@ -2746,17 +2650,15 @@ a.thumbnail:hover { text-align: center; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #0480be; - background-image: -khtml-gradient(linear, left top, left bottom, from(#149bdf), to(#0480be)); background-image: -moz-linear-gradient(top, #149bdf, #0480be); background-image: -ms-linear-gradient(top, #149bdf, #0480be); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #149bdf), color-stop(100%, #0480be)); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); background-image: -webkit-linear-gradient(top, #149bdf, #0480be); background-image: -o-linear-gradient(top, #149bdf, #0480be); background-image: linear-gradient(top, #149bdf, #0480be); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0); -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -2787,10 +2689,9 @@ a.thumbnail:hover { } .progress.danger .bar { background-color: #c43c35; - background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35)); background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35)); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); background-image: linear-gradient(top, #ee5f5b, #c43c35); @@ -2808,10 +2709,9 @@ a.thumbnail:hover { } .progress.success .bar { background-color: #57a957; - background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); background-image: -moz-linear-gradient(top, #62c462, #57a957); background-image: -ms-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); background-image: -webkit-linear-gradient(top, #62c462, #57a957); background-image: -o-linear-gradient(top, #62c462, #57a957); background-image: linear-gradient(top, #62c462, #57a957); @@ -2829,10 +2729,9 @@ a.thumbnail:hover { } .progress.info .bar { background-color: #339bb9; - background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9)); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); background-image: -o-linear-gradient(top, #5bc0de, #339bb9); background-image: linear-gradient(top, #5bc0de, #339bb9); @@ -2854,7 +2753,6 @@ a.thumbnail:hover { .accordion-group { background-color: #f5f5f5; -webkit-border-radius: 4px; - -moz-border-radius: 4px; border-radius: 4px; } .accordion-heading { @@ -2931,11 +2829,9 @@ a.thumbnail:hover { background: #222222; border: 3px solid #ffffff; -webkit-border-radius: 23px; - -moz-border-radius: 23px; border-radius: 23px; - filter: alpha(opacity=50); - -moz-opacity: 0.5; opacity: 0.5; + filter: alpha(opacity=50); -webkit-transition: all 0.2s linear; -moz-transition: all 0.2s linear; -ms-transition: all 0.2s linear; @@ -2949,9 +2845,8 @@ a.thumbnail:hover { .carousel-control:hover { color: #ffffff; text-decoration: none; - filter: alpha(opacity=90); - -moz-opacity: 0.9; opacity: 0.9; + filter: alpha(opacity=90); } .carousel-caption { position: absolute; -- cgit v1.2.3 From 94ea3b62f09c840db5efe5e48815d011ca7e43d1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 21:28:24 -0800 Subject: fix forms examples and allow for inputs in labels --- bootstrap.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 6068875fd..7de580162 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: Wed Jan 25 20:31:53 PST 2012 + * Date: Wed Jan 25 21:28:14 PST 2012 */ article, aside, @@ -511,6 +511,9 @@ select, width: auto; height: auto; } +label input, label textarea, label select { + display: block; +} input[type=image], input[type=checkbox], input[type=radio] { width: auto; height: auto; @@ -893,6 +896,9 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec .control-group { margin-bottom: 9px; } +.form-horizontal legend + .control-group { + padding-top: 27px; +} .form-horizontal .control-group { margin-bottom: 18px; } -- cgit v1.2.3 From 0ef4b6419fd83170dd62049a2850c5e8466635c9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 26 Jan 2012 10:00:09 -0800 Subject: overhaul frontpage jumbotron, add js for twitter buttons back in, fix up some form ids and classes, straighten out the use of primary button variable --- bootstrap.css | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 93 insertions(+), 10 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 7de580162..787211a75 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: Wed Jan 25 21:28:14 PST 2012 + * Date: Thu Jan 26 09:49:45 PST 2012 */ article, aside, @@ -420,6 +420,7 @@ code, pre { font-size: 12px; color: #333333; -webkit-border-radius: 3px; + -moz-border-radius: 3px; border-radius: 3px; } code { @@ -438,6 +439,7 @@ pre { border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.15); -webkit-border-radius: 4px; + -moz-border-radius: 4px; border-radius: 4px; white-space: pre; white-space: pre-wrap; @@ -505,6 +507,7 @@ select, color: #555555; border: 1px solid #ccc; -webkit-border-radius: 3px; + -moz-border-radius: 3px; border-radius: 3px; } .uneditable-textarea { @@ -533,6 +536,7 @@ input[type=file] { background-color: #ffffff; background-color: initial; -webkit-box-shadow: none; + -moz-box-shadow: none; box-shadow: none; } input[type=button], input[type=reset], input[type=submit] { @@ -558,11 +562,15 @@ select[multiple], select[size] { } input[type=image] { -webkit-box-shadow: none; + -moz-box-shadow: none; box-shadow: none; } textarea { height: auto; } +input[type=hidden] { + display: none; +} .radio, .checkbox { padding-left: 18px; } @@ -582,6 +590,7 @@ textarea { } input, textarea { -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; -moz-transition: border linear 0.2s, box-shadow linear 0.2s; @@ -592,11 +601,13 @@ input, textarea { input:focus, textarea:focus { border-color: rgba(82, 168, 236, 0.8); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); outline: 0; } input[type=file]:focus, input[type=checkbox]:focus, select:focus { -webkit-box-shadow: none; + -moz-box-shadow: none; box-shadow: none; outline: 1px dotted #666; } @@ -717,6 +728,7 @@ textarea[readonly] { .control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { border-color: #a47e3c; -webkit-box-shadow: 0 0 6px #dbc59e; + -moz-box-shadow: 0 0 6px #dbc59e; box-shadow: 0 0 6px #dbc59e; } .control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { @@ -734,6 +746,7 @@ textarea[readonly] { .control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus { border-color: #953b39; -webkit-box-shadow: 0 0 6px #d59392; + -moz-box-shadow: 0 0 6px #d59392; box-shadow: 0 0 6px #d59392; } .control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { @@ -751,6 +764,7 @@ textarea[readonly] { .control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus { border-color: #356635; -webkit-box-shadow: 0 0 6px #7aba7b; + -moz-box-shadow: 0 0 6px #7aba7b; box-shadow: 0 0 6px #7aba7b; } .control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { @@ -765,6 +779,7 @@ input:focus:required:invalid, textarea:focus:required:invalid, select:focus:requ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, select:focus:required:invalid:focus { border-color: #e9322d; -webkit-box-shadow: 0 0 6px #f8b9b7; + -moz-box-shadow: 0 0 6px #f8b9b7; box-shadow: 0 0 6px #f8b9b7; } .form-actions { @@ -779,6 +794,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec background-color: #ffffff; border-color: #eee; -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); cursor: not-allowed; } @@ -822,6 +838,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec .input-prepend .uneditable-input, .input-append .uneditable-input { -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } .input-prepend .uneditable-input, .input-append .uneditable-input { @@ -843,6 +860,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec background-color: #f5f5f5; border: 1px solid #ccc; -webkit-border-radius: 3px 0 0 3px; + -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } .input-prepend .active, .input-append .active { @@ -857,6 +875,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec .input-append input, .input-append .uneditable-input { float: left; -webkit-border-radius: 3px 0 0 3px; + -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } .input-append .uneditable-input { @@ -866,6 +885,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec margin-right: 0; margin-left: -1px; -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } .search-query { @@ -873,6 +893,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec padding-right: 14px; margin-bottom: 0; -webkit-border-radius: 14px; + -moz-border-radius: 14px; border-radius: 14px; } .form-search input, @@ -949,6 +970,7 @@ table { border: 1px solid #ddd; border-collapse: separate; -webkit-border-radius: 4px; + -moz-border-radius: 4px; border-radius: 4px; } .table-bordered th + th, @@ -962,18 +984,22 @@ table { } .table-bordered thead:first-child tr:first-child th:first-child, .table-bordered tbody:first-child 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; } .table-bordered thead:first-child tr:first-child th:last-child, .table-bordered tbody:first-child 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; } .table-bordered thead:last-child tr:last-child th:first-child, .table-bordered tbody:last-child 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; } .table-bordered thead:last-child tr:last-child th:last-child, .table-bordered tbody:last-child 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; } .table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th { @@ -1361,8 +1387,10 @@ table .span12 { border-style: solid; border-width: 1px; -webkit-border-radius: 0 0 5px 5px; + -moz-border-radius: 0 0 5px 5px; border-radius: 0 0 5px 5px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -webkit-background-clip: padding-box; -moz-background-clip: padding; @@ -1408,6 +1436,7 @@ table .span12 { .typeahead { margin-top: 2px; -webkit-border-radius: 4px; + -moz-border-radius: 4px; border-radius: 4px; } .well { @@ -1418,8 +1447,10 @@ table .span12 { border: 1px solid #eee; border: 1px solid rgba(0, 0, 0, 0.05); -webkit-border-radius: 4px; + -moz-border-radius: 4px; border-radius: 4px; -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); } .well blockquote { @@ -1539,6 +1570,7 @@ table .span12 { padding-bottom: 9px; border: 1px solid transparent; -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0; } .tabs > li > a:hover { @@ -1557,6 +1589,7 @@ table .span12 { margin-top: 2px; margin-bottom: 2px; -webkit-border-radius: 5px; + -moz-border-radius: 5px; border-radius: 5px; } .pills .active > a, .pills .active > a:hover { @@ -1575,14 +1608,17 @@ table .span12 { .tabs.stacked > li > a { border: 1px solid #ddd; -webkit-border-radius: 0; + -moz-border-radius: 0; border-radius: 0; } .tabs.stacked > li:first-child > a { -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0; } .tabs.stacked > li:last-child > a { -webkit-border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px; } .tabs.stacked > li > a:hover { @@ -1601,6 +1637,7 @@ table .span12 { } .pills .dropdown-menu { -webkit-border-radius: 4px; + -moz-border-radius: 4px; border-radius: 4px; } .tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret { @@ -1658,6 +1695,7 @@ table .span12 { } .tabs-below .tabs > li > a { -webkit-border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px; } .tabs-below .tabs > li > a:hover { @@ -1683,6 +1721,7 @@ table .span12 { .tabs-left .tabs > li > a { margin-right: -1px; -webkit-border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; } .tabs-left .tabs > li > a:hover { @@ -1699,6 +1738,7 @@ table .span12 { .tabs-right .tabs > li > a { margin-left: -1px; -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; } .tabs-right .tabs > li > a:hover { @@ -1722,6 +1762,7 @@ table .span12 { 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 .brand:hover { @@ -1777,6 +1818,7 @@ table .span12 { background: rgba(255, 255, 255, 0.3); border: 1px solid #111; -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; @@ -1802,6 +1844,7 @@ table .span12 { background-color: #ffffff; border: 0; -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); outline: 0; } @@ -1812,6 +1855,7 @@ table .span12 { padding-left: 20px; padding-right: 20px; -webkit-border-radius: 4px; + -moz-border-radius: 4px; border-radius: 4px; } .navbar-fixed { @@ -1869,6 +1913,7 @@ table .span12 { .navbar .dropdown-menu { margin-top: 1px; -webkit-border-radius: 4px; + -moz-border-radius: 4px; border-radius: 4px; } .navbar .dropdown-menu:before { @@ -1930,8 +1975,10 @@ table .span12 { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); border: 1px solid #ddd; -webkit-border-radius: 3px; + -moz-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: inset 0 1px 0 #ffffff; + -moz-box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff; } .breadcrumb li { @@ -1958,8 +2005,10 @@ table .span12 { margin-left: 0; margin-bottom: 0; -webkit-border-radius: 3px; + -moz-border-radius: 3px; border-radius: 3px; -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); } .pagination li { @@ -1987,10 +2036,12 @@ table .span12 { .pagination li:first-child a { border-left-width: 1px; -webkit-border-radius: 3px 0 0 3px; + -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } .pagination li:last-child a { -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } .pagination-centered { @@ -2021,6 +2072,7 @@ table .span12 { padding: 6px 15px; background-color: #f5f5f5; -webkit-border-radius: 15px; + -moz-border-radius: 15px; border-radius: 15px; } .pager .next a { @@ -2061,10 +2113,13 @@ table .span12 { /* IE6-7 */ -webkit-border-radius: 6px; + -moz-border-radius: 6px; border-radius: 6px; -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); -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; background-clip: padding-box; } .modal.fade { @@ -2094,8 +2149,10 @@ table .span12 { background-color: #f5f5f5; border-top: 1px solid #ddd; -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; border-radius: 0 0 6px 6px; -webkit-box-shadow: inset 0 1px 0 #ffffff; + -moz-box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff; *zoom: 1; } @@ -2177,6 +2234,7 @@ table .span12 { text-decoration: none; background-color: #000000; -webkit-border-radius: 4px; + -moz-border-radius: 4px; border-radius: 4px; } .tooltip-arrow { @@ -2248,8 +2306,10 @@ table .span12 { background: #000000; background: rgba(0, 0, 0, 0.8); -webkit-border-radius: 6px; + -moz-border-radius: 6px; border-radius: 6px; -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); } .popover .title { @@ -2258,14 +2318,17 @@ table .span12 { background-color: #f5f5f5; border-bottom: 1px solid #eee; -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0; } .popover .content { padding: 14px; background-color: #ffffff; -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px; -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; background-clip: padding-box; } .popover .content p, .popover .content ul, .popover .content ol { @@ -2338,8 +2401,10 @@ table .span12 { border: 1px solid #ccc; border-bottom-color: #bbb; -webkit-border-radius: 4px; + -moz-border-radius: 4px; border-radius: 4px; -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); cursor: pointer; -webkit-transition: 0.1s linear all; @@ -2359,21 +2424,22 @@ table .span12 { .btn.primary { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0064cd; - background-image: -moz-linear-gradient(top, #049cdb, #0064cd); - background-image: -ms-linear-gradient(top, #049cdb, #0064cd); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#049cdb), to(#0064cd)); - background-image: -webkit-linear-gradient(top, #049cdb, #0064cd); - background-image: -o-linear-gradient(top, #049cdb, #0064cd); - background-image: linear-gradient(top, #049cdb, #0064cd); + background-color: #0055cc; + background-image: -moz-linear-gradient(top, #0088cc, #0055cc); + background-image: -ms-linear-gradient(top, #0088cc, #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-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0); - border-color: #0064cd #0064cd #003f81; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0); + border-color: #0055cc #0055cc #003580; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } .btn.active, .btn:active { background-image: none; -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); } .btn.disabled { @@ -2383,6 +2449,7 @@ table .span12 { opacity: 0.65; filter: alpha(opacity=65); -webkit-box-shadow: none; + -moz-box-shadow: none; box-shadow: none; } .btn[disabled] { @@ -2392,6 +2459,7 @@ table .span12 { opacity: 0.65; filter: alpha(opacity=65); -webkit-box-shadow: none; + -moz-box-shadow: none; box-shadow: none; } .btn.large { @@ -2399,6 +2467,7 @@ table .span12 { font-size: 15px; line-height: normal; -webkit-border-radius: 5px; + -moz-border-radius: 5px; border-radius: 5px; } .btn.small { @@ -2434,6 +2503,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { float: left; margin-left: -1px; -webkit-border-radius: 0; + -moz-border-radius: 0; border-radius: 0; } .btn-group .btn:first-child { @@ -2477,17 +2547,20 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { padding-left: 8px; padding-right: 8px; -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn-group.open .dropdown-menu { display: block; margin-top: 1px; -webkit-border-radius: 5px; + -moz-border-radius: 5px; border-radius: 5px; } .btn-group.open .dropdown-toggle { background-image: none; -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn .caret { @@ -2509,6 +2582,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { background-color: #fcf8e3; border: 1px solid #f3edd2; -webkit-border-radius: 4px; + -moz-border-radius: 4px; border-radius: 4px; } .alert, .alert-heading { @@ -2575,13 +2649,16 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { line-height: 1; 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); } a.thumbnail:hover { border-color: #0088cc; -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); + -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); } .thumbnail > img { @@ -2599,6 +2676,7 @@ a.thumbnail:hover { text-transform: uppercase; background-color: #999999; -webkit-border-radius: 3px; + -moz-border-radius: 3px; border-radius: 3px; } .label.important { @@ -2631,6 +2709,7 @@ a.thumbnail:hover { } .progress, .progress .bar { -webkit-border-radius: 4px; + -moz-border-radius: 4px; border-radius: 4px; } .progress { @@ -2646,6 +2725,7 @@ a.thumbnail:hover { background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0); -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); } .progress .bar { @@ -2665,6 +2745,7 @@ a.thumbnail:hover { background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0); -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -2759,6 +2840,7 @@ a.thumbnail:hover { .accordion-group { background-color: #f5f5f5; -webkit-border-radius: 4px; + -moz-border-radius: 4px; border-radius: 4px; } .accordion-heading { @@ -2835,6 +2917,7 @@ a.thumbnail:hover { background: #222222; border: 3px solid #ffffff; -webkit-border-radius: 23px; + -moz-border-radius: 23px; border-radius: 23px; opacity: 0.5; filter: alpha(opacity=50); -- cgit v1.2.3 From 2c2f8ebe3a090bff0254aba10b745dae10bf242d Mon Sep 17 00:00:00 2001 From: Pete Hopkins Date: Thu, 26 Jan 2012 13:04:30 -0500 Subject: Rebuild of *.css --- bootstrap.css | 108 ++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 59 insertions(+), 49 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 787211a75..6462eb5a8 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: Thu Jan 26 09:49:45 PST 2012 + * Date: Thu Jan 26 13:07:59 EST 2012 */ article, aside, @@ -1752,7 +1752,7 @@ table .span12 { } .navbar-inner { background-color: #222222; - background-color: #222222; + background-color: #2c2c2c; background-image: -moz-linear-gradient(top, #333333, #222222); background-image: -ms-linear-gradient(top, #333333, #222222); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); @@ -1760,7 +1760,6 @@ table .span12 { 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); @@ -1829,7 +1828,7 @@ table .span12 { .navbar-search .search-query :-moz-placeholder { color: #eeeeee; } -.navbar-search .search-query ::-webkit-input-placeholder { +.navbar-search .search-query::-webkit-input-placeholder { color: #eeeeee; } .navbar-search .search-query:hover { @@ -1964,7 +1963,7 @@ table .span12 { .breadcrumb { padding: 7px 14px; margin: 0 0 18px; - background-color: #f5f5f5; + background-color: #fbfbfb; background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5)); @@ -1972,7 +1971,6 @@ table .span12 { background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); background-image: linear-gradient(top, #ffffff, #f5f5f5); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); border: 1px solid #ddd; -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -2334,6 +2332,8 @@ table .span12 { .popover .content p, .popover .content ul, .popover .content ol { margin-bottom: 0; } +.btn.primary, +.btn.primary:hover, .btn.danger, .btn.danger:hover, .btn.success, @@ -2343,8 +2343,26 @@ table .span12 { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); color: #ffffff; } +.btn.primary { + background-color: #0074cc; + background-image: -moz-linear-gradient(top, #0088cc, #0055cc); + background-image: -ms-linear-gradient(top, #0088cc, #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-repeat: repeat-x; + border-color: #0055cc #0055cc #003580; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +} +.btn.primary:hover, .btn.primary:active, .btn.primary.active { + background-color: #0055cc; +} +.btn.primary:active, .btn.primary.active { + background-color: #004099 \9; +} .btn.danger { - background-color: #c43c35; + background-color: #dd514c; background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); @@ -2352,12 +2370,17 @@ table .span12 { background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); background-image: linear-gradient(top, #ee5f5b, #c43c35); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); border-color: #c43c35 #c43c35 #882a25; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } +.btn.danger:hover, .btn.danger:active, .btn.danger.active { + background-color: #c43c35; +} +.btn.danger:active, .btn.danger.active { + background-color: #9c302a \9; +} .btn.success { - background-color: #57a957; + background-color: #5eb95e; background-image: -moz-linear-gradient(top, #62c462, #57a957); background-image: -ms-linear-gradient(top, #62c462, #57a957); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); @@ -2365,12 +2388,17 @@ table .span12 { background-image: -o-linear-gradient(top, #62c462, #57a957); background-image: linear-gradient(top, #62c462, #57a957); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); border-color: #57a957 #57a957 #3d773d; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } +.btn.success:hover, .btn.success:active, .btn.success.active { + background-color: #57a957; +} +.btn.success:active, .btn.success.active { + background-color: #458845 \9; +} .btn.info { - background-color: #339bb9; + background-color: #4bb1cf; background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); @@ -2378,10 +2406,15 @@ table .span12 { background-image: -o-linear-gradient(top, #5bc0de, #339bb9); background-image: linear-gradient(top, #5bc0de, #339bb9); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); border-color: #339bb9 #339bb9 #22697d; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } +.btn.info:hover, .btn.info:active, .btn.info.active { + background-color: #339bb9; +} +.btn.info:active, .btn.info.active { + background-color: #287a91 \9; +} .btn { display: inline-block; padding: 5px 10px 6px; @@ -2389,7 +2422,7 @@ table .span12 { line-height: normal; color: #333333; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - background-color: #e6e6e6; + background-color: #ffffff; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); @@ -2397,7 +2430,6 @@ table .span12 { background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); background-repeat: no-repeat; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); border: 1px solid #ccc; border-bottom-color: #bbb; -webkit-border-radius: 4px; @@ -2407,45 +2439,32 @@ table .span12 { -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); cursor: pointer; - -webkit-transition: 0.1s linear all; - -moz-transition: 0.1s linear all; - -ms-transition: 0.1s linear all; - -o-transition: 0.1s linear all; - transition: 0.1s linear all; } .btn:hover { color: #333333; text-decoration: none; + background-color: #e6e6e6; background-position: 0 -15px; + -webkit-transition: background-position 0.1s linear; + -moz-transition: background-position 0.1s linear; + -ms-transition: background-position 0.1s linear; + -o-transition: background-position 0.1s linear; + transition: background-position 0.1s linear; } .btn:focus { outline: 1px dotted #666; } -.btn.primary { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0055cc; - background-image: -moz-linear-gradient(top, #0088cc, #0055cc); - background-image: -ms-linear-gradient(top, #0088cc, #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-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0); - border-color: #0055cc #0055cc #003580; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} .btn.active, .btn:active { background-image: none; -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); + background-color: #e6e6e6; + background-color: #d9d9d9 \9; } .btn.disabled { cursor: default; background-image: none; - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); opacity: 0.65; filter: alpha(opacity=65); -webkit-box-shadow: none; @@ -2455,7 +2474,6 @@ table .span12 { .btn[disabled] { cursor: default; background-image: none; - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); opacity: 0.65; filter: alpha(opacity=65); -webkit-box-shadow: none; @@ -2474,9 +2492,6 @@ table .span12 { padding: 7px 9px 7px; font-size: 11px; } -:root .btn { - border-radius: 0 \0; -} button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { padding: 0; border: 0; @@ -2715,7 +2730,7 @@ a.thumbnail:hover { .progress { height: 18px; margin-bottom: 18px; - background-color: #f9f9f9; + background-color: #f7f7f7; background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); @@ -2723,7 +2738,6 @@ a.thumbnail:hover { background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: linear-gradient(top, #f5f5f5, #f9f9f9); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0); -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); @@ -2735,7 +2749,7 @@ a.thumbnail:hover { font-size: 12px; text-align: center; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0480be; + background-color: #0e90d2; background-image: -moz-linear-gradient(top, #149bdf, #0480be); background-image: -ms-linear-gradient(top, #149bdf, #0480be); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); @@ -2743,7 +2757,6 @@ a.thumbnail:hover { background-image: -o-linear-gradient(top, #149bdf, #0480be); background-image: linear-gradient(top, #149bdf, #0480be); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0); -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); @@ -2775,7 +2788,7 @@ a.thumbnail:hover { animation: progress-bar-stripes 2s linear infinite; } .progress.danger .bar { - background-color: #c43c35; + background-color: #dd514c; background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); @@ -2783,7 +2796,6 @@ a.thumbnail:hover { background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); background-image: linear-gradient(top, #ee5f5b, #c43c35); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); } .progress.danger.striped .bar { background-color: #ee5f5b; @@ -2795,7 +2807,7 @@ a.thumbnail:hover { background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .progress.success .bar { - background-color: #57a957; + background-color: #5eb95e; background-image: -moz-linear-gradient(top, #62c462, #57a957); background-image: -ms-linear-gradient(top, #62c462, #57a957); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); @@ -2803,7 +2815,6 @@ a.thumbnail:hover { background-image: -o-linear-gradient(top, #62c462, #57a957); background-image: linear-gradient(top, #62c462, #57a957); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); } .progress.success.striped .bar { background-color: #62c462; @@ -2815,7 +2826,7 @@ a.thumbnail:hover { background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .progress.info .bar { - background-color: #339bb9; + background-color: #4bb1cf; background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); @@ -2823,7 +2834,6 @@ a.thumbnail:hover { background-image: -o-linear-gradient(top, #5bc0de, #339bb9); background-image: linear-gradient(top, #5bc0de, #339bb9); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); } .progress.info.striped .bar { background-color: #5bc0de; -- cgit v1.2.3 From 86e0e89ee81d4a2a1daef6b68aa269419ee7d644 Mon Sep 17 00:00:00 2001 From: Pete Hopkins Date: Thu, 26 Jan 2012 13:26:28 -0500 Subject: More *.css building --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 6462eb5a8..f4af5ede9 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: Thu Jan 26 13:07:59 EST 2012 + * Date: Thu Jan 26 13:26:16 EST 2012 */ article, aside, @@ -2422,7 +2422,7 @@ table .span12 { line-height: normal; color: #333333; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - background-color: #ffffff; + background-color: #fafafa; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); -- cgit v1.2.3 From 62b2fdc4de2abe56a0366c5e46861ce4837aca56 Mon Sep 17 00:00:00 2001 From: Pete Hopkins Date: Thu, 26 Jan 2012 13:51:29 -0500 Subject: Rebuild *.css --- bootstrap.css | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index f4af5ede9..2432c74db 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: Thu Jan 26 13:26:16 EST 2012 + * Date: Thu Jan 26 13:51:07 EST 2012 */ article, aside, @@ -2355,7 +2355,13 @@ table .span12 { border-color: #0055cc #0055cc #003580; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } -.btn.primary:hover, .btn.primary:active, .btn.primary.active { +.btn.primary:hover, +.btn.primary:active, +.btn.primary.active, +.btn.primary.disabled { + background-color: #0055cc; +} +.btn.primary[disabled] { background-color: #0055cc; } .btn.primary:active, .btn.primary.active { @@ -2373,7 +2379,13 @@ table .span12 { border-color: #c43c35 #c43c35 #882a25; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } -.btn.danger:hover, .btn.danger:active, .btn.danger.active { +.btn.danger:hover, +.btn.danger:active, +.btn.danger.active, +.btn.danger.disabled { + background-color: #c43c35; +} +.btn.danger[disabled] { background-color: #c43c35; } .btn.danger:active, .btn.danger.active { @@ -2391,7 +2403,13 @@ table .span12 { border-color: #57a957 #57a957 #3d773d; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } -.btn.success:hover, .btn.success:active, .btn.success.active { +.btn.success:hover, +.btn.success:active, +.btn.success.active, +.btn.success.disabled { + background-color: #57a957; +} +.btn.success[disabled] { background-color: #57a957; } .btn.success:active, .btn.success.active { @@ -2409,7 +2427,13 @@ table .span12 { border-color: #339bb9 #339bb9 #22697d; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } -.btn.info:hover, .btn.info:active, .btn.info.active { +.btn.info:hover, +.btn.info:active, +.btn.info.active, +.btn.info.disabled { + background-color: #339bb9; +} +.btn.info[disabled] { background-color: #339bb9; } .btn.info:active, .btn.info.active { @@ -2465,6 +2489,7 @@ table .span12 { .btn.disabled { cursor: default; background-image: none; + background-color: #e6e6e6; opacity: 0.65; filter: alpha(opacity=65); -webkit-box-shadow: none; @@ -2474,6 +2499,7 @@ table .span12 { .btn[disabled] { cursor: default; background-image: none; + background-color: #e6e6e6; opacity: 0.65; filter: alpha(opacity=65); -webkit-box-shadow: none; -- cgit v1.2.3 From edef89f30efd73e5fca9952eef48136f8264aa93 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 26 Jan 2012 11:10:07 -0800 Subject: move around some comments in buttons.less, update labels to use correct variables, add snippet to docs about IE9 --- bootstrap.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 2432c74db..4e7316558 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: Thu Jan 26 13:51:07 EST 2012 + * Date: Thu Jan 26 11:09:38 PST 2012 */ article, aside, @@ -1828,7 +1828,7 @@ table .span12 { .navbar-search .search-query :-moz-placeholder { color: #eeeeee; } -.navbar-search .search-query::-webkit-input-placeholder { +.navbar-search .search-query ::-webkit-input-placeholder { color: #eeeeee; } .navbar-search .search-query:hover { @@ -2721,16 +2721,16 @@ a.thumbnail:hover { border-radius: 3px; } .label.important { - background-color: #c43c35; + background-color: #b94a48; } .label.warning { background-color: #f89406; } .label.success { - background-color: #46a546; + background-color: #468847; } -.label.notice { - background-color: #62cffc; +.label.info { + background-color: #3a87ad; } @-webkit-keyframes progress-bar-stripes { from { -- cgit v1.2.3 From 721b8a10785c548fa6a1cb26ccd698ceabc43e36 Mon Sep 17 00:00:00 2001 From: Pete Hopkins Date: Thu, 26 Jan 2012 16:15:09 -0500 Subject: rebuild *.css --- bootstrap.css | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 4e7316558..58757683c 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: Thu Jan 26 11:09:38 PST 2012 + * Date: Thu Jan 26 16:14:59 EST 2012 */ article, aside, @@ -63,8 +63,7 @@ select, textarea { margin: 0; font-size: 100%; - vertical-align: baseline; - *vertical-align: middle; + vertical-align: middle; } button, input { *overflow: visible; @@ -528,6 +527,9 @@ input[type=image], input[type=checkbox], input[type=radio] { line-height: normal; border: none; cursor: pointer; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } input[type=file] { padding: initial; @@ -554,7 +556,6 @@ select, input[type=file] { } select { width: 220px; - vertical-align: baseline; background-color: #ffffff; } select[multiple], select[size] { @@ -579,7 +580,7 @@ input[type=hidden] { margin-left: -18px; } .controls > .radio:first-child, .controls > .checkbox:first-child { - padding-top: 6px; + padding-top: 5px; } .radio.inline, .checkbox.inline { display: inline-block; @@ -810,13 +811,9 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec color: #999999; } .help-inline { - *position: relative; - /* IE6-7 */ - - *top: -5px; - /* IE6-7 */ - - display: inline; + display: inline-block; + margin-bottom: 9px; + vertical-align: middle; padding-left: 5px; } .input-prepend, .input-append { @@ -905,6 +902,9 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec .form-search select, .form-inline select, .form-horizontal select, +.form-search .help-inline, +.form-inline .help-inline, +.form-horizontal .help-inline, .form-search .uneditable-input, .form-inline .uneditable-input, .form-horizontal .uneditable-input { @@ -1828,7 +1828,7 @@ table .span12 { .navbar-search .search-query :-moz-placeholder { color: #eeeeee; } -.navbar-search .search-query ::-webkit-input-placeholder { +.navbar-search .search-query::-webkit-input-placeholder { color: #eeeeee; } .navbar-search .search-query:hover { @@ -2441,9 +2441,9 @@ table .span12 { } .btn { display: inline-block; - padding: 5px 10px 6px; + padding: 4px 10px 4px; font-size: 13px; - line-height: normal; + line-height: 18px; color: #333333; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); background-color: #fafafa; @@ -2515,8 +2515,9 @@ table .span12 { border-radius: 5px; } .btn.small { - padding: 7px 9px 7px; + padding: 5px 9px 5px; font-size: 11px; + line-height: 16px; } button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { padding: 0; -- cgit v1.2.3 From 8a6be6601dfb826e32a5004b7b0f09756ebb975b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 26 Jan 2012 14:40:19 -0800 Subject: make accordion links block level --- bootstrap.css | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 4e7316558..8db6a82e6 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: Thu Jan 26 11:09:38 PST 2012 + * Date: Thu Jan 26 13:56:25 PST 2012 */ article, aside, @@ -2518,6 +2518,9 @@ table .span12 { padding: 7px 9px 7px; font-size: 11px; } +.btn.small .icon { + margin-top: -2px; +} button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { padding: 0; border: 0; @@ -2616,6 +2619,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { opacity: 0.75; filter: alpha(opacity=75); } +.btn.small .caret { + margin-top: 4px; +} .alert { padding: 8px 35px 8px 14px; margin-bottom: 18px; @@ -2880,9 +2886,12 @@ a.thumbnail:hover { border-radius: 4px; } .accordion-heading { - padding: 8px 15px; border-bottom: 0; } +.accordion-heading .accordion-toggle { + display: block; + padding: 8px 15px; +} .accordion-body { margin-bottom: 2px; } -- cgit v1.2.3 From 7a6737512a18f56bb95a0024fdbd4a8823034b76 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 26 Jan 2012 14:50:55 -0800 Subject: break scaffolding down into smaller less files --- bootstrap.css | 100 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 50 insertions(+), 50 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 8db6a82e6..6970487e0 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: Thu Jan 26 13:56:25 PST 2012 + * Date: Thu Jan 26 14:50:34 PST 2012 */ article, aside, @@ -102,55 +102,6 @@ body { color: #555555; background-color: #ffffff; } -.container { - width: 940px; - margin-left: auto; - margin-right: auto; - *zoom: 1; -} -.container:before, .container:after { - display: table; - content: ""; -} -.container:after { - clear: both; -} -.fluid-container { - position: relative; - min-width: 940px; - padding-left: 20px; - padding-right: 20px; - *zoom: 1; -} -.fluid-container:before, .fluid-container:after { - display: table; - content: ""; -} -.fluid-container:after { - clear: both; -} -.fluid-sidebar { - width: 220px; - margin: 0 20px 18px; -} -.sidebar-left { - padding-left: 260px; -} -.sidebar-right { - padding-right: 260px; -} -.sidebar-left .fluid-sidebar { - float: left; - margin-left: -240px; -} -.sidebar-right .fluid-sidebar { - float: right; - margin-right: -240px; -} -.fluid-content { - float: left; - width: 100%; -} a { color: #0088cc; text-decoration: none; @@ -243,6 +194,55 @@ a:hover { .offset11 { margin-left: 900px; } +.container { + width: 940px; + margin-left: auto; + margin-right: auto; + *zoom: 1; +} +.container:before, .container:after { + display: table; + content: ""; +} +.container:after { + clear: both; +} +.fluid-container { + position: relative; + min-width: 940px; + padding-left: 20px; + padding-right: 20px; + *zoom: 1; +} +.fluid-container:before, .fluid-container:after { + display: table; + content: ""; +} +.fluid-container:after { + clear: both; +} +.fluid-sidebar { + width: 220px; + margin: 0 20px 18px; +} +.sidebar-left { + padding-left: 260px; +} +.sidebar-right { + padding-right: 260px; +} +.sidebar-left .fluid-sidebar { + float: left; + margin-left: -240px; +} +.sidebar-right .fluid-sidebar { + float: right; + margin-right: -240px; +} +.fluid-content { + float: left; + width: 100%; +} p { margin: 0 0 9px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -- cgit v1.2.3 From f82db4b95bf12bc6c04a5ecc3d4a649ba9800db0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 26 Jan 2012 14:53:35 -0800 Subject: separate code from type css files --- bootstrap.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 6970487e0..f3ea6d0b9 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: Thu Jan 26 14:50:34 PST 2012 + * Date: Thu Jan 26 14:52:24 PST 2012 */ article, aside, @@ -414,6 +414,12 @@ address { line-height: 18px; font-style: normal; } +small { + font-size: 100%; +} +cite { + font-style: normal; +} code, pre { padding: 0 3px 2px; font-family: Menlo, Monaco, "Courier New", monospace; @@ -452,12 +458,6 @@ pre code { padding: 0; background-color: transparent; } -small { - font-size: 100%; -} -cite { - font-style: normal; -} form { margin: 0 0 18px; } -- cgit v1.2.3 From 95356ee0622561b67327b3880bcdc3c5df97cf40 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 26 Jan 2012 15:04:36 -0800 Subject: make css after merge --- bootstrap.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index f3ea6d0b9..89a9303eb 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: Thu Jan 26 14:52:24 PST 2012 + * Date: Thu Jan 26 15:04:19 PST 2012 */ article, aside, @@ -2514,6 +2514,9 @@ table .span12 { -moz-border-radius: 5px; border-radius: 5px; } +.btn.large .icon { + margin-top: 1px; +} .btn.small { padding: 7px 9px 7px; font-size: 11px; -- cgit v1.2.3 From d8e1001836f869436df2de2905411b2236c8cbad Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 26 Jan 2012 15:39:37 -0800 Subject: fix legend margin collapse --- bootstrap.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 862b4c5b6..cc5d7f019 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: Thu Jan 26 15:25:02 PST 2012 + * Date: Thu Jan 26 15:39:24 PST 2012 */ article, aside, @@ -475,7 +475,6 @@ legend { color: #333333; border: 0; border-bottom: 1px solid #eee; - -webkit-margin-collapse: separate; } label, input, @@ -918,7 +917,8 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec margin-bottom: 9px; } .form-horizontal legend + .control-group { - padding-top: 27px; + margin-top: 18px; + -webkit-margin-top-collapse: separate; } .form-horizontal .control-group { margin-bottom: 18px; -- cgit v1.2.3 From ef4e3bc0f7549e327c45792884a264faab402400 Mon Sep 17 00:00:00 2001 From: Linmiao Xu Date: Thu, 26 Jan 2012 15:51:11 -0800 Subject: Move hero-unit css out of pattern.less and include it. Fixes #1185. --- bootstrap.css | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index cc5d7f019..b71432eb4 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: Thu Jan 26 15:39:24 PST 2012 + * Date: Thu Jan 26 15:50:30 PST 2012 */ article, aside, @@ -1828,7 +1828,7 @@ table .span12 { .navbar-search .search-query :-moz-placeholder { color: #eeeeee; } -.navbar-search .search-query ::-webkit-input-placeholder { +.navbar-search .search-query::-webkit-input-placeholder { color: #eeeeee; } .navbar-search .search-query:hover { @@ -2998,6 +2998,25 @@ a.thumbnail:hover { .carousel-caption h4, .carousel-caption p { color: #ffffff; } +.hero-unit { + padding: 60px; + margin-bottom: 30px; + background-color: #f5f5f5; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.hero-unit h1 { + margin-bottom: 0; + font-size: 60px; + line-height: 1; + letter-spacing: -1px; +} +.hero-unit p { + font-size: 18px; + font-weight: 200; + line-height: 27px; +} .pull-right { float: right; } -- cgit v1.2.3 From af96da6e895974dd4bd6fb19cf0c6d7e16bf050d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 26 Jan 2012 16:27:37 -0800 Subject: adding white sprites --- bootstrap.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index cc5d7f019..cadc4d243 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: Thu Jan 26 15:39:24 PST 2012 + * Date: Thu Jan 26 16:26:33 PST 2012 */ article, aside, @@ -1074,6 +1074,9 @@ table .span12 { width: 14px; height: 14px; } +.icon.white { + background-image: url(docs/assets/img/glyphicons-halflings-sprite-white.png); +} .glass { background-position: 0 0; } -- cgit v1.2.3 From 7a3d04d5bed9b9ddf5a3c78466b7115a0260b75e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 26 Jan 2012 19:10:09 -0800 Subject: scope icons to .icon --- bootstrap.css | 182 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 91 insertions(+), 91 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 086537f5f..c7d457d6e 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: Thu Jan 26 16:30:52 PST 2012 + * Date: Thu Jan 26 19:09:35 PST 2012 */ article, aside, @@ -1077,274 +1077,274 @@ table .span12 { .icon.white { background-image: url(docs/assets/img/glyphicons-halflings-sprite-white.png); } -.glass { +.icon.glass { background-position: 0 0; } -.music { +.icon.music { background-position: -24px 0; } -.search { +.icon.search { background-position: -48px 0; } -.envelope { +.icon.envelope { background-position: -72px 0; } -.heart { +.icon.heart { background-position: -96px 0; } -.star { +.icon.star { background-position: -120px 0; } -.star-empty { +.icon.star-empty { background-position: -144px 0; } -.user { +.icon.user { background-position: -168px 0; } -.film { +.icon.film { background-position: -192px 0; } -.th-large { +.icon.th-large { background-position: -216px 0; } -.th { +.icon.th { background-position: -240px 0; } -.th-list { +.icon.th-list { background-position: -264px 0; } -.ok { +.icon.ok { background-position: -288px 0; } -.remove { +.icon.remove { background-position: -312px 0; } -.zoom-in { +.icon.zoom-in { background-position: -336px 0; } -.zoom-out { +.icon.zoom-out { background-position: -360px 0; } -.off { +.icon.off { background-position: -384px 0; } -.signal { +.icon.signal { background-position: -408px 0; } -.cog { +.icon.cog { background-position: -432px 0; } -.trash { +.icon.trash { background-position: -456px 0; } -.home { +.icon.home { background-position: 0 -24px; } -.file { +.icon.file { background-position: -24px -24px; } -.time { +.icon.time { background-position: -48px -24px; } -.road { +.icon.road { background-position: -72px -24px; } -.download-alt { +.icon.download-alt { background-position: -96px -24px; } -.download { +.icon.download { background-position: -120px -24px; } -.upload { +.icon.upload { background-position: -144px -24px; } -.inbox { +.icon.inbox { background-position: -168px -24px; } -.play-circle { +.icon.play-circle { background-position: -192px -24px; } -.repeat { +.icon.repeat { background-position: -216px -24px; } -.refresh { +.icon.refresh { background-position: -240px -24px; } -.calendar { +.icon.calendar { background-position: -264px -24px; } -.lock { +.icon.lock { background-position: -288px -24px; } -.flag { +.icon.flag { background-position: -312px -24px; } -.headphones { +.icon.headphones { background-position: -336px -24px; } -.volume-off { +.icon.volume-off { background-position: -360px -24px; } -.volume-down { +.icon.volume-down { background-position: -384px -24px; } -.volume-up { +.icon.volume-up { background-position: -408px -24px; } -.qrcode { +.icon.qrcode { background-position: -432px -24px; } -.barcode { +.icon.barcode { background-position: -456px -24px; } -.tag { +.icon.tag { background-position: 0 -48px; } -.tags { +.icon.tags { background-position: -24px -48px; } -.book { +.icon.book { background-position: -48px -48px; } -.bookmark { +.icon.bookmark { background-position: -72px -48px; } -.print { +.icon.print { background-position: -96px -48px; } -.camera { +.icon.camera { background-position: -120px -48px; } -.font { +.icon.font { background-position: -144px -48px; } -.bold { +.icon.bold { background-position: -168px -48px; } -.italic { +.icon.italic { background-position: -192px -48px; } -.text-height { +.icon.text-height { background-position: -216px -48px; } -.text-width { +.icon.text-width { background-position: -240px -48px; } -.align-left { +.icon.align-left { background-position: -264px -48px; } -.align-center { +.icon.align-center { background-position: -288px -48px; } -.align-right { +.icon.align-right { background-position: -312px -48px; } -.align-justify { +.icon.align-justify { background-position: -336px -48px; } -.list { +.icon.list { background-position: -360px -48px; } -.indent-left { +.icon.indent-left { background-position: -384px -48px; } -.indent-right { +.icon.indent-right { background-position: -408px -48px; } -.facetime-video { +.icon.facetime-video { background-position: -432px -48px; } -.picture { +.icon.picture { background-position: -456px -48px; } -.pencil { +.icon.pencil { background-position: 0 -72px; } -.map-marker { +.icon.map-marker { background-position: -24px -72px; } -.adjust { +.icon.adjust { background-position: -48px -72px; } -.tint { +.icon.tint { background-position: -72px -72px; } -.edit { +.icon.edit { background-position: -96px -72px; } -.share { +.icon.share { background-position: -120px -72px; } -.check { +.icon.check { background-position: -144px -72px; } -.move { +.icon.move { background-position: -168px -72px; } -.step-backward { +.icon.step-backward { background-position: -192px -72px; } -.fast-backward { +.icon.fast-backward { background-position: -216px -72px; } -.backward { +.icon.backward { background-position: -240px -72px; } -.play { +.icon.play { background-position: -264px -72px; } -.pause { +.icon.pause { background-position: -288px -72px; } -.stop { +.icon.stop { background-position: -312px -72px; } -.forward { +.icon.forward { background-position: -336px -72px; } -.fast-forward { +.icon.fast-forward { background-position: -360px -72px; } -.step-forward { +.icon.step-forward { background-position: -384px -72px; } -.eject { +.icon.eject { background-position: -408px -72px; } -.chevron-left { +.icon.chevron-left { background-position: -432px -72px; } -.chevron-right { +.icon.chevron-right { background-position: -456px -72px; } -.arrow-left { +.icon.arrow-left { background-position: -240px -96px; } -.arrow-right { +.icon.arrow-right { background-position: -264px -96px; } -.arrow-up { +.icon.arrow-up { background-position: -288px -96px; } -.arrow-down { +.icon.arrow-down { background-position: -312px -96px; } -.share-alt { +.icon.share-alt { background-position: -336px -96px; } -.resize-full { +.icon.resize-full { background-position: -360px -96px; } -.resize-small { +.icon.resize-small { background-position: -384px -96px; } -.plus { +.icon.plus { background-position: -408px -96px; } -.minus { +.icon.minus { background-position: -432px -96px; } -.asterisk { +.icon.asterisk { background-position: -456px -96px; } .dropdown { -- cgit v1.2.3 From dc2deb9a1b1995bbabee91bfd579d9b466fe78f2 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 26 Jan 2012 21:48:46 -0800 Subject: moving structure around + more work on builder... --- bootstrap.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index c7d457d6e..9d26b41c8 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: Thu Jan 26 19:09:35 PST 2012 + * Date: Thu Jan 26 21:48:03 PST 2012 */ article, aside, @@ -1066,7 +1066,7 @@ table .span12 { margin-left: 0; } .icon { - background-image: url(docs/assets/img/glyphicons-halflings-sprite.png); + background-image: url(img/glyphicons-halflings-sprite.png); background-position: 0 0; background-repeat: no-repeat; display: inline-block; @@ -1075,7 +1075,7 @@ table .span12 { height: 14px; } .icon.white { - background-image: url(docs/assets/img/glyphicons-halflings-sprite-white.png); + background-image: url(img/glyphicons-halflings-sprite-white.png); } .icon.glass { background-position: 0 0; @@ -1831,7 +1831,7 @@ table .span12 { .navbar-search .search-query :-moz-placeholder { color: #eeeeee; } -.navbar-search .search-query ::-webkit-input-placeholder { +.navbar-search .search-query::-webkit-input-placeholder { color: #eeeeee; } .navbar-search .search-query:hover { -- cgit v1.2.3 From ed64276e5be1bbf808f2ab1451aa02522cc3aff0 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 26 Jan 2012 22:05:45 -0800 Subject: move doc building into base make method + build bootstrap to doc assets --- bootstrap.css | 3037 --------------------------------------------------------- 1 file changed, 3037 deletions(-) delete mode 100644 bootstrap.css (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css deleted file mode 100644 index 9d26b41c8..000000000 --- a/bootstrap.css +++ /dev/null @@ -1,3037 +0,0 @@ -/*! - * Bootstrap v2.0.0 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Thu Jan 26 21:48:03 PST 2012 - */ -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -nav, -section { - display: block; -} -audio, canvas, video { - display: inline-block; - *display: inline; - *zoom: 1; -} -audio:not([controls]) { - display: none; -} -html { - font-size: 100%; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; -} -a:focus { - outline: thin dotted; -} -a:hover, a:active { - outline: 0; -} -sub, sup { - position: relative; - font-size: 75%; - line-height: 0; - vertical-align: baseline; -} -sup { - top: -0.5em; -} -sub { - bottom: -0.25em; -} -img { - max-width: 100%; - height: auto; - border: 0; - -ms-interpolation-mode: bicubic; -} -button, -input, -select, -textarea { - margin: 0; - font-size: 100%; - vertical-align: middle; -} -button, input { - *overflow: visible; - line-height: normal; -} -button::-moz-focus-inner, input::-moz-focus-inner { - padding: 0; - border: 0; -} -button, -input[type="button"], -input[type="reset"], -input[type="submit"] { - cursor: pointer; - -webkit-appearance: button; -} -input[type="search"] { - -webkit-appearance: textfield; - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; -} -input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button { - -webkit-appearance: none; -} -textarea { - overflow: auto; - vertical-align: top; -} -body { - margin: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; - color: #555555; - background-color: #ffffff; -} -a { - color: #0088cc; - text-decoration: none; -} -a:hover { - color: #005580; - text-decoration: underline; -} -.row { - margin-left: -20px; - *zoom: 1; -} -.row:before, .row:after { - display: table; - content: ""; -} -.row:after { - clear: both; -} -[class*="span"] { - float: left; - margin-left: 20px; -} -.span1 { - width: 60px; -} -.span2 { - width: 140px; -} -.span3 { - width: 220px; -} -.span4 { - width: 300px; -} -.span5 { - width: 380px; -} -.span6 { - width: 460px; -} -.span7 { - width: 540px; -} -.span8 { - width: 620px; -} -.span9 { - width: 700px; -} -.span10 { - width: 780px; -} -.span11 { - width: 860px; -} -.span12 { - width: 940px; -} -.offset1 { - margin-left: 100px; -} -.offset2 { - margin-left: 180px; -} -.offset3 { - margin-left: 260px; -} -.offset4 { - margin-left: 340px; -} -.offset5 { - margin-left: 420px; -} -.offset6 { - margin-left: 500px; -} -.offset7 { - margin-left: 580px; -} -.offset8 { - margin-left: 660px; -} -.offset9 { - margin-left: 740px; -} -.offset10 { - margin-left: 820px; -} -.offset11 { - margin-left: 900px; -} -.container { - width: 940px; - margin-left: auto; - margin-right: auto; - *zoom: 1; -} -.container:before, .container:after { - display: table; - content: ""; -} -.container:after { - clear: both; -} -.fluid-container { - position: relative; - min-width: 940px; - padding-left: 20px; - padding-right: 20px; - *zoom: 1; -} -.fluid-container:before, .fluid-container:after { - display: table; - content: ""; -} -.fluid-container:after { - clear: both; -} -.fluid-sidebar { - width: 220px; - margin: 0 20px 18px; -} -.sidebar-left { - padding-left: 260px; -} -.sidebar-right { - padding-right: 260px; -} -.sidebar-left .fluid-sidebar { - float: left; - margin-left: -240px; -} -.sidebar-right .fluid-sidebar { - float: right; - margin-right: -240px; -} -.fluid-content { - float: left; - width: 100%; -} -p { - margin: 0 0 9px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; -} -p small { - font-size: 11px; - color: #999999; -} -.lead { - margin-bottom: 18px; - font-size: 20px; - font-weight: 200; - line-height: 27px; -} -h1, -h2, -h3, -h4, -h5, -h6 { - margin: 0; - font-weight: bold; - color: #333333; - text-rendering: optimizelegibility; -} -h1 small, -h2 small, -h3 small, -h4 small, -h5 small, -h6 small { - font-weight: normal; - color: #999999; -} -h1 { - font-size: 30px; - line-height: 36px; -} -h1 small { - font-size: 18px; -} -h2 { - font-size: 24px; - line-height: 36px; -} -h2 small { - font-size: 18px; -} -h3 { - line-height: 27px; - font-size: 18px; -} -h3 small { - font-size: 14px; -} -h4, h5, h6 { - line-height: 18px; -} -h4 { - font-size: 14px; -} -h4 small { - font-size: 12px; -} -h5 { - font-size: 12px; -} -h6 { - font-size: 11px; - color: #999999; - text-transform: uppercase; -} -ul, ol { - padding: 0; - margin: 0 0 9px 25px; -} -ul ul, -ul ol, -ol ol, -ol ul { - margin-bottom: 0; -} -ul { - list-style: disc; -} -ol { - list-style: decimal; -} -li { - line-height: 18px; -} -ul.unstyled { - margin-left: 0; - list-style: none; -} -dl { - margin-bottom: 18px; -} -dt, dd { - line-height: 18px; -} -dt { - font-weight: bold; -} -dd { - margin-left: 9px; -} -hr { - margin: 18px 0; - border: 0; - border-top: 1px solid #e5e5e5; - border-bottom: 1px solid #ffffff; -} -strong { - font-weight: bold; -} -em { - font-style: italic; -} -.muted { - color: #999999; -} -abbr { - font-size: 90%; - text-transform: uppercase; - border-bottom: 1px dotted #ddd; - cursor: help; -} -blockquote { - padding: 0 0 0 15px; - margin: 0 0 18px; - border-left: 5px solid #eeeeee; -} -blockquote p { - margin-bottom: 0; - font-size: 16px; - font-weight: 300; - line-height: 22.5px; -} -blockquote small { - display: block; - line-height: 18px; - color: #999999; -} -blockquote small:before { - content: '\2014 \00A0'; -} -blockquote.pull-right { - float: right; - padding-left: 0; - padding-right: 15px; - border-left: 0; - border-right: 5px solid #eeeeee; -} -blockquote.pull-right p, blockquote.pull-right small { - text-align: right; -} -q:before, -q:after, -blockquote:before, -blockquote:after { - content: ""; -} -address { - display: block; - margin-bottom: 18px; - line-height: 18px; - font-style: normal; -} -small { - font-size: 100%; -} -cite { - font-style: normal; -} -code, pre { - padding: 0 3px 2px; - font-family: Menlo, Monaco, "Courier New", monospace; - font-size: 12px; - color: #333333; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -code { - padding: 3px 4px; - color: #d14; - background-color: #f7f7f9; - border: 1px solid #e1e1e8; -} -pre { - display: block; - padding: 8.5px; - margin: 0 0 9px; - font-size: 12px; - line-height: 18px; - background-color: #f5f5f5; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - white-space: pre; - white-space: pre-wrap; - word-break: break-all; -} -pre.prettyprint { - margin-bottom: 18px; -} -pre code { - padding: 0; - background-color: transparent; -} -form { - margin: 0 0 18px; -} -fieldset { - padding: 0; - margin: 0; - border: 0; -} -legend { - display: block; - width: 100%; - padding: 0; - margin-bottom: 27px; - font-size: 19.5px; - line-height: 36px; - color: #333333; - border: 0; - border-bottom: 1px solid #eee; -} -label, -input, -button, -select, -textarea { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: normal; - line-height: 18px; -} -label { - display: block; - margin-bottom: 5px; - color: #333333; -} -input, -textarea, -select, -.uneditable-input { - display: inline-block; - width: 210px; - height: 18px; - padding: 4px; - margin-bottom: 9px; - font-size: 13px; - line-height: 18px; - color: #555555; - border: 1px solid #ccc; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -.uneditable-textarea { - width: auto; - height: auto; -} -label input, label textarea, label select { - display: block; -} -input[type=image], input[type=checkbox], input[type=radio] { - width: auto; - height: auto; - padding: 0; - margin: 3px 0; - *margin-top: 0; - /* IE7 */ - - line-height: normal; - border: none; - cursor: pointer; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -input[type=file] { - padding: initial; - line-height: initial; - border: initial; - background-color: #ffffff; - background-color: initial; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -input[type=button], input[type=reset], input[type=submit] { - width: auto; - height: auto; -} -select, input[type=file] { - height: 28px; - /* In IE7, the height of the select element cannot be changed by height, only font-size */ - - *margin-top: 4px; - /* For IE7, add top margin to align select with labels */ - - line-height: 28px; -} -select { - width: 220px; - background-color: #ffffff; -} -select[multiple], select[size] { - height: auto; -} -input[type=image] { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -textarea { - height: auto; -} -input[type=hidden] { - display: none; -} -.radio, .checkbox { - padding-left: 18px; -} -.radio input[type=radio], .checkbox input[type=checkbox] { - float: left; - margin-left: -18px; -} -.controls > .radio:first-child, .controls > .checkbox:first-child { - padding-top: 5px; -} -.radio.inline, .checkbox.inline { - display: inline-block; - margin-bottom: 0; -} -.radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline { - margin-left: 10px; -} -input, textarea { - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; -} -input:focus, textarea:focus { - border-color: rgba(82, 168, 236, 0.8); - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - outline: 0; -} -input[type=file]:focus, input[type=checkbox]:focus, select:focus { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - outline: 1px dotted #666; -} -.input-mini { - width: 60px; -} -.input-small { - width: 90px; -} -.input-medium { - width: 150px; -} -.input-large { - width: 210px; -} -.input-xlarge { - width: 270px; -} -.input-xxlarge { - width: 530px; -} -input[class*="span"], -select[class*="span"], -textarea[class*="span"], -.uneditable-input { - float: none; - margin-left: 0; -} -input.span1, textarea.span1, .uneditable-input.span1 { - width: 50px; -} -input.span2, textarea.span2, .uneditable-input.span2 { - width: 130px; -} -input.span3, textarea.span3, .uneditable-input.span3 { - width: 210px; -} -input.span4, textarea.span4, .uneditable-input.span4 { - width: 290px; -} -input.span5, textarea.span5, .uneditable-input.span5 { - width: 370px; -} -input.span6, textarea.span6, .uneditable-input.span6 { - width: 450px; -} -input.span7, textarea.span7, .uneditable-input.span7 { - width: 530px; -} -input.span8, textarea.span8, .uneditable-input.span8 { - width: 610px; -} -input.span9, textarea.span9, .uneditable-input.span9 { - width: 690px; -} -input.span10, textarea.span10, .uneditable-input.span10 { - width: 770px; -} -input.span11, textarea.span11, .uneditable-input.span11 { - width: 850px; -} -input.span12, textarea.span12, .uneditable-input.span12 { - width: 930px; -} -select.span1 { - width: 70px; -} -select.span2 { - width: 150px; -} -select.span3 { - width: 230px; -} -select.span4 { - width: 310px; -} -select.span5 { - width: 390px; -} -select.span6 { - width: 470px; -} -select.span7 { - width: 550px; -} -select.span8 { - width: 630px; -} -select.span9 { - width: 710px; -} -select.span10 { - width: 790px; -} -select.span11 { - width: 870px; -} -select.span12 { - width: 950px; -} -input[disabled], -select[disabled], -textarea[disabled], -input[readonly], -select[readonly], -textarea[readonly] { - background-color: #f5f5f5; - border-color: #ddd; - cursor: not-allowed; -} -.control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline { - color: #c09853; -} -.control-group.warning input, .control-group.warning select, .control-group.warning textarea { - color: #c09853; - border-color: #c09853; -} -.control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { - border-color: #a47e3c; - -webkit-box-shadow: 0 0 6px #dbc59e; - -moz-box-shadow: 0 0 6px #dbc59e; - box-shadow: 0 0 6px #dbc59e; -} -.control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { - color: #c09853; - background-color: #fcf8e3; - border-color: #c09853; -} -.control-group.error > label, .control-group.error .help-block, .control-group.error .help-inline { - color: #b94a48; -} -.control-group.error input, .control-group.error select, .control-group.error textarea { - color: #b94a48; - border-color: #b94a48; -} -.control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus { - border-color: #953b39; - -webkit-box-shadow: 0 0 6px #d59392; - -moz-box-shadow: 0 0 6px #d59392; - box-shadow: 0 0 6px #d59392; -} -.control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { - color: #b94a48; - background-color: #f2dede; - border-color: #b94a48; -} -.control-group.success > label, .control-group.success .help-block, .control-group.success .help-inline { - color: #468847; -} -.control-group.success input, .control-group.success select, .control-group.success textarea { - color: #468847; - border-color: #468847; -} -.control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus { - border-color: #356635; - -webkit-box-shadow: 0 0 6px #7aba7b; - -moz-box-shadow: 0 0 6px #7aba7b; - box-shadow: 0 0 6px #7aba7b; -} -.control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { - color: #468847; - background-color: #dff0d8; - border-color: #468847; -} -input:focus:required:invalid, textarea:focus:required:invalid, select:focus:required:invalid { - color: #b94a48; - border-color: #ee5f5b; -} -input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, select:focus:required:invalid:focus { - border-color: #e9322d; - -webkit-box-shadow: 0 0 6px #f8b9b7; - -moz-box-shadow: 0 0 6px #f8b9b7; - box-shadow: 0 0 6px #f8b9b7; -} -.form-actions { - padding: 17px 20px 18px; - margin-top: 18px; - margin-bottom: 18px; - background-color: #f5f5f5; - border-top: 1px solid #ddd; -} -.uneditable-input { - display: block; - background-color: #ffffff; - border-color: #eee; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - cursor: not-allowed; -} -:-moz-placeholder { - color: #999999; -} -::-webkit-input-placeholder { - color: #999999; -} -.help-block { - margin-top: 5px; - margin-bottom: 0; - color: #999999; -} -.help-inline { - display: inline-block; - margin-bottom: 9px; - vertical-align: middle; - padding-left: 5px; -} -.input-prepend, .input-append { - margin-bottom: 5px; - *zoom: 1; -} -.input-prepend:before, -.input-append:before, -.input-prepend:after, -.input-append:after { - display: table; - content: ""; -} -.input-prepend:after, .input-append:after { - clear: both; -} -.input-prepend input, -.input-append input, -.input-prepend .uneditable-input, -.input-append .uneditable-input { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} -.input-prepend .uneditable-input, .input-append .uneditable-input { - border-left-color: #ccc; -} -.input-prepend .add-on, .input-append .add-on { - float: left; - display: block; - width: auto; - min-width: 16px; - height: 18px; - margin-right: -1px; - padding: 4px 4px 4px 5px; - font-weight: normal; - line-height: 18px; - color: #999999; - text-align: center; - text-shadow: 0 1px 0 #ffffff; - background-color: #f5f5f5; - border: 1px solid #ccc; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} -.input-prepend .active, .input-append .active { - background-color: #a9dba9; - border-color: #46a546; -} -.input-prepend .add-on { - *margin-top: 1px; - /* IE6-7 */ - -} -.input-append input, .input-append .uneditable-input { - float: left; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} -.input-append .uneditable-input { - border-right-color: #ccc; -} -.input-append .add-on { - margin-right: 0; - margin-left: -1px; - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} -.search-query { - padding-left: 14px; - padding-right: 14px; - margin-bottom: 0; - -webkit-border-radius: 14px; - -moz-border-radius: 14px; - border-radius: 14px; -} -.form-search input, -.form-inline input, -.form-horizontal input, -.form-search textarea, -.form-inline textarea, -.form-horizontal textarea, -.form-search select, -.form-inline select, -.form-horizontal select, -.form-search .help-inline, -.form-inline .help-inline, -.form-horizontal .help-inline, -.form-search .uneditable-input, -.form-inline .uneditable-input, -.form-horizontal .uneditable-input { - display: inline-block; - margin-bottom: 0; -} -.form-search label, .form-inline label { - display: inline-block; -} -.control-group { - margin-bottom: 9px; -} -.form-horizontal legend + .control-group { - margin-top: 18px; - -webkit-margin-top-collapse: separate; -} -.form-horizontal .control-group { - margin-bottom: 18px; -} -.form-horizontal .control-group > label { - float: left; - width: 140px; - padding-top: 5px; - text-align: right; -} -.form-horizontal .controls { - margin-left: 160px; -} -.form-horizontal .form-actions { - padding-left: 160px; -} -table { - max-width: 100%; - border-collapse: collapse; - border-spacing: 0; -} -.table { - width: 100%; - margin-bottom: 18px; -} -.table th, .table td { - padding: 8px; - line-height: 18px; - text-align: left; - border-top: 1px solid #ddd; -} -.table th { - font-weight: bold; - vertical-align: bottom; -} -.table td { - vertical-align: top; -} -.table thead:first-child tr th, .table thead:first-child tr td { - border-top: 0; -} -.table tbody + tbody { - border-top: 2px solid #ddd; -} -.table-condensed th, .table-condensed td { - padding: 4px 5px; -} -.table-bordered { - border: 1px solid #ddd; - border-collapse: separate; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.table-bordered th + th, -.table-bordered td + td, -.table-bordered th + td, -.table-bordered td + th { - border-left: 1px solid #ddd; -} -.table-bordered thead:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child td { - border-top: 0; -} -.table-bordered thead:first-child tr:first-child th:first-child, .table-bordered tbody:first-child 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; -} -.table-bordered thead:first-child tr:first-child th:last-child, .table-bordered tbody:first-child 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; -} -.table-bordered thead:last-child tr:last-child th:first-child, .table-bordered tbody:last-child 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; -} -.table-bordered thead:last-child tr:last-child th:last-child, .table-bordered tbody:last-child 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; -} -.table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th { - background-color: #f9f9f9; -} -table .span1 { - float: none; - width: 44px; - margin-left: 0; -} -table .span2 { - float: none; - width: 124px; - margin-left: 0; -} -table .span3 { - float: none; - width: 204px; - margin-left: 0; -} -table .span4 { - float: none; - width: 284px; - margin-left: 0; -} -table .span5 { - float: none; - width: 364px; - margin-left: 0; -} -table .span6 { - float: none; - width: 444px; - margin-left: 0; -} -table .span7 { - float: none; - width: 524px; - margin-left: 0; -} -table .span8 { - float: none; - width: 604px; - margin-left: 0; -} -table .span9 { - float: none; - width: 684px; - margin-left: 0; -} -table .span10 { - float: none; - width: 764px; - margin-left: 0; -} -table .span11 { - float: none; - width: 844px; - margin-left: 0; -} -table .span12 { - float: none; - width: 924px; - margin-left: 0; -} -.icon { - background-image: url(img/glyphicons-halflings-sprite.png); - background-position: 0 0; - background-repeat: no-repeat; - display: inline-block; - vertical-align: text-top; - width: 14px; - height: 14px; -} -.icon.white { - background-image: url(img/glyphicons-halflings-sprite-white.png); -} -.icon.glass { - background-position: 0 0; -} -.icon.music { - background-position: -24px 0; -} -.icon.search { - background-position: -48px 0; -} -.icon.envelope { - background-position: -72px 0; -} -.icon.heart { - background-position: -96px 0; -} -.icon.star { - background-position: -120px 0; -} -.icon.star-empty { - background-position: -144px 0; -} -.icon.user { - background-position: -168px 0; -} -.icon.film { - background-position: -192px 0; -} -.icon.th-large { - background-position: -216px 0; -} -.icon.th { - background-position: -240px 0; -} -.icon.th-list { - background-position: -264px 0; -} -.icon.ok { - background-position: -288px 0; -} -.icon.remove { - background-position: -312px 0; -} -.icon.zoom-in { - background-position: -336px 0; -} -.icon.zoom-out { - background-position: -360px 0; -} -.icon.off { - background-position: -384px 0; -} -.icon.signal { - background-position: -408px 0; -} -.icon.cog { - background-position: -432px 0; -} -.icon.trash { - background-position: -456px 0; -} -.icon.home { - background-position: 0 -24px; -} -.icon.file { - background-position: -24px -24px; -} -.icon.time { - background-position: -48px -24px; -} -.icon.road { - background-position: -72px -24px; -} -.icon.download-alt { - background-position: -96px -24px; -} -.icon.download { - background-position: -120px -24px; -} -.icon.upload { - background-position: -144px -24px; -} -.icon.inbox { - background-position: -168px -24px; -} -.icon.play-circle { - background-position: -192px -24px; -} -.icon.repeat { - background-position: -216px -24px; -} -.icon.refresh { - background-position: -240px -24px; -} -.icon.calendar { - background-position: -264px -24px; -} -.icon.lock { - background-position: -288px -24px; -} -.icon.flag { - background-position: -312px -24px; -} -.icon.headphones { - background-position: -336px -24px; -} -.icon.volume-off { - background-position: -360px -24px; -} -.icon.volume-down { - background-position: -384px -24px; -} -.icon.volume-up { - background-position: -408px -24px; -} -.icon.qrcode { - background-position: -432px -24px; -} -.icon.barcode { - background-position: -456px -24px; -} -.icon.tag { - background-position: 0 -48px; -} -.icon.tags { - background-position: -24px -48px; -} -.icon.book { - background-position: -48px -48px; -} -.icon.bookmark { - background-position: -72px -48px; -} -.icon.print { - background-position: -96px -48px; -} -.icon.camera { - background-position: -120px -48px; -} -.icon.font { - background-position: -144px -48px; -} -.icon.bold { - background-position: -168px -48px; -} -.icon.italic { - background-position: -192px -48px; -} -.icon.text-height { - background-position: -216px -48px; -} -.icon.text-width { - background-position: -240px -48px; -} -.icon.align-left { - background-position: -264px -48px; -} -.icon.align-center { - background-position: -288px -48px; -} -.icon.align-right { - background-position: -312px -48px; -} -.icon.align-justify { - background-position: -336px -48px; -} -.icon.list { - background-position: -360px -48px; -} -.icon.indent-left { - background-position: -384px -48px; -} -.icon.indent-right { - background-position: -408px -48px; -} -.icon.facetime-video { - background-position: -432px -48px; -} -.icon.picture { - background-position: -456px -48px; -} -.icon.pencil { - background-position: 0 -72px; -} -.icon.map-marker { - background-position: -24px -72px; -} -.icon.adjust { - background-position: -48px -72px; -} -.icon.tint { - background-position: -72px -72px; -} -.icon.edit { - background-position: -96px -72px; -} -.icon.share { - background-position: -120px -72px; -} -.icon.check { - background-position: -144px -72px; -} -.icon.move { - background-position: -168px -72px; -} -.icon.step-backward { - background-position: -192px -72px; -} -.icon.fast-backward { - background-position: -216px -72px; -} -.icon.backward { - background-position: -240px -72px; -} -.icon.play { - background-position: -264px -72px; -} -.icon.pause { - background-position: -288px -72px; -} -.icon.stop { - background-position: -312px -72px; -} -.icon.forward { - background-position: -336px -72px; -} -.icon.fast-forward { - background-position: -360px -72px; -} -.icon.step-forward { - background-position: -384px -72px; -} -.icon.eject { - background-position: -408px -72px; -} -.icon.chevron-left { - background-position: -432px -72px; -} -.icon.chevron-right { - background-position: -456px -72px; -} -.icon.arrow-left { - background-position: -240px -96px; -} -.icon.arrow-right { - background-position: -264px -96px; -} -.icon.arrow-up { - background-position: -288px -96px; -} -.icon.arrow-down { - background-position: -312px -96px; -} -.icon.share-alt { - background-position: -336px -96px; -} -.icon.resize-full { - background-position: -360px -96px; -} -.icon.resize-small { - background-position: -384px -96px; -} -.icon.plus { - background-position: -408px -96px; -} -.icon.minus { - background-position: -432px -96px; -} -.icon.asterisk { - background-position: -456px -96px; -} -.dropdown { - position: relative; -} -.caret { - display: inline-block; - width: 0; - height: 0; - text-indent: -99999px; - vertical-align: top; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid #000000; - opacity: 0.3; - filter: alpha(opacity=30); - content: "\2193"; -} -.dropdown .caret { - margin-top: 8px; - margin-left: 2px; - *margin-top: 7px; -} -.dropdown:hover .caret, .open.dropdown .caret { - opacity: 1; - filter: alpha(opacity=100); -} -.dropdown-menu { - position: absolute; - top: 100%; - z-index: 1000; - float: left; - display: none; - min-width: 160px; - max-width: 220px; - _width: 160px; - padding: 4px 0; - margin: 0; - list-style: none; - background-color: #ffffff; - border-color: #ccc; - border-color: rgba(0, 0, 0, 0.2); - border-style: solid; - border-width: 1px; - -webkit-border-radius: 0 0 5px 5px; - -moz-border-radius: 0 0 5px 5px; - border-radius: 0 0 5px 5px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; - zoom: 1; - *border-right-width: 2px; - *border-bottom-width: 2px; -} -.dropdown-menu.bottom-up { - top: auto; - bottom: 100%; - margin-bottom: 2px; -} -.dropdown-menu .divider { - height: 1px; - margin: 5px 1px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; -} -.dropdown-menu a { - display: block; - padding: 3px 15px; - clear: both; - font-weight: normal; - line-height: 18px; - color: #555555; - white-space: nowrap; -} -.dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover { - color: #ffffff; - text-decoration: none; - background-color: #0088cc; -} -.dropdown.open .dropdown-toggle { - color: #ffffff; - background: #ccc; - background: rgba(0, 0, 0, 0.3); -} -.dropdown.open .dropdown-menu { - display: block; -} -.typeahead { - margin-top: 2px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.well { - min-height: 20px; - padding: 19px; - margin-bottom: 20px; - background-color: #f5f5f5; - border: 1px solid #eee; - border: 1px solid rgba(0, 0, 0, 0.05); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -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); -} -.well blockquote { - border-color: #ddd; - border-color: rgba(0, 0, 0, 0.15); -} -.fade { - -webkit-transition: opacity 0.15s linear; - -moz-transition: opacity 0.15s linear; - -ms-transition: opacity 0.15s linear; - -o-transition: opacity 0.15s linear; - transition: opacity 0.15s linear; - opacity: 0; -} -.fade.in { - opacity: 1; -} -.collapse { - -webkit-transition: height 0.35s ease; - -moz-transition: height 0.35s ease; - -ms-transition: height 0.35s ease; - -o-transition: height 0.35s ease; - transition: height 0.35s ease; - position: relative; - overflow: hidden; - height: 0; -} -.collapse.in { - height: auto; -} -.close { - float: right; - font-size: 20px; - font-weight: bold; - line-height: 18px; - color: #000000; - text-shadow: 0 1px 0 #ffffff; - opacity: 0.2; - filter: alpha(opacity=20); -} -.close:hover { - color: #000000; - text-decoration: none; - opacity: 0.4; - filter: alpha(opacity=40); - cursor: pointer; -} -.nav { - margin-left: 0; - margin-bottom: 18px; - list-style: none; -} -.nav > li > a { - display: block; -} -.nav > li > a:hover { - text-decoration: none; - background-color: #eeeeee; -} -.nav.list { - padding-left: 14px; - padding-right: 14px; - margin-bottom: 0; -} -.nav.list > li > a, .nav.list .nav-header { - display: block; - padding: 3px 15px; - margin-left: -15px; - margin-right: -15px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -} -.nav.list .nav-header { - font-size: 11px; - font-weight: bold; - line-height: 18px; - color: #999999; - text-transform: uppercase; -} -.nav.list > li + .nav-header { - margin-top: 9px; -} -.nav.list .active > a { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #0088cc; -} -.tabs, .pills { - *zoom: 1; -} -.tabs:before, -.pills:before, -.tabs:after, -.pills:after { - display: table; - content: ""; -} -.tabs:after, .pills:after { - clear: both; -} -.tabs > li, .pills > li { - float: left; -} -.tabs > li > a, .pills > li > a { - padding-right: 12px; - padding-left: 12px; - margin-right: 2px; - line-height: 14px; -} -.tabs { - border-bottom: 1px solid #ddd; -} -.tabs > li { - margin-bottom: -1px; -} -.tabs > li > a { - padding-top: 9px; - padding-bottom: 9px; - border: 1px solid transparent; - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} -.tabs > li > a:hover { - border-color: #eeeeee #eeeeee #dddddd; -} -.tabs > .active > a, .tabs > .active > a:hover { - color: #555555; - background-color: #ffffff; - border: 1px solid #ddd; - border-bottom-color: transparent; - cursor: default; -} -.pills > li > a { - padding-top: 8px; - padding-bottom: 8px; - margin-top: 2px; - margin-bottom: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} -.pills .active > a, .pills .active > a:hover { - color: #ffffff; - background-color: #0088cc; -} -.nav.stacked > li { - float: none; -} -.nav.stacked > li > a { - margin-right: 0; -} -.tabs.stacked { - border-bottom: 0; -} -.tabs.stacked > li > a { - border: 1px solid #ddd; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.tabs.stacked > li:first-child > a { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} -.tabs.stacked > li:last-child > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} -.tabs.stacked > li > a:hover { - border-color: #ddd; - z-index: 2; -} -.pills.stacked > li > a { - margin-bottom: 3px; -} -.pills.stacked > li:last-child > a { - margin-bottom: 1px; -} -.pills .dropdown-menu, .tabs .dropdown-menu { - margin-top: 1px; - border-width: 1px; -} -.pills .dropdown-menu { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret { - border-top-color: #0088cc; - margin-top: 6px; -} -.tabs .dropdown-toggle:hover .caret, .pills .dropdown-toggle:hover .caret { - border-top-color: #005580; -} -.tabs .active .dropdown-toggle .caret, .pills .active .dropdown-toggle .caret { - border-top-color: #333333; -} -.nav > .dropdown.active > a:hover { - color: #000000; - cursor: pointer; -} -.tabs .open .dropdown-toggle, .pills .open .dropdown-toggle, .nav > .open.active > a:hover { - color: #ffffff; - background-color: #999999; - border-color: #999999; -} -.nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret { - border-top-color: #ffffff; - opacity: 1; - filter: alpha(opacity=100); -} -.tabs.stacked .open > a:hover { - border-color: #999999; -} -.tabbable { - *zoom: 1; -} -.tabbable:before, .tabbable:after { - display: table; - content: ""; -} -.tabbable:after { - clear: both; -} -.tabs-below .tabs, .tabs-right .tabs, .tabs-left .tabs { - border-bottom: 0; -} -.tab-content > .tab-pane, .pill-content > .pill-pane { - display: none; -} -.tab-content > .active, .pill-content > .active { - display: block; -} -.tabs-below .tabs { - border-top: 1px solid #ddd; -} -.tabs-below .tabs > li { - margin-top: -1px; - margin-bottom: 0; -} -.tabs-below .tabs > li > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} -.tabs-below .tabs > li > a:hover { - border-bottom-color: transparent; - border-top-color: #ddd; -} -.tabs-below .tabs .active > a, .tabs-below .tabs .active > a:hover { - border-color: transparent #ddd #ddd #ddd; -} -.tabs-left .tabs > li, .tabs-right .tabs > li { - float: none; -} -.tabs-left .tabs > li > a, .tabs-right .tabs > li > a { - min-width: 74px; - margin-right: 0; - margin-bottom: 3px; -} -.tabs-left .tabs { - float: left; - margin-right: 19px; - border-right: 1px solid #ddd; -} -.tabs-left .tabs > li > a { - margin-right: -1px; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} -.tabs-left .tabs > li > a:hover { - border-color: #eeeeee #dddddd #eeeeee #eeeeee; -} -.tabs-left .tabs .active > a, .tabs-left .tabs .active > a:hover { - border-color: #ddd transparent #ddd #ddd; -} -.tabs-right .tabs { - float: right; - margin-left: 19px; - border-left: 1px solid #ddd; -} -.tabs-right .tabs > li > a { - margin-left: -1px; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} -.tabs-right .tabs > li > a:hover { - border-color: #eeeeee #eeeeee #eeeeee #dddddd; -} -.tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover { - border-color: #ddd #ddd #ddd transparent; -} -.navbar { - overflow: visible; -} -.navbar-inner { - background-color: #222222; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-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-repeat: repeat-x; - -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 .brand:hover { - color: #ffffff; - text-decoration: none; -} -.navbar .brand { - float: left; - display: block; - padding: 8px 20px 12px; - margin-left: -20px; - font-size: 20px; - font-weight: 200; - line-height: 1; - color: #ffffff; -} -.navbar p { - margin: 0; - line-height: 40px; -} -.navbar p a:hover { - color: #ffffff; - background-color: transparent; -} -.navbar .btn, .navbar .btn-group { - margin-top: 5px; -} -.navbar .btn-group .btn { - margin-top: 0; -} -.navbar-form { - margin-bottom: 0; -} -.navbar-form input, .navbar-form select { - display: inline-block; - margin-bottom: 0; -} -.navbar-search { - position: relative; - float: left; - margin-top: 6px; - margin-bottom: 0; -} -.navbar-search .search-query { - padding: 4px 9px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: normal; - line-height: 1; - color: #ffffff; - color: rgba(255, 255, 255, 0.75); - background: #444; - background: rgba(255, 255, 255, 0.3); - border: 1px solid #111; - -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 .search-query :-moz-placeholder { - color: #eeeeee; -} -.navbar-search .search-query::-webkit-input-placeholder { - color: #eeeeee; -} -.navbar-search .search-query:hover { - color: #ffffff; - background-color: #999999; - background-color: rgba(255, 255, 255, 0.5); -} -.navbar-search .search-query:focus, .navbar-search .search-query.focused { - padding: 5px 10px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - outline: 0; -} -.navbar-static { - margin-bottom: 18px; -} -.navbar-static .navbar-inner { - padding-left: 20px; - padding-right: 20px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.navbar-fixed { - position: fixed; - top: 0; - right: 0; - left: 0; - z-index: 1030; -} -.navbar .nav { - position: relative; - left: 0; - display: block; - float: left; - margin: 0 10px 0 0; -} -.navbar .nav.pull-right { - float: right; -} -.navbar .nav > li { - display: block; - float: left; -} -.navbar .nav > li > a { - float: none; - padding: 10px 10px 11px; - line-height: 19px; - color: #999999; - text-decoration: none; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.navbar .nav > li > a:hover { - background-color: transparent; - color: #ffffff; - text-decoration: none; -} -.navbar .nav .active > a { - color: #ffffff; - text-decoration: none; - background-color: #222222; - background-color: rgba(0, 0, 0, 0.5); -} -.navbar .vertical-divider { - height: 40px; - width: 1px; - margin: 0 5px; - overflow: hidden; - background-color: #222222; - border-right: 1px solid #444; -} -.navbar .nav.pull-right { - margin-left: 10px; - margin-right: 0; -} -.navbar .dropdown-menu { - margin-top: 1px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.navbar .dropdown-menu:before { - content: ''; - display: inline-block; - border-left: 7px solid transparent; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-bottom-color: rgba(0, 0, 0, 0.2); - position: absolute; - top: -7px; - left: 9px; -} -.navbar .dropdown-menu:after { - content: ''; - display: inline-block; - border-left: 6px solid transparent; - border-right: 6px solid transparent; - border-bottom: 6px solid #ffffff; - position: absolute; - top: -6px; - left: 10px; -} -.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret { - border-top-color: #ffffff; -} -.navbar .nav .active .caret { - opacity: 1; - filter: alpha(opacity=100); -} -.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle { - background-color: transparent; -} -.navbar .nav .active > .dropdown-toggle:hover { - color: #ffffff; -} -.navbar .nav.pull-right .dropdown-menu { - right: 0; -} -.navbar .nav.pull-right .dropdown-menu:before { - left: auto; - right: 12px; -} -.navbar .nav.pull-right .dropdown-menu:after { - left: auto; - right: 13px; -} -.breadcrumb { - padding: 7px 14px; - margin: 0 0 18px; - background-color: #fbfbfb; - background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5)); - background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); - background-image: linear-gradient(top, #ffffff, #f5f5f5); - background-repeat: repeat-x; - border: 1px solid #ddd; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; -} -.breadcrumb li { - display: inline; - text-shadow: 0 1px 0 #ffffff; -} -.breadcrumb .divider { - padding: 0 5px; - color: #999999; -} -.breadcrumb .active a { - color: #333333; -} -.pagination { - height: 36px; - margin: 18px 0; -} -.pagination ul { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - margin-left: 0; - margin-bottom: 0; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -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); -} -.pagination li { - display: inline; -} -.pagination a { - float: left; - padding: 0 14px; - line-height: 34px; - text-decoration: none; - border: 1px solid #ddd; - border-left-width: 0; -} -.pagination a:hover, .pagination .active a { - background-color: #f5f5f5; -} -.pagination .active a { - color: #999999; -} -.pagination .disabled a, .pagination .disabled a:hover { - color: #999999; - background-color: transparent; - cursor: default; -} -.pagination li:first-child a { - border-left-width: 1px; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} -.pagination li:last-child a { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} -.pagination-centered { - text-align: center; -} -.pagination-right { - text-align: right; -} -.pager { - margin-left: 0; - margin-bottom: 18px; - list-style: none; - text-align: center; - *zoom: 1; -} -.pager:before, .pager:after { - display: table; - content: ""; -} -.pager:after { - clear: both; -} -.pager li { - display: inline; -} -.pager a { - display: inline-block; - padding: 6px 15px; - background-color: #f5f5f5; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} -.pager .next a { - float: right; -} -.pager .previous a { - float: left; -} -.modal-backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1040; - background-color: #000000; -} -.modal-backdrop.fade { - opacity: 0; -} -.modal-backdrop, .modal-backdrop.fade.in { - opacity: 0.8; - filter: alpha(opacity=80); -} -.modal { - position: fixed; - top: 50%; - left: 50%; - z-index: 1050; - max-height: 500px; - overflow: auto; - width: 560px; - margin: -250px 0 0 -280px; - background-color: #ffffff; - border: 1px solid #999; - border: 1px solid rgba(0, 0, 0, 0.3); - *border: 1px solid #999; - /* IE6-7 */ - - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -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); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} -.modal.fade { - -webkit-transition: opacity .3s linear, top .3s ease-out; - -moz-transition: opacity .3s linear, top .3s ease-out; - -ms-transition: opacity .3s linear, top .3s ease-out; - -o-transition: opacity .3s linear, top .3s ease-out; - transition: opacity .3s linear, top .3s ease-out; - top: -25%; -} -.modal.fade.in { - top: 50%; -} -.modal-header { - padding: 5px 15px; - border-bottom: 1px solid #eee; -} -.modal-header .close { - margin-top: 2px; -} -.modal-body { - padding: 15px; -} -.modal-footer { - padding: 14px 15px 15px; - margin-bottom: 0; - background-color: #f5f5f5; - border-top: 1px solid #ddd; - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; - *zoom: 1; -} -.modal-footer:before, .modal-footer:after { - display: table; - content: ""; -} -.modal-footer:after { - clear: both; -} -.modal-footer .btn { - float: right; - margin-left: 5px; - margin-bottom: 0; -} -.tooltip { - position: absolute; - z-index: 1020; - display: block; - visibility: visible; - padding: 5px; - font-size: 11px; - opacity: 0; - filter: alpha(opacity=0); -} -.tooltip.in { - opacity: 0.8; - filter: alpha(opacity=80); -} -.tooltip.top { - margin-top: -2px; -} -.tooltip.right { - margin-left: 2px; -} -.tooltip.bottom { - margin-top: 2px; -} -.tooltip.left { - margin-left: -2px; -} -.tooltip.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; -} -.tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; -} -.tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; -} -.tooltip-inner { - max-width: 200px; - padding: 3px 8px; - color: #ffffff; - text-align: center; - text-decoration: none; - background-color: #000000; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.tooltip-arrow { - position: absolute; - width: 0; - height: 0; -} -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1010; - display: none; - padding: 5px; -} -.popover.top { - margin-top: -5px; -} -.popover.right { - margin-left: 5px; -} -.popover.bottom { - margin-top: 5px; -} -.popover.left { - margin-left: -5px; -} -.popover.top .arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; -} -.popover.right .arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; -} -.popover.bottom .arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; -} -.popover.left .arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.popover .arrow { - position: absolute; - width: 0; - height: 0; -} -.popover .inner { - padding: 3px; - width: 280px; - overflow: hidden; - background: #000000; - background: rgba(0, 0, 0, 0.8); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -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); -} -.popover .title { - padding: 9px 15px; - line-height: 1; - background-color: #f5f5f5; - border-bottom: 1px solid #eee; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; -} -.popover .content { - padding: 14px; - background-color: #ffffff; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} -.popover .content p, .popover .content ul, .popover .content ol { - margin-bottom: 0; -} -.btn.primary, -.btn.primary:hover, -.btn.danger, -.btn.danger:hover, -.btn.success, -.btn.success:hover, -.btn.info, -.btn.info:hover { - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - color: #ffffff; -} -.btn.primary { - background-color: #0074cc; - background-image: -moz-linear-gradient(top, #0088cc, #0055cc); - background-image: -ms-linear-gradient(top, #0088cc, #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-repeat: repeat-x; - border-color: #0055cc #0055cc #003580; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} -.btn.primary:hover, -.btn.primary:active, -.btn.primary.active, -.btn.primary.disabled { - background-color: #0055cc; -} -.btn.primary[disabled] { - background-color: #0055cc; -} -.btn.primary:active, .btn.primary.active { - background-color: #004099 \9; -} -.btn.danger { - background-color: #dd514c; - background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(top, #ee5f5b, #c43c35); - background-repeat: repeat-x; - border-color: #c43c35 #c43c35 #882a25; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} -.btn.danger:hover, -.btn.danger:active, -.btn.danger.active, -.btn.danger.disabled { - background-color: #c43c35; -} -.btn.danger[disabled] { - background-color: #c43c35; -} -.btn.danger:active, .btn.danger.active { - background-color: #9c302a \9; -} -.btn.success { - background-color: #5eb95e; - background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); - background-image: -webkit-linear-gradient(top, #62c462, #57a957); - background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); - background-repeat: repeat-x; - border-color: #57a957 #57a957 #3d773d; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} -.btn.success:hover, -.btn.success:active, -.btn.success.active, -.btn.success.disabled { - background-color: #57a957; -} -.btn.success[disabled] { - background-color: #57a957; -} -.btn.success:active, .btn.success.active { - background-color: #458845 \9; -} -.btn.info { - background-color: #4bb1cf; - background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); - background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); - background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(top, #5bc0de, #339bb9); - background-repeat: repeat-x; - border-color: #339bb9 #339bb9 #22697d; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} -.btn.info:hover, -.btn.info:active, -.btn.info.active, -.btn.info.disabled { - background-color: #339bb9; -} -.btn.info[disabled] { - background-color: #339bb9; -} -.btn.info:active, .btn.info.active { - background-color: #287a91 \9; -} -.btn { - display: inline-block; - padding: 4px 10px 4px; - font-size: 13px; - line-height: 18px; - color: #333333; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - background-color: #fafafa; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); - background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-repeat: no-repeat; - border: 1px solid #ccc; - border-bottom-color: #bbb; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -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); - cursor: pointer; -} -.btn:hover { - color: #333333; - text-decoration: none; - background-color: #e6e6e6; - background-position: 0 -15px; - -webkit-transition: background-position 0.1s linear; - -moz-transition: background-position 0.1s linear; - -ms-transition: background-position 0.1s linear; - -o-transition: background-position 0.1s linear; - transition: background-position 0.1s linear; -} -.btn:focus { - outline: 1px dotted #666; -} -.btn.active, .btn:active { - background-image: none; - -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); - background-color: #e6e6e6; - background-color: #d9d9d9 \9; -} -.btn.disabled { - cursor: default; - background-image: none; - background-color: #e6e6e6; - opacity: 0.65; - filter: alpha(opacity=65); - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -.btn[disabled] { - cursor: default; - background-image: none; - background-color: #e6e6e6; - opacity: 0.65; - filter: alpha(opacity=65); - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -.btn.large { - padding: 9px 14px 9px; - font-size: 15px; - line-height: normal; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} -.btn.large .icon { - margin-top: 1px; -} -.btn.small { - padding: 5px 9px 5px; - font-size: 11px; - line-height: 16px; -} -.btn.small .icon { - margin-top: -2px; -} -button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { - padding: 0; - border: 0; -} -.btn-group { - position: relative; - *zoom: 1; -} -.btn-group:before, .btn-group:after { - display: table; - content: ""; -} -.btn-group:after { - clear: both; -} -.btn-group + .btn-group { - margin-left: 5px; -} -.btn-toolbar .btn-group { - display: inline-block; -} -.btn-group .btn { - position: relative; - float: left; - margin-left: -1px; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.btn-group .btn:first-child { - margin-left: 0; - -webkit-border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; - border-top-left-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - border-bottom-left-radius: 4px; -} -.btn-group .btn:last-child, .btn-group .dropdown-toggle { - -webkit-border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; - border-bottom-right-radius: 4px; -} -.btn-group .btn.large:first-child { - margin-left: 0; - -webkit-border-top-left-radius: 6px; - -moz-border-radius-topleft: 6px; - border-top-left-radius: 6px; - -webkit-border-bottom-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - border-bottom-left-radius: 6px; -} -.btn-group .btn.large:last-child, .btn-group .large.dropdown-toggle { - -webkit-border-top-right-radius: 6px; - -moz-border-radius-topright: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - -moz-border-radius-bottomright: 6px; - border-bottom-right-radius: 6px; -} -.btn-group .btn:hover, .btn-group .btn:focus, .btn-group .btn:active { - z-index: 2; -} -.btn-group .dropdown-toggle { - padding-left: 8px; - padding-right: 8px; - -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -} -.btn-group.open .dropdown-menu { - display: block; - margin-top: 1px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} -.btn-group.open .dropdown-toggle { - background-image: none; - -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} -.btn .caret { - margin-top: 6px; - margin-left: 0; -} -.primary .caret, -.danger .caret, -.info .caret, -.success .caret { - border-top-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); -} -.btn.small .caret { - margin-top: 4px; -} -.alert { - padding: 8px 35px 8px 14px; - margin-bottom: 18px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - background-color: #fcf8e3; - border: 1px solid #f3edd2; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.alert, .alert-heading { - color: #c09853; -} -.alert .close { - position: relative; - right: -21px; - line-height: 18px; -} -.alert-success { - background-color: #dff0d8; - border-color: #cfe8c4; -} -.alert-success, .alert-success .alert-heading { - color: #468847; -} -.alert-danger, .alert-error { - background-color: #f2dede; - border-color: #e9c7c7; -} -.alert-danger, -.alert-error, -.alert-danger .alert-heading, -.alert-error .alert-heading { - color: #b94a48; -} -.alert-info { - background-color: #d9edf7; - border-color: #bfe1f2; -} -.alert-info, .alert-info .alert-heading { - color: #3a87ad; -} -.alert-block { - padding-top: 14px; - padding-bottom: 14px; -} -.alert-block > p, .alert-block > ul { - margin-bottom: 0; -} -.alert-block p + p { - margin-top: 5px; -} -.thumbnails { - margin-left: -20px; - list-style: none; - *zoom: 1; -} -.thumbnails:before, .thumbnails:after { - display: table; - content: ""; -} -.thumbnails:after { - clear: both; -} -.thumbnails > li { - float: left; - margin: 0 0 18px 20px; -} -.thumbnail { - display: block; - padding: 4px; - line-height: 1; - 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); -} -a.thumbnail:hover { - border-color: #0088cc; - -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -} -.thumbnail > img { - display: block; - max-width: 100%; -} -.thumbnail .caption { - padding: 9px; -} -.label { - padding: 1px 3px 2px; - font-size: 9.75px; - font-weight: bold; - color: #ffffff; - text-transform: uppercase; - background-color: #999999; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -.label.important { - background-color: #b94a48; -} -.label.warning { - background-color: #f89406; -} -.label.success { - background-color: #468847; -} -.label.info { - background-color: #3a87ad; -} -@-webkit-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} -@keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} -.progress, .progress .bar { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.progress { - height: 18px; - margin-bottom: 18px; - background-color: #f7f7f7; - background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(top, #f5f5f5, #f9f9f9); - background-repeat: repeat-x; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -} -.progress .bar { - width: 0%; - height: 18px; - color: #ffffff; - font-size: 12px; - text-align: center; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e90d2; - background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -ms-linear-gradient(top, #149bdf, #0480be); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); - background-image: -webkit-linear-gradient(top, #149bdf, #0480be); - background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(top, #149bdf, #0480be); - background-repeat: repeat-x; - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - -webkit-transition: width 0.6s ease; - -moz-transition: width 0.6s ease; - -ms-transition: width 0.6s ease; - -o-transition: width 0.6s ease; - transition: width 0.6s ease; -} -.progress.striped .bar { - background-color: #62c462; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - -webkit-background-size: 40px 40px; - -moz-background-size: 40px 40px; - -o-background-size: 40px 40px; - background-size: 40px 40px; -} -.progress.active .bar { - -webkit-animation: progress-bar-stripes 2s linear infinite; - -moz-animation: progress-bar-stripes 2s linear infinite; - animation: progress-bar-stripes 2s linear infinite; -} -.progress.danger .bar { - background-color: #dd514c; - background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(top, #ee5f5b, #c43c35); - background-repeat: repeat-x; -} -.progress.danger.striped .bar { - background-color: #ee5f5b; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} -.progress.success .bar { - background-color: #5eb95e; - background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); - background-image: -webkit-linear-gradient(top, #62c462, #57a957); - background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); - background-repeat: repeat-x; -} -.progress.success.striped .bar { - background-color: #62c462; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} -.progress.info .bar { - background-color: #4bb1cf; - background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); - background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); - background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(top, #5bc0de, #339bb9); - background-repeat: repeat-x; -} -.progress.info.striped .bar { - background-color: #5bc0de; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} -.accordion { - margin-bottom: 18px; -} -.accordion-group { - background-color: #f5f5f5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.accordion-heading { - border-bottom: 0; -} -.accordion-heading .accordion-toggle { - display: block; - padding: 8px 15px; -} -.accordion-body { - margin-bottom: 2px; -} -.accordion-inner { - padding: 9px 15px; - border-top: 1px solid #e5e5e5; -} -.carousel { - position: relative; - line-height: 1; -} -.carousel-inner { - overflow: hidden; - width: 100%; - position: relative; -} -.carousel .item { - display: none; - position: relative; - -webkit-transition: 0.6s ease-in-out left; - -moz-transition: 0.6s ease-in-out left; - -ms-transition: 0.6s ease-in-out left; - -o-transition: 0.6s ease-in-out left; - transition: 0.6s ease-in-out left; -} -.carousel .item > img { - display: block; - line-height: 1; -} -.carousel .active, .carousel .next, .carousel .prev { - display: block; -} -.carousel .active { - left: 0; -} -.carousel .next, .carousel .prev { - position: absolute; - top: 0; - width: 100%; -} -.carousel .next { - left: 100%; -} -.carousel .prev { - left: -100%; -} -.carousel .next.left, .carousel .prev.right { - left: 0; -} -.carousel .active.left { - left: -100%; -} -.carousel .active.right { - left: 100%; -} -.carousel-control { - position: absolute; - top: 40%; - left: 15px; - width: 40px; - height: 40px; - margin-top: -20px; - font-size: 60px; - font-weight: 100; - line-height: 30px; - color: #ffffff; - text-align: center; - background: #222222; - border: 3px solid #ffffff; - -webkit-border-radius: 23px; - -moz-border-radius: 23px; - border-radius: 23px; - opacity: 0.5; - filter: alpha(opacity=50); - -webkit-transition: all 0.2s linear; - -moz-transition: all 0.2s linear; - -ms-transition: all 0.2s linear; - -o-transition: all 0.2s linear; - transition: all 0.2s linear; -} -.carousel-control.right { - left: auto; - right: 15px; -} -.carousel-control:hover { - color: #ffffff; - text-decoration: none; - opacity: 0.9; - filter: alpha(opacity=90); -} -.carousel-caption { - position: absolute; - left: 0; - right: 0; - bottom: 0; - padding: 10px 15px 5px; - background: #333333; - background: rgba(0, 0, 0, 0.75); -} -.carousel-caption h4, .carousel-caption p { - color: #ffffff; -} -.hero-unit { - padding: 60px; - margin-bottom: 30px; - background-color: #f5f5f5; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} -.hero-unit h1 { - margin-bottom: 0; - font-size: 60px; - line-height: 1; - letter-spacing: -1px; -} -.hero-unit p { - font-size: 18px; - font-weight: 200; - line-height: 27px; -} -.pull-right { - float: right; -} -.pull-left { - float: left; -} -.hide { - display: none; -} -.show { - display: block; -} -.invisible { - visibility: hidden; -} -- cgit v1.2.3