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 --- docs/assets/css/docs.css | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index fb727a900..a17fd5692 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -310,8 +310,16 @@ img.large-bird { opacity: .1; } + /* Pretty Print -------------------------------------------------- */ pre.prettyprint { overflow: hidden; -} \ No newline at end of file +} + + +/* Wells +-------------------------------------------------- */ +.well form { + margin-bottom: 0; +} -- 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 --- docs/assets/css/docs.css | 71 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 48 insertions(+), 23 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index a17fd5692..52714d199 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -8,8 +8,9 @@ /* Body and structure -------------------------------------------------- */ body { - background-color: #fff; position: relative; + padding-top: 40px; + background-color: #fff; } section { padding-top: 60px; @@ -21,22 +22,29 @@ section > .row { /* Jumbotrons -------------------------------------------------- */ +.jumbotron, +.jumbotron .inner { + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; +} .jumbotron { - min-width: 940px; - padding-top: 40px; + margin-bottom: 40px; + -webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), 0 1px 3px rgba(0,0,0,.25); + -moz-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), 0 1px 3px rgba(0,0,0,.25); + box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), 0 1px 3px rgba(0,0,0,.25); } .jumbotron .inner { background: transparent url(../img/grid-18px.png) top center; - padding: 45px 0; - -webkit-box-shadow: inset 0 10px 30px rgba(0,0,0,.3); - -moz-box-shadow: inset 0 10px 30px rgba(0,0,0,.3); -/* box-shadow: inset 0 10px 30px rgba(0,0,0,.3); -*/} + padding: 36px 60px; + -webkit-box-shadow: inset 0 -15px 30px rgba(0,0,0,.1); + -moz-box-shadow: inset 0 -15px 30px rgba(0,0,0,.1); + box-shadow: inset 0 -15px 30px rgba(0,0,0,.1); +} .jumbotron h1, .jumbotron p { margin-bottom: 9px; color: #fff; - text-align: center; text-shadow: 0 1px 1px rgba(0,0,0,.3); } .jumbotron h1 { @@ -46,6 +54,7 @@ section > .row { } .jumbotron p { font-weight: 300; + margin-right: 25%; } .jumbotron .lead { font-size: 20px; @@ -60,14 +69,14 @@ section > .row { ------------------------- */ /* main docs page */ .masthead { - background-color: #049cd9; + background-color: #004d9f; background-repeat: no-repeat; - background-image: -webkit-gradient(linear, left top, left bottom, from(#004D9F), to(#049cd9)); - background-image: -webkit-linear-gradient(#004D9F, #049cd9); - background-image: -moz-linear-gradient(#004D9F, #049cd9); - background-image: -o-linear-gradient(top, #004D9F, #049cd9); - background-image: -khtml-gradient(linear, left top, left bottom, from(#004D9F), to(#049cd9)); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#004D9F', endColorstr='#049cd9', GradientType=0); /* IE8 and down */ + background-image: -webkit-gradient(linear, left top, left bottom, from(#048ccd), to(#004d9f)); + background-image: -webkit-linear-gradient(#048ccd, #004d9f); + background-image: -moz-linear-gradient(#048ccd, #004d9f); + background-image: -o-linear-gradient(top, #048ccd, #004d9f); + background-image: -khtml-gradient(linear, left top, left bottom, from(#048ccd), to(#004d9f)); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#048ccd', endColorstr='#004d9f', GradientType=0); /* IE8 and down */ } /* supporting docs pages */ .subhead { @@ -98,15 +107,9 @@ section > .row { /* Footer -------------------------------------------------- */ .footer { - background-color: #eee; - min-width: 940px; padding: 30px 0; - text-shadow: 0 1px 0 #fff; border-top: 1px solid #e5e5e5; - -webkit-box-shadow: inset 0 5px 15px rgba(0,0,0,.025); - -moz-box-shadow: inset 0 5px 15px rgba(0,0,0,.025); -/* box-shadow: inset 0 5px 15px rgba(0,0,0,.025); -*/} +} .footer p { color: #555; } @@ -323,3 +326,25 @@ pre.prettyprint { .well form { margin-bottom: 0; } + + +/* Responsive Docs +-------------------------------------------------- */ + +/* Tablet to Medium Desktop +------------------------- */ + +@media (min-width: 768px) and (max-width: 900px) { + + .footer, + .jumbotron { + min-width: 748px; + } + .jumbotron .inner h1, + .jumbotron .inner p { + margin-left: 40px; + margin-right: 40px; + } + +} + -- 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 --- docs/assets/css/docs.css | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 52714d199..fb7482edc 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -231,7 +231,7 @@ section > .row { .mini-layout .mini-layout-body { background-color: #dceaf4; margin: 0 auto; - width: 240px; + width: 70%; height: 240px; } .mini-layout.fluid .mini-layout-sidebar, @@ -241,11 +241,11 @@ section > .row { } .mini-layout.fluid .mini-layout-sidebar { background-color: #bbd8e9; - width: 90px; + width: 20%; height: 240px; } .mini-layout.fluid .mini-layout-body { - width: 300px; + width: 60%; margin-left: 10px; } @@ -328,23 +328,22 @@ pre.prettyprint { } +.browser-support { + max-width: 100%; +} + /* Responsive Docs -------------------------------------------------- */ - -/* Tablet to Medium Desktop -------------------------- */ +@media (max-width: 480px) { + .large-bird { + display: none; + } +} @media (min-width: 768px) and (max-width: 900px) { - .footer, .jumbotron { min-width: 748px; } - .jumbotron .inner h1, - .jumbotron .inner p { - margin-left: 40px; - margin-right: 40px; - } - } -- 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 --- docs/assets/css/docs.css | 99 +++++++++++++++++++++++++++++------------------- 1 file changed, 61 insertions(+), 38 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index fb7482edc..01b6f3cd7 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -9,7 +9,7 @@ -------------------------------------------------- */ body { position: relative; - padding-top: 40px; + padding-top: 100px; background-color: #fff; } section { @@ -19,65 +19,88 @@ section > .row { margin-bottom: 10px; } +/* Tweak topbar brand link to be super sleek +-------------------------------------------------- */ +.navbar .brand { + float: right; + font-weight: bold; + color: #000; + text-shadow: 0 1px 0 rgba(255,255,255,.1); +} +.navbar .brand:hover { + text-decoration: none; +} /* Jumbotrons -------------------------------------------------- */ -.jumbotron, -.jumbotron .inner { - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; -} .jumbotron { - margin-bottom: 40px; - -webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), 0 1px 3px rgba(0,0,0,.25); - -moz-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), 0 1px 3px rgba(0,0,0,.25); - box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), 0 1px 3px rgba(0,0,0,.25); -} -.jumbotron .inner { - background: transparent url(../img/grid-18px.png) top center; - padding: 36px 60px; - -webkit-box-shadow: inset 0 -15px 30px rgba(0,0,0,.1); - -moz-box-shadow: inset 0 -15px 30px rgba(0,0,0,.1); - box-shadow: inset 0 -15px 30px rgba(0,0,0,.1); + position: relative; + padding-bottom: 58px; + margin-bottom: 50px; + border-bottom: 2px solid #eee; } .jumbotron h1, .jumbotron p { - margin-bottom: 9px; - color: #fff; - text-shadow: 0 1px 1px rgba(0,0,0,.3); + margin-bottom: 10px; + text-shadow: 0 1px 0 #fff; } .jumbotron h1 { - font-size: 54px; + font-size: 90px; line-height: 1; - text-shadow: 0 1px 2px rgba(0,0,0,.5); + margin-right: 40%; + letter-spacing: -1px; } .jumbotron p { font-weight: 300; - margin-right: 25%; + margin-right: 32%; } .jumbotron .lead { - font-size: 20px; - line-height: 27px; + margin-bottom: 20px; + font-size: 25px; + line-height: 35px; } .jumbotron p a { - color: #fff; font-weight: bold; } +.jumbotron .btn { + font-size: 20px; + padding: 12px 24px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.benefits { + width: 250px; + position: absolute; + right: 0; + bottom: 60px; +} +.benefits ul { + list-style: none; + margin: 0; +} +.benefits li { + font-size: 16px; + font-weight: 300; + line-height: 40px; + color: #555; +} +.benefits li + li { + border-top: 1px solid #f5f5f5; +} +.benefits h4 { + color: #555; +} +.benefits span { + position: relative; + top: -2px; + padding-right: 5px; + color: #999; +} + /* Specific jumbotrons ------------------------- */ -/* main docs page */ -.masthead { - background-color: #004d9f; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, left top, left bottom, from(#048ccd), to(#004d9f)); - background-image: -webkit-linear-gradient(#048ccd, #004d9f); - background-image: -moz-linear-gradient(#048ccd, #004d9f); - background-image: -o-linear-gradient(top, #048ccd, #004d9f); - background-image: -khtml-gradient(linear, left top, left bottom, from(#048ccd), to(#004d9f)); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#048ccd', endColorstr='#004d9f', GradientType=0); /* IE8 and down */ -} /* supporting docs pages */ .subhead { background-color: #767d80; -- cgit v1.2.3 From 1888511d676ced8f30743cc5b540f02257314bde Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2011 18:45:11 -0700 Subject: updated docs to include quick links and twitter buttons, added updated blueprint pattern to background --- docs/assets/css/docs.css | 51 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 11 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 01b6f3cd7..ee0b9c8a3 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -9,8 +9,10 @@ -------------------------------------------------- */ body { position: relative; - padding-top: 100px; + padding-top: 90px; background-color: #fff; + background-image: url(../img/grid-18px-masked.png); + background-repeat: repeat-x; } section { padding-top: 60px; @@ -35,9 +37,6 @@ section > .row { -------------------------------------------------- */ .jumbotron { position: relative; - padding-bottom: 58px; - margin-bottom: 50px; - border-bottom: 2px solid #eee; } .jumbotron h1, .jumbotron p { @@ -57,23 +56,22 @@ section > .row { .jumbotron .lead { margin-bottom: 20px; font-size: 25px; - line-height: 35px; -} -.jumbotron p a { - font-weight: bold; + line-height: 36px; } .jumbotron .btn { font-size: 20px; - padding: 12px 24px; + padding: 14px 24px; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; } + +/* Benefits list in masthead */ .benefits { width: 250px; position: absolute; right: 0; - bottom: 60px; + bottom: 0; } .benefits ul { list-style: none; @@ -82,7 +80,7 @@ section > .row { .benefits li { font-size: 16px; font-weight: 300; - line-height: 40px; + line-height: 35px; color: #555; } .benefits li + li { @@ -127,6 +125,37 @@ section > .row { } +/* Quick links +-------------------------------------------------- */ +.quick-links { + padding: 5px 20px; + margin: 60px 0; + list-style: none; + text-align: center; + background-color: #eee; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.quick-links li { + display: inline; + margin: 0 5px; + line-height: 30px; +} +.quick-links .divider { + color: #999; +} +.quick-links strong { + font-weight: normal; + color: #999; +} +.quick-links .tweet-btn, +.quick-links .follow-btn { + position: relative; + top: 5px; +} + + /* Footer -------------------------------------------------- */ .footer { -- 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 --- docs/assets/css/docs.css | 109 ++++++++++++++--------------------------------- 1 file changed, 32 insertions(+), 77 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index ee0b9c8a3..7d36946db 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -37,34 +37,34 @@ section > .row { -------------------------------------------------- */ .jumbotron { position: relative; -} -.jumbotron h1, -.jumbotron p { - margin-bottom: 10px; text-shadow: 0 1px 0 #fff; } .jumbotron h1 { - font-size: 90px; - line-height: 1; margin-right: 40%; + margin-bottom: 10px; + font-size: 90px; letter-spacing: -1px; + line-height: 1; } .jumbotron p { - font-weight: 300; margin-right: 32%; -} -.jumbotron .lead { margin-bottom: 20px; font-size: 25px; + font-weight: 300; line-height: 36px; } .jumbotron .btn { font-size: 20px; padding: 14px 24px; + margin-right: 5px; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; } +.jumbotron .download-info { + font-size: 16px; + color: #999; +} /* Benefits list in masthead */ .benefits { @@ -133,9 +133,9 @@ section > .row { list-style: none; text-align: center; background-color: #eee; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .quick-links li { display: inline; @@ -167,71 +167,6 @@ section > .row { } -/* Quickstart section for getting le code --------------------------------------------------- */ -.quickstart { - background-color: #f5f5f5; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#f9f9f9), to(#f5f5f5)); - background-image: -moz-linear-gradient(#f9f9f9, #f5f5f5); - background-image: -ms-linear-gradient(#f9f9f9, #f5f5f5); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f9f9f9), color-stop(100%, #f5f5f5)); - background-image: -webkit-linear-gradient(#f9f9f9, #f5f5f5); - background-image: -o-linear-gradient(#f9f9f9, #f5f5f5); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0)"; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0); - background-image: linear-gradient(#f9f9f9, #f5f5f5); - border-top: 1px solid #fff; - border-bottom: 1px solid #eee; -} -.quickstart .container { - margin-bottom: 0; -} -.quickstart .row { - margin: 0 -20px; - -webkit-box-shadow: 1px 0 0 #f9f9f9; - -moz-box-shadow: 1px 0 0 #f9f9f9; - box-shadow: 1px 0 0 #f9f9f9; -} -.quickstart [class*="span"] { - width: 285px; - height: 117px; - margin-left: 0; - padding: 17px 20px 26px; - border-left: 1px solid #eee; - -webkit-box-shadow: inset 1px 0 0 #f9f9f9; - -moz-box-shadow: inset 1px 0 0 #f9f9f9; - box-shadow: inset 1px 0 0 #f9f9f9; -} -.quickstart [class*="span"]:last-child { - border-right: 1px solid #eee; - width: 286px; -} -.quickstart h6, -.quickstart p { - line-height: 18px; - text-align: center; - margin-bottom: 9px; - color: #333; -} -.quickstart .current-version, -.quickstart .current-version a { - color: #999; -} -.quickstart h6 { - color: #999; -} -.quickstart textarea { - display: block; - width: 275px; - height: auto; - margin: 0 0 9px; - line-height: 21px; - white-space: nowrap; - overflow: hidden; -} - - /* Special grid styles -------------------------------------------------- */ .show-grid { @@ -387,9 +322,29 @@ pre.prettyprint { /* Responsive Docs -------------------------------------------------- */ @media (max-width: 480px) { + + body > .navbar-fixed .nav { + display: none; + } + .large-bird { display: none; } + + .jumbotron h1 { + font-size: 36px; + margin-right: 0; + } + .jumbotron p { + margin-right: 0; + font-size: 18px; + line-height: 24px; + } + .jumbotron .benefits { + position: relative; + width: auto; + margin: 36px 0; + } } @media (min-width: 768px) and (max-width: 900px) { -- 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) --- docs/assets/css/docs.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 7d36946db..300eb38f5 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -17,19 +17,16 @@ body { section { padding-top: 60px; } -section > .row { - margin-bottom: 10px; -} /* Tweak topbar brand link to be super sleek -------------------------------------------------- */ -.navbar .brand { +body > .navbar-fixed .brand { float: right; font-weight: bold; color: #000; text-shadow: 0 1px 0 rgba(255,255,255,.1); } -.navbar .brand:hover { +body > .navbar-fixed .brand:hover { text-decoration: none; } @@ -136,6 +133,9 @@ section > .row { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + -webkit-box-shadow: inset 0 1px 0 rgba(0,0,0,.03); + -moz-box-shadow: inset 0 1px 0 rgba(0,0,0,.03); + box-shadow: inset 0 1px 0 rgba(0,0,0,.03); } .quick-links li { display: inline; @@ -171,10 +171,10 @@ section > .row { -------------------------------------------------- */ .show-grid { margin-top: 10px; - margin-bottom: 10px; + margin-bottom: 20px; } .show-grid [class*="span"] { - background: #eee; + background-color: #eee; text-align: center; -webkit-border-radius: 3px; -moz-border-radius: 3px; -- 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 --- docs/assets/css/docs.css | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 300eb38f5..2af7764e6 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -98,28 +98,16 @@ body > .navbar-fixed .brand:hover { ------------------------- */ /* supporting docs pages */ .subhead { - background-color: #767d80; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, left top, left bottom, from(#565d60), to(#767d80)); - background-image: -webkit-linear-gradient(#565d60, #767d80); - background-image: -moz-linear-gradient(#565d60, #767d80); - background-image: -o-linear-gradient(top, #565d60, #767d80); - background-image: -khtml-gradient(linear, left top, left bottom, from(#565d60), to(#767d80)); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#565d60', endColorstr='#767d80', GradientType=0); /* IE8 and down */ -} -.subhead .inner { - padding: 36px 0 27px; + padding-bottom: 18px; + border-bottom: 3px solid #eee; } .subhead h1, .subhead p { - text-align: left; + margin-right: 0; } .subhead h1 { font-size: 40px; } -.subhead p a { - font-weight: normal; -} /* Quick links -- 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 --- docs/assets/css/docs.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 2af7764e6..bbf71ab77 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -307,6 +307,11 @@ pre.prettyprint { max-width: 100%; } +/* Make tables spaced out a bit more */ +h2 + table { + margin-top: 10px; +} + /* Responsive Docs -------------------------------------------------- */ @media (max-width: 480px) { -- 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 --- docs/assets/css/docs.css | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index bbf71ab77..2d0b87fe2 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -309,7 +309,7 @@ pre.prettyprint { /* Make tables spaced out a bit more */ h2 + table { - margin-top: 10px; + margin-top: 5px; } /* Responsive Docs @@ -347,3 +347,18 @@ h2 + table { } } + + +.supported-devices { + margin-bottom: 9px; + color: #777; +} +.supported-devices strong { + display: block; + font-size: 14px; + line-height: 18px; +} +.supported-devices small { + font-size: 12px; +} + -- cgit v1.2.3 From a5d2450e88693de5e96d9a9f3f4e82853723f764 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 18 Oct 2011 08:11:18 -0700 Subject: refinement to the responsive section --- docs/assets/css/docs.css | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 2d0b87fe2..c1c43b1d8 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -346,19 +346,3 @@ h2 + table { min-width: 748px; } } - - - -.supported-devices { - margin-bottom: 9px; - color: #777; -} -.supported-devices strong { - display: block; - font-size: 14px; - line-height: 18px; -} -.supported-devices small { - font-size: 12px; -} - -- 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 --- docs/assets/css/docs.css | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index c1c43b1d8..b618c44b8 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -340,9 +340,17 @@ h2 + table { } } -@media (min-width: 768px) and (max-width: 900px) { - .footer, - .jumbotron { - min-width: 748px; +@media (min-width: 768px) and (max-width: 940px) { + + /* Scale down the jumbotron content */ + .jumbotron h1 { + font-size: 72px; + } + + /* Provide enough space on right-hand side for benefits list */ + .jumbotron h1, + .jumbotron p { + margin-right: 40%; } } + -- 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 --- docs/assets/css/docs.css | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b618c44b8..0a31ac998 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -21,6 +21,8 @@ section { /* Tweak topbar brand link to be super sleek -------------------------------------------------- */ body > .navbar-fixed .brand { + padding-right: 0; + padding-left: 0; float: right; font-weight: bold; color: #000; @@ -316,16 +318,24 @@ h2 + table { -------------------------------------------------- */ @media (max-width: 480px) { + /* Hide the nav for now */ body > .navbar-fixed .nav { display: none; } - .large-bird { - display: none; + /* Change up some type stuff */ + h1 small { + display: block; + line-height: 20px; } + /* Adjust the jumbotron */ + .jumbotron h1, + .jumbotron p { + margin-right: 0; + } .jumbotron h1 { - font-size: 36px; + font-size: 45px; margin-right: 0; } .jumbotron p { @@ -338,6 +348,20 @@ h2 + table { width: auto; margin: 36px 0; } + .jumbotron .btn { + font-size: 18px; + padding: 10px 14px; + } + + /* Popovers */ + .large-bird { + display: none; + } + .popover-well .popover-wrapper { + margin-left: 0; + } + + } @media (min-width: 768px) and (max-width: 940px) { -- 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 --- docs/assets/css/docs.css | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 0a31ac998..59c64e4a7 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -328,10 +328,18 @@ h2 + table { display: block; line-height: 20px; } + /* More space between sections */ + h2 { + margin-top: 27px; + } + h3 { + margin-top: 18px; + } /* Adjust the jumbotron */ .jumbotron h1, .jumbotron p { + text-align: center; margin-right: 0; } .jumbotron h1 { @@ -349,8 +357,15 @@ h2 + table { margin: 36px 0; } .jumbotron .btn { + display: block; font-size: 18px; padding: 10px 14px; + margin: 0 auto 10px; + } + + /* Don't space out quick links so much */ + .quick-links { + margin: 40px 0 0; } /* Popovers */ @@ -361,6 +376,15 @@ h2 + table { margin-left: 0; } + /* Space out the show-grid examples */ + .show-grid [class*="span"] { + margin-bottom: 5px; + } + + /* Unfloat the back to top link in footer */ + .footer .pull-right { + float: none; + } } -- cgit v1.2.3 From 648c4689273647c321dd6e3979d910282e9a9339 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 26 Oct 2011 23:11:56 -0700 Subject: breaking down the main page into subpages for easier, more comprehensive documentation --- docs/assets/css/docs.css | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 59c64e4a7..8ed81e713 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -14,9 +14,6 @@ body { background-image: url(../img/grid-18px-masked.png); background-repeat: repeat-x; } -section { - padding-top: 60px; -} /* Tweak topbar brand link to be super sleek -------------------------------------------------- */ @@ -40,7 +37,7 @@ body > .navbar-fixed .brand:hover { } .jumbotron h1 { margin-right: 40%; - margin-bottom: 10px; + margin-bottom: 9px; font-size: 90px; letter-spacing: -1px; line-height: 1; @@ -100,15 +97,15 @@ body > .navbar-fixed .brand:hover { ------------------------- */ /* supporting docs pages */ .subhead { - padding-bottom: 18px; - border-bottom: 3px solid #eee; + padding-bottom: 14px; + border-bottom: 3px solid #e5e5e5; } .subhead h1, .subhead p { margin-right: 0; } .subhead h1 { - font-size: 40px; + font-size: 45px; } -- cgit v1.2.3 From b4c894961c0b75361ead496f1686eb3cf41c5c97 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 26 Oct 2011 23:24:22 -0700 Subject: address issue #414 and fix up a number of docs loose ends --- docs/assets/css/docs.css | 58 ++++++++++-------------------------------------- 1 file changed, 12 insertions(+), 46 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 8ed81e713..3a4dcff1c 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -15,7 +15,7 @@ body { background-repeat: repeat-x; } -/* Tweak topbar brand link to be super sleek +/* Tweak navbar brand link to be super sleek -------------------------------------------------- */ body > .navbar-fixed .brand { padding-right: 0; @@ -29,6 +29,12 @@ body > .navbar-fixed .brand:hover { text-decoration: none; } +/* Space out sub-sections more +-------------------------------------------------- */ +.page-header { + margin-top: 36px; +} + /* Jumbotrons -------------------------------------------------- */ .jumbotron { @@ -92,12 +98,12 @@ body > .navbar-fixed .brand:hover { color: #999; } - /* Specific jumbotrons ------------------------- */ /* supporting docs pages */ .subhead { padding-bottom: 14px; + margin-bottom: 45px; border-bottom: 3px solid #e5e5e5; } .subhead h1, @@ -224,46 +230,6 @@ body > .navbar-fixed .brand:hover { } -/* Topbar special styles --------------------------------------------------- */ -.topbar-wrapper { - position: relative; - height: 40px; - margin: 5px 0 15px; -} -.topbar-wrapper .topbar { - position: absolute; - margin: 0 -20px; -} -.topbar-wrapper .topbar .topbar-inner { - padding-left: 20px; - padding-right: 20px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -/* Topbar in js docs -------------------------- */ -#bootstrap-js .topbar-wrapper { - z-index: 1; -} -#bootstrap-js .topbar-wrapper .topbar { - position: absolute; - margin: 0 -20px; -} -#bootstrap-js .topbar-wrapper .topbar .topbar-inner { - padding-left: 20px; - padding-right: 20px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -#bootstrap-js .topbar-wrapper .container { - width: auto; -} - - /* Popover docs -------------------------------------------------- */ .popover-well { @@ -288,15 +254,13 @@ img.large-bird { } -/* Pretty Print +/* Misc -------------------------------------------------- */ + pre.prettyprint { overflow: hidden; } - -/* Wells --------------------------------------------------- */ .well form { margin-bottom: 0; } @@ -311,6 +275,7 @@ h2 + table { margin-top: 5px; } + /* Responsive Docs -------------------------------------------------- */ @media (max-width: 480px) { @@ -385,6 +350,7 @@ h2 + table { } + @media (min-width: 768px) and (max-width: 940px) { /* Scale down the jumbotron content */ -- cgit v1.2.3 From 20b9390a9e3a94dae86af388821aa8f458ba057f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Oct 2011 09:35:58 -0700 Subject: update docs for responsive --- docs/assets/css/docs.css | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 3a4dcff1c..7238badb3 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -351,6 +351,21 @@ h2 + table { } +@media (min-width: 480px) and (max-width: 768px) { + + /* Scale down the jumbotron content */ + .jumbotron h1 { + font-size: 54px; + } + + .jumbotron h1, + .jumbotron p { + margin-right: 40%; + } + +} + + @media (min-width: 768px) and (max-width: 940px) { /* Scale down the jumbotron content */ -- 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 --- docs/assets/css/docs.css | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 7238badb3..66e87fdf9 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -5,6 +5,7 @@ Special styles for presenting Bootstrap's documentation and examples */ + /* Body and structure -------------------------------------------------- */ body { @@ -15,6 +16,7 @@ body { background-repeat: repeat-x; } + /* Tweak navbar brand link to be super sleek -------------------------------------------------- */ body > .navbar-fixed .brand { @@ -29,12 +31,14 @@ body > .navbar-fixed .brand:hover { text-decoration: none; } + /* Space out sub-sections more -------------------------------------------------- */ .page-header { margin-top: 36px; } + /* Jumbotrons -------------------------------------------------- */ .jumbotron { @@ -119,7 +123,7 @@ body > .navbar-fixed .brand:hover { -------------------------------------------------- */ .quick-links { padding: 5px 20px; - margin: 60px 0; + margin: 45px 0; list-style: none; text-align: center; background-color: #eee; @@ -149,13 +153,40 @@ body > .navbar-fixed .brand:hover { } +/* Marketing section of Overview +-------------------------------------------------- */ +.marketing .row { + margin-bottom: 18px; +} +.marketing h1 { + margin-bottom: 18px; +} +.marketing h2, +.marketing h3 { + font-weight: 300; + color: #000; +} +.marketing h2 { + margin-bottom: 9px; +} +.marketing p { + margin-right: 10px; +} +.marketing img { + float: left; + margin: 7px 10px 0 0; +} + + /* Footer -------------------------------------------------- */ .footer { - padding: 30px 0; + margin-top: 45px; + padding: 35px 0 36px; border-top: 1px solid #e5e5e5; } .footer p { + margin-bottom: 0; color: #555; } -- cgit v1.2.3 From 9fd4e459fe829454c811118c64aa32eafd6e8b97 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Oct 2011 23:34:48 -0700 Subject: adding more icons for the homepage for open source, twitter, and html5/css3 --- docs/assets/css/docs.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 66e87fdf9..79c904774 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -172,10 +172,14 @@ body > .navbar-fixed .brand:hover { .marketing p { margin-right: 10px; } -.marketing img { +.marketing .icon { float: left; margin: 7px 10px 0 0; } +.marketing .small-icon { + float: left; + margin: 4px 5px 0 0; +} /* Footer -- cgit v1.2.3 From 0218d079ad83ce5f8fd08e9f68b6f661855a27a9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 29 Oct 2011 18:11:17 -0700 Subject: fix some of the docs styles at 480 to 768 --- docs/assets/css/docs.css | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 79c904774..52738d808 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -348,11 +348,6 @@ h2 + table { font-size: 18px; line-height: 24px; } - .jumbotron .benefits { - position: relative; - width: auto; - margin: 36px 0; - } .jumbotron .btn { display: block; font-size: 18px; @@ -365,6 +360,23 @@ h2 + table { margin: 40px 0 0; } +} + + +@media (max-width: 768px) { + + /* Hide the nav for now */ + body > .navbar-fixed .nav { + display: none; + } + + /* Adjust the jumbotron */ + .jumbotron .benefits { + position: relative; + width: auto; + margin: 36px 0; + } + /* Popovers */ .large-bird { display: none; @@ -395,7 +407,7 @@ h2 + table { .jumbotron h1, .jumbotron p { - margin-right: 40%; + margin-right: 0; } } -- 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 --- docs/assets/css/docs.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 52738d808..185f381e9 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -164,7 +164,6 @@ body > .navbar-fixed .brand:hover { .marketing h2, .marketing h3 { font-weight: 300; - color: #000; } .marketing h2 { margin-bottom: 9px; @@ -175,6 +174,7 @@ body > .navbar-fixed .brand:hover { .marketing .icon { float: left; margin: 7px 10px 0 0; + opacity: .8; } .marketing .small-icon { float: left; @@ -300,7 +300,6 @@ pre.prettyprint { margin-bottom: 0; } - .browser-support { max-width: 100%; } -- cgit v1.2.3 From 2534fee7538526e2b4e263258fe62953cf08f159 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 1 Nov 2011 13:56:00 -0700 Subject: adding unofficial github buttons --- docs/assets/css/docs.css | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 185f381e9..2dde6a452 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -39,6 +39,44 @@ body > .navbar-fixed .brand:hover { } +/* Github buttons +-------------------------------------------------- */ +.github-btn + .github-btn { + margin-left: 10px; +} +.github-btn { + display: inline-block; + height: 20px; + overflow: hidden; +} +.github-btn .btn, +.github-btn .count { + float: left; + padding: 1px 5px 1px 4px; + font-size: 11px; + font-weight: normal; + line-height: 16px; + color: #555; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +.github-btn .btn { + box-shadow: none; +} +.github-btn .github-ico { + float: left; + margin-right: 4px; + opacity: .75; +} +.github-btn .count { + display: inline-block; + margin-left: 2px; + background-color: #fff; + border: 1px solid #ddd; +} + + /* Jumbotrons -------------------------------------------------- */ .jumbotron { @@ -59,7 +97,7 @@ body > .navbar-fixed .brand:hover { font-weight: 300; line-height: 36px; } -.jumbotron .btn { +.jumbotron .btn-large { font-size: 20px; padding: 14px 24px; margin-right: 5px; @@ -146,6 +184,7 @@ body > .navbar-fixed .brand:hover { font-weight: normal; color: #999; } +.quick-links .github-btn, .quick-links .tweet-btn, .quick-links .follow-btn { position: relative; -- 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 --- docs/assets/css/docs.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 2dde6a452..b503c23e4 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -54,9 +54,10 @@ body > .navbar-fixed .brand:hover { float: left; padding: 1px 5px 1px 4px; font-size: 11px; - font-weight: normal; + font-weight: bold; line-height: 16px; - color: #555; + color: #666; + text-shadow: 0 1px 0 #fff; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; @@ -67,7 +68,7 @@ body > .navbar-fixed .brand:hover { .github-btn .github-ico { float: left; margin-right: 4px; - opacity: .75; + opacity: .65; } .github-btn .count { display: inline-block; -- 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 --- docs/assets/css/docs.css | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b503c23e4..cde8ff1e0 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -304,6 +304,13 @@ body > .navbar-fixed .brand:hover { margin-left: 10px; } +/* scrollspy docs */ + +.scrollspy-example { + overflow: auto; + height: 200px; + position: relative; +} /* Popover docs -------------------------------------------------- */ -- 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 --- docs/assets/css/docs.css | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index cde8ff1e0..0873d443f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -473,3 +473,19 @@ h2 + table { } } +#accordion dt a{ + display:block; + padding: 9px 15px; + line-height: 1; + background-color: whiteSmoke; + border: 1px solid #EEE; + border-top-color: #fff; +} + +#accordion dt:first-child a { + border-top-color:#eee; +} + +#accordion dd p { + padding: 10px; +} \ No newline at end of file -- 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 --- docs/assets/css/docs.css | 46 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 10 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b503c23e4..6c57fddab 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -41,36 +41,62 @@ body > .navbar-fixed .brand:hover { /* Github buttons -------------------------------------------------- */ -.github-btn + .github-btn { - margin-left: 10px; -} .github-btn { display: inline-block; height: 20px; overflow: hidden; } -.github-btn .btn, -.github-btn .count { +.github-btn .gh-btn, +.github-btn .gh-count, +.github-btn .gh-ico { float: left; +} +.github-btn .gh-btn, +.github-btn .gh-count { padding: 1px 5px 1px 4px; font-size: 11px; font-weight: bold; line-height: 16px; color: #666; text-shadow: 0 1px 0 #fff; + cursor: pointer; +} +.github-btn .gh-btn { + 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; + border: 1px solid #ccc; + border-bottom-color: #bbb; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2); + -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2); + box-shadow: inset 0 1px 0 rgba(255,255,255,.2); } -.github-btn .btn { - box-shadow: none; +.github-btn .gh-btn:hover { + color: #333; + text-decoration: none; + background-position: 0 -10px; } -.github-btn .github-ico { - float: left; +.github-btn .gh-btn:active { + -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15); + -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15); + box-shadow: inset 0 2px 4px rgba(0,0,0,.15); +} +.github-btn .gh-ico { margin-right: 4px; opacity: .65; } -.github-btn .count { +.github-btn .gh-btn:hover .gh-ico { + opacity: .75; +} +.github-btn .gh-count { display: inline-block; margin-left: 2px; background-color: #fff; -- 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 --- docs/assets/css/docs.css | 88 ------------------------------------------------ 1 file changed, 88 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index ec3cd83cb..a7b52821e 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -39,71 +39,6 @@ body > .navbar-fixed .brand:hover { } -/* Github buttons --------------------------------------------------- */ -.github-btn { - display: inline-block; - height: 20px; - overflow: hidden; -} -.github-btn .gh-btn, -.github-btn .gh-count, -.github-btn .gh-ico { - float: left; -} -.github-btn .gh-btn, -.github-btn .gh-count { - padding: 1px 5px 1px 4px; - font-size: 11px; - font-weight: bold; - line-height: 16px; - color: #666; - text-shadow: 0 1px 0 #fff; - cursor: pointer; -} -.github-btn .gh-btn { - 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; - border: 1px solid #ccc; - border-bottom-color: #bbb; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2); - -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2); - box-shadow: inset 0 1px 0 rgba(255,255,255,.2); -} -.github-btn .gh-btn:hover { - color: #333; - text-decoration: none; - background-position: 0 -10px; -} -.github-btn .gh-btn:active { - -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15); - -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15); - box-shadow: inset 0 2px 4px rgba(0,0,0,.15); -} -.github-btn .gh-ico { - margin-right: 4px; - opacity: .65; -} -.github-btn .gh-btn:hover .gh-ico { - opacity: .75; -} -.github-btn .gh-count { - display: inline-block; - margin-left: 2px; - background-color: #fff; - border: 1px solid #ddd; -} - - /* Jumbotrons -------------------------------------------------- */ .jumbotron { @@ -330,13 +265,6 @@ body > .navbar-fixed .brand:hover { margin-left: 10px; } -/* scrollspy docs */ - -.scrollspy-example { - overflow: auto; - height: 200px; - position: relative; -} /* Popover docs -------------------------------------------------- */ @@ -499,19 +427,3 @@ h2 + table { } } -#accordion dt a{ - display:block; - padding: 9px 15px; - line-height: 1; - background-color: whiteSmoke; - border: 1px solid #EEE; - border-top-color: #fff; -} - -#accordion dt:first-child a { - border-top-color:#eee; -} - -#accordion dd p { - padding: 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 --- docs/assets/css/docs.css | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index a7b52821e..281b224e3 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -315,11 +315,6 @@ h2 + table { -------------------------------------------------- */ @media (max-width: 480px) { - /* Hide the nav for now */ - body > .navbar-fixed .nav { - display: none; - } - /* Change up some type stuff */ h1 small { display: block; @@ -365,11 +360,6 @@ h2 + table { @media (max-width: 768px) { - /* Hide the nav for now */ - body > .navbar-fixed .nav { - display: none; - } - /* Adjust the jumbotron */ .jumbotron .benefits { position: relative; @@ -394,6 +384,9 @@ h2 + table { .footer .pull-right { float: none; } + .footer p { + margin-bottom: 9px; + } } @@ -423,7 +416,7 @@ h2 + table { /* Provide enough space on right-hand side for benefits list */ .jumbotron h1, .jumbotron p { - margin-right: 40%; + margin-right: 20%; } } -- 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 --- docs/assets/css/docs.css | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 281b224e3..73e619d29 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -160,7 +160,10 @@ body > .navbar-fixed .brand:hover { margin-bottom: 18px; } .marketing h1 { - margin-bottom: 18px; + margin: 36px 0 27px; + font-size: 36px; + font-weight: 300; + text-align: center; } .marketing h2, .marketing h3 { @@ -310,6 +313,11 @@ h2 + table { margin-top: 5px; } +/* Example sites showcase */ +.example-sites img { + width: 290px; +} + /* Responsive Docs -------------------------------------------------- */ -- 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 --- docs/assets/css/docs.css | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 73e619d29..9324f9990 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -323,6 +323,11 @@ h2 + table { -------------------------------------------------- */ @media (max-width: 480px) { + /* Reduce padding above jumbotron */ + body { + padding-top: 70px; + } + /* Change up some type stuff */ h1 small { display: block; @@ -362,6 +367,21 @@ h2 + table { .quick-links { margin: 40px 0 0; } + /* hide the bullets on mobile since our horizontal space is limited */ + .quick-links .divider { + display: none; + } + + /* center example sites */ + .example-sites { + margin-left: 0; + } + .example-sites a { + float: none; + display: block; + max-width: 300px; + margin: 0 auto 18px; + } } -- 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 --- docs/assets/css/docs.css | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 9324f9990..7c1e65942 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -382,7 +382,6 @@ h2 + table { max-width: 300px; margin: 0 auto 18px; } - } -- 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 --- docs/assets/css/docs.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 7c1e65942..586b5334b 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -382,6 +382,12 @@ h2 + table { max-width: 300px; margin: 0 auto 18px; } + + table code { + white-space: normal; + word-wrap: break-word; + word-break: break-all; + } } -- cgit v1.2.3 From 7df0d1c7d18a72f401094d08afa4eaa9142fe511 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 14 Dec 2011 18:45:33 -0800 Subject: rename transitions to transition and fix scrollspy example --- docs/assets/css/docs.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 586b5334b..fa8c92e50 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -318,6 +318,12 @@ h2 + table { width: 290px; } +.scrollspy-example { + height: 200px; + overflow: auto; + position: relative; +} + /* Responsive Docs -------------------------------------------------- */ -- 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 --- docs/assets/css/docs.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 586b5334b..3cf2208e9 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -25,7 +25,7 @@ body > .navbar-fixed .brand { float: right; font-weight: bold; color: #000; - text-shadow: 0 1px 0 rgba(255,255,255,.1); + text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.125); } body > .navbar-fixed .brand:hover { text-decoration: none; @@ -449,7 +449,7 @@ h2 + table { /* Provide enough space on right-hand side for benefits list */ .jumbotron h1, .jumbotron p { - margin-right: 20%; + margin-right: 40%; } } -- 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 --- docs/assets/css/docs.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 8432f92ea..5ed38bb47 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -317,6 +317,11 @@ h2 + table { .example-sites img { width: 290px; } +.built-with { + margin: -18px 0 27px; + color: #999; + text-align: center; +} .scrollspy-example { height: 200px; -- 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 --- docs/assets/css/docs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 5ed38bb47..20ea50d6f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -387,7 +387,7 @@ h2 + table { .example-sites { margin-left: 0; } - .example-sites a { + .example-sites > li { float: none; display: block; max-width: 300px; -- cgit v1.2.3 From af5793e1cd358862cf510a54dda2476b95a26ca8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2011 16:41:46 -0600 Subject: fix mobile example sites, remove unused JS from docs index --- docs/assets/css/docs.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 20ea50d6f..b3c464941 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -315,7 +315,7 @@ h2 + table { /* Example sites showcase */ .example-sites img { - width: 290px; + max-width: 290px; } .built-with { margin: -18px 0 27px; @@ -393,6 +393,9 @@ h2 + table { max-width: 300px; margin: 0 auto 18px; } + .example-sites img { + max-width: 270px; + } table code { white-space: normal; -- 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 --- docs/assets/css/docs.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b3c464941..c2c92a251 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -22,6 +22,7 @@ body { body > .navbar-fixed .brand { padding-right: 0; padding-left: 0; + margin-left: 20px; float: right; font-weight: bold; color: #000; -- 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 --- docs/assets/css/docs.css | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index c2c92a251..b218b465c 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -330,6 +330,24 @@ h2 + table { position: relative; } +/* Icons +------------------------- */ +.the-icons { + +} +.the-icons i { + display: block; + margin-bottom: 5px; + background-color: rgba(255,0,0,.25); +} +.the-icons i:after { + display: block; + content: attr(class); + font-style: normal; + margin-left: 20px; + width: 100px; +} + /* Responsive Docs -------------------------------------------------- */ -- 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 --- docs/assets/css/docs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b218b465c..a4573448f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -171,7 +171,7 @@ body > .navbar-fixed .brand:hover { font-weight: 300; } .marketing h2 { - margin-bottom: 9px; + font-size: 22px; } .marketing p { margin-right: 10px; -- 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 --- docs/assets/css/docs.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index a4573448f..9501ec5dc 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -36,7 +36,11 @@ body > .navbar-fixed .brand:hover { /* Space out sub-sections more -------------------------------------------------- */ .page-header { - margin-top: 36px; + margin: 36px 0 18px; + border-bottom: 1px solid #eee; +} +.page-header h1 { + margin-bottom: 9px; } -- 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 --- docs/assets/css/docs.css | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 9501ec5dc..5eafb962b 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -202,6 +202,28 @@ body > .navbar-fixed .brand:hover { margin-bottom: 0; color: #555; } +.footer dl { + margin-bottom: 0; +} +.footer dl dt { + font-size: 11px; + color: #999; + text-transform: uppercase; +} +.footer dl dd + dt { + margin-top: 18px; +} +.footer dl dd { + margin-left: 0; + font-size: 12px; +} +.footer dl a { + color: #999; +} +.footer dl a:hover { + color: #555; +} + /* Special grid styles -- 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 --- docs/assets/css/docs.css | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 5eafb962b..41c7ae4b6 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -36,11 +36,13 @@ body > .navbar-fixed .brand:hover { /* Space out sub-sections more -------------------------------------------------- */ .page-header { - margin: 36px 0 18px; + margin: 45px 0 18px; border-bottom: 1px solid #eee; } .page-header h1 { - margin-bottom: 9px; + margin-bottom: 17px; + font-size: 36px; + line-height: 1; } @@ -327,10 +329,6 @@ pre.prettyprint { overflow: hidden; } -.well form { - margin-bottom: 0; -} - .browser-support { max-width: 100%; } @@ -356,6 +354,40 @@ h2 + table { position: relative; } +/* Remove bottom margin on example forms in wells */ +form.well { + margin-bottom: 0; +} + +/* Tighten up spacing */ +.well hr { + margin: 18px 0; +} + +/* Form docs for horizontal forms */ +.form-docs { + padding-left: 10px; +} +.form-docs h3, +.form-docs p, +.form-docs li { + color: #777; +} +.form-docs hr { + margin: 18px 0; +} + +/* Fake the :focus state to demo it */ +.focused { + border-color: rgba(82,168,236,.8); + -webkit-box-shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6); + -moz-box-shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6); + box-shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6); + outline: 0; +} + + + /* Icons ------------------------- */ .the-icons { -- 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 --- docs/assets/css/docs.css | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 41c7ae4b6..6cffcbc20 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -41,7 +41,6 @@ body > .navbar-fixed .brand:hover { } .page-header h1 { margin-bottom: 17px; - font-size: 36px; line-height: 1; } -- 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 --- docs/assets/css/docs.css | 73 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 6cffcbc20..579baad7d 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -192,6 +192,75 @@ body > .navbar-fixed .brand:hover { } +/* Quickstart section for getting le code +-------------------------------------------------- */ +.getting-started { + background-color: #f5f5f5; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#f9f9f9), to(#f5f5f5)); + background-image: -moz-linear-gradient(#f9f9f9, #f5f5f5); + background-image: -ms-linear-gradient(#f9f9f9, #f5f5f5); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f9f9f9), color-stop(100%, #f5f5f5)); + background-image: -webkit-linear-gradient(#f9f9f9, #f5f5f5); + background-image: -o-linear-gradient(#f9f9f9, #f5f5f5); + -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0)"; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0); + background-image: linear-gradient(#f9f9f9, #f5f5f5); + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.getting-started { + border-color: #eee; +} +.getting-started td { + width: 33%; + border-right: 1px solid #eee; +} +.getting-started td + td { + border-left: 1px solid #fff; +} +.getting-started td:last-child { + border-right: 0; +} +.quick-start { + padding: 17px 20px; +} +.quick-start h3, +.quick-start p { + line-height: 18px; + text-align: center; + margin-bottom: 9px; +} +.quick-start p { + color: #777; +} +.quick-start .current-version, +.quick-start .current-version a { + color: #999; +} +.quick-start form { + margin-bottom: 0; +} +.quick-start textarea { + display: block; + width: 100%; + height: auto; + margin-bottom: 0; + line-height: 21px; + white-space: nowrap; + overflow: hidden; + /* Makes inputs behave like true block-level elements */ + -webkit-box-sizing: border-box; /* Older Webkit */ + -moz-box-sizing: border-box; /* Older FF */ + -ms-box-sizing: border-box; /* IE8 */ + box-sizing: border-box; /* CSS3 spec*/ + /* Hacks for IE7 to make this work just okay enough to function */ + *width: 90%; + *height: 24px; +} + + /* Footer -------------------------------------------------- */ .footer { @@ -341,8 +410,10 @@ h2 + table { .example-sites img { max-width: 290px; } -.built-with { +.marketing-byline { margin: -18px 0 27px; + font-size: 18px; + font-weight: 300; color: #999; text-align: center; } -- 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 --- docs/assets/css/docs.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 579baad7d..1180effd1 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -456,7 +456,11 @@ form.well { outline: 0; } - +/* For input sizes, make them display block */ +.docs-input-sizes input[type=text] { + display: block; + margin-bottom: 9px; +} /* Icons ------------------------- */ -- 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 --- docs/assets/css/docs.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 1180effd1..c359cf73b 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -402,7 +402,8 @@ pre.prettyprint { } /* Make tables spaced out a bit more */ -h2 + table { +h2 + table, +h2 + .row { margin-top: 5px; } -- 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 --- docs/assets/css/docs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index c359cf73b..f37067203 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -163,7 +163,7 @@ body > .navbar-fixed .brand:hover { /* Marketing section of Overview -------------------------------------------------- */ .marketing .row { - margin-bottom: 18px; + margin-bottom: 9px; } .marketing h1 { margin: 36px 0 27px; -- 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 --- docs/assets/css/docs.css | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index f37067203..134224e56 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -466,7 +466,7 @@ form.well { /* Icons ------------------------- */ .the-icons { - + } .the-icons i { display: block; @@ -481,6 +481,13 @@ form.well { width: 100px; } +#javascript input[type='checkbox'] { +display: inline; +margin-left: 6px; +position: relative; +top: -1px; +} + /* Responsive Docs -------------------------------------------------- */ -- 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 --- docs/assets/css/docs.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 134224e56..ca1c5cb83 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -35,8 +35,11 @@ body > .navbar-fixed .brand:hover { /* Space out sub-sections more -------------------------------------------------- */ +section { + padding-top: 60px; +} .page-header { - margin: 45px 0 18px; + margin: 18px 0; border-bottom: 1px solid #eee; } .page-header h1 { -- 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 --- docs/assets/css/docs.css | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index ca1c5cb83..2f45032f2 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -116,7 +116,6 @@ section { /* supporting docs pages */ .subhead { padding-bottom: 14px; - margin-bottom: 45px; border-bottom: 3px solid #e5e5e5; } .subhead h1, -- 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 --- docs/assets/css/docs.css | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 2f45032f2..416b1830c 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -130,6 +130,7 @@ section { /* Quick links -------------------------------------------------- */ .quick-links { + min-height: 30px; padding: 5px 20px; margin: 45px 0; list-style: none; @@ -141,11 +142,11 @@ section { -webkit-box-shadow: inset 0 1px 0 rgba(0,0,0,.03); -moz-box-shadow: inset 0 1px 0 rgba(0,0,0,.03); box-shadow: inset 0 1px 0 rgba(0,0,0,.03); + overflow: hidden; } .quick-links li { display: inline; margin: 0 5px; - line-height: 30px; } .quick-links .divider { color: #999; @@ -258,7 +259,7 @@ section { -ms-box-sizing: border-box; /* IE8 */ box-sizing: border-box; /* CSS3 spec*/ /* Hacks for IE7 to make this work just okay enough to function */ - *width: 90%; + *width: 270px; *height: 24px; } @@ -386,7 +387,7 @@ section { .popover-well .popover-menu-wrapper { height: 80px; } -img.large-bird { +.large-bird { margin: 5px 0 0 310px; opacity: .1; } @@ -467,9 +468,6 @@ form.well { /* Icons ------------------------- */ -.the-icons { - -} .the-icons i { display: block; margin-bottom: 5px; @@ -483,11 +481,11 @@ form.well { width: 100px; } -#javascript input[type='checkbox'] { -display: inline; -margin-left: 6px; -position: relative; -top: -1px; +#javascript input[type=checkbox] { + position: relative; + top: -1px; + display: inline; + margin-left: 6px; } -- cgit v1.2.3 From ea8f5883fd58ff5e356944e4a93543c05abf2220 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 23 Jan 2012 12:04:48 -0800 Subject: clean up subnav aesthetics --- docs/assets/css/docs.css | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 416b1830c..e7714fd5c 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -115,8 +115,8 @@ section { ------------------------- */ /* supporting docs pages */ .subhead { - padding-bottom: 14px; - border-bottom: 3px solid #e5e5e5; + padding-bottom: 0; + border-bottom: 0; } .subhead h1, .subhead p { @@ -126,6 +126,36 @@ section { font-size: 45px; } +/* Subnav */ +.subhead .nav { + padding: 0 10px; + background-color: #eeeeee; /* Old browsers */ + background-repeat: repeat-x; /* Repeat the gradient */ + background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */ + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(100%,#eeeeee)); /* Chrome,Safari4+ */ + background-image: -webkit-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Chrome 10+,Safari 5.1+ */ + background-image: -ms-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* IE10+ */ + background-image: -o-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Opera 11.10+ */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */ + background-image: linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* W3C */ + border: 1px solid #eee; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.subhead .nav a { + margin: 0; + padding-top: 11px; + padding-bottom: 11px; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.subhead .nav .active a { + background-color: #fff; + color: #333; +} + /* Quick links -------------------------------------------------- */ -- cgit v1.2.3 From 1954cf001926a94f7a4d51f16beaf9f2ba671d13 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 23 Jan 2012 13:46:26 -0800 Subject: comment in forms' --- docs/assets/css/docs.css | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index e7714fd5c..69d9dac56 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -448,6 +448,7 @@ h2 + .row { margin: -18px 0 27px; font-size: 18px; font-weight: 300; + line-height: 24px; color: #999; text-align: center; } @@ -563,6 +564,18 @@ form.well { margin: 0 auto 10px; } + /* Subnav */ + .subhead .nav { + padding: 0; + background: none; + } + .subhead .nav > li { + float: none; + } + .subhead .nav li + li a { + border-top: 1px solid #eee; + } + /* Don't space out quick links so much */ .quick-links { margin: 40px 0 0; -- 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 --- docs/assets/css/docs.css | 62 +++++++++++++----------------------------------- 1 file changed, 17 insertions(+), 45 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 69d9dac56..b8d5bfcdc 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -83,7 +83,7 @@ section { /* Benefits list in masthead */ .benefits { - width: 250px; + width: 280px; position: absolute; right: 0; bottom: 0; @@ -105,8 +105,6 @@ section { color: #555; } .benefits span { - position: relative; - top: -2px; padding-right: 5px; color: #999; } @@ -200,7 +198,7 @@ section { } .marketing h1 { margin: 36px 0 27px; - font-size: 36px; + font-size: 40px; font-weight: 300; text-align: center; } @@ -227,59 +225,28 @@ section { /* Quickstart section for getting le code -------------------------------------------------- */ -.getting-started { - background-color: #f5f5f5; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#f9f9f9), to(#f5f5f5)); - background-image: -moz-linear-gradient(#f9f9f9, #f5f5f5); - background-image: -ms-linear-gradient(#f9f9f9, #f5f5f5); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f9f9f9), color-stop(100%, #f5f5f5)); - background-image: -webkit-linear-gradient(#f9f9f9, #f5f5f5); - background-image: -o-linear-gradient(#f9f9f9, #f5f5f5); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0)"; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0); - background-image: linear-gradient(#f9f9f9, #f5f5f5); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.getting-started { - border-color: #eee; -} -.getting-started td { - width: 33%; - border-right: 1px solid #eee; -} -.getting-started td + td { - border-left: 1px solid #fff; -} -.getting-started td:last-child { - border-right: 0; -} -.quick-start { - padding: 17px 20px; -} -.quick-start h3, -.quick-start p { +.getting-started h3, +.getting-started p { line-height: 18px; text-align: center; margin-bottom: 9px; } -.quick-start p { +.getting-started p { color: #777; } -.quick-start .current-version, -.quick-start .current-version a { +.getting-started .current-version, +.getting-started .current-version a { color: #999; } -.quick-start form { +.getting-started form { margin-bottom: 0; } -.quick-start textarea { +.getting-started textarea { display: block; - width: 100%; + width: 95%; height: auto; - margin-bottom: 0; + margin-left: auto; + margin-right: auto; line-height: 21px; white-space: nowrap; overflow: hidden; @@ -629,6 +596,11 @@ form.well { margin-bottom: 5px; } + /* Space out the getting started sections */ + .getting-started .span4 { + margin-bottom: 18px; + } + /* Unfloat the back to top link in footer */ .footer .pull-right { float: none; -- 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 --- docs/assets/css/docs.css | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b8d5bfcdc..d78cea2b1 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -126,7 +126,6 @@ section { /* Subnav */ .subhead .nav { - padding: 0 10px; background-color: #eeeeee; /* Old browsers */ background-repeat: repeat-x; /* Repeat the gradient */ background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */ @@ -136,7 +135,7 @@ section { background-image: -o-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Opera 11.10+ */ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */ background-image: linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* W3C */ - border: 1px solid #eee; + border: 1px solid #e5e5e5; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -145,6 +144,9 @@ section { margin: 0; padding-top: 11px; padding-bottom: 11px; + font-size: 13px; + border-left: 1px solid #f5f5f5; + border-right: 1px solid #e5e5e5; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; @@ -153,6 +155,15 @@ section { background-color: #fff; color: #333; } +.subhead .nav li:first-child a { + border-left: 0; + -webkit-border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; +} +.subhead .nav li:last-child a { + border-right: 0; +} /* Quick links @@ -247,16 +258,19 @@ section { height: auto; margin-left: auto; margin-right: auto; - line-height: 21px; + font-family: Menlo, Monaco, "Courier New", monospace; + font-size: 12px; + line-height: 20px; white-space: nowrap; overflow: hidden; + background-color: #f5f5f5; /* Makes inputs behave like true block-level elements */ -webkit-box-sizing: border-box; /* Older Webkit */ -moz-box-sizing: border-box; /* Older FF */ -ms-box-sizing: border-box; /* IE8 */ box-sizing: border-box; /* CSS3 spec*/ /* Hacks for IE7 to make this work just okay enough to function */ - *width: 270px; + *width: 80%; *height: 24px; } -- cgit v1.2.3 From a40d4993ed0a947083b7e85cf7772492d613afc8 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 24 Jan 2012 17:13:02 -0800 Subject: make subnav fix --- docs/assets/css/docs.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index d78cea2b1..4ab353069 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -165,6 +165,12 @@ section { border-right: 0; } +.subhead .subnav-fixed { + position: fixed; + top: 40px; + z-index:1000; +} + /* Quick links -------------------------------------------------- */ -- 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 --- docs/assets/css/docs.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index d78cea2b1..956eff246 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -417,6 +417,8 @@ pre.prettyprint { /* Make tables spaced out a bit more */ h2 + table, +h3 + table, +h4 + table, h2 + .row { margin-top: 5px; } -- 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 --- docs/assets/css/docs.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index d5192ca55..ac48c6e2b 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -168,7 +168,8 @@ section { .subhead .subnav-fixed { position: fixed; top: 40px; - z-index:1000; + z-index: 1030; + width: 938px; } -- cgit v1.2.3 From d3622235359c08f65d5396ee01523c7f7d8901b1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 18:29:17 -0800 Subject: refine fixed docs bar --- docs/assets/css/docs.css | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index ac48c6e2b..dd723800b 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -170,6 +170,12 @@ section { top: 40px; z-index: 1030; width: 938px; + -webkit-border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + border-radius: 0 0 4px 4px; + -webkit-box-shadow: 0 1px 5px rgba(0,0,0,.05); + -moz-box-shadow: 0 1px 5px rgba(0,0,0,.05); + box-shadow: 0 1px 5px rgba(0,0,0,.05); } @@ -565,6 +571,13 @@ form.well { .subhead .nav li + li a { border-top: 1px solid #eee; } + .subhead .subnav-fixed { + position: static; + top: auto; + z-index: auto; + width: auto; + } + /* Don't space out quick links so much */ .quick-links { -- 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 --- docs/assets/css/docs.css | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index dd723800b..776ca58b9 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -125,7 +125,9 @@ section { } /* Subnav */ -.subhead .nav { +.subnav { + width: 100%; + height: 36px; background-color: #eeeeee; /* Old browsers */ background-repeat: repeat-x; /* Repeat the gradient */ background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */ @@ -138,23 +140,30 @@ section { border: 1px solid #e5e5e5; -webkit-border-radius: 4px; -moz-border-radius: 4px; - border-radius: 4px; + border-radius: 4px; +} +.subhead .nav { } .subhead .nav a { margin: 0; padding-top: 11px; padding-bottom: 11px; font-size: 13px; + color: #777; border-left: 1px solid #f5f5f5; border-right: 1px solid #e5e5e5; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } +.subhead .nav a:hover, .subhead .nav .active a { - background-color: #fff; + background-color: transparent; color: #333; } +.subhead .nav .active a { + background-color: #eee; +} .subhead .nav li:first-child a { border-left: 0; -webkit-border-radius: 4px 0 0 4px; @@ -165,17 +174,24 @@ section { border-right: 0; } -.subhead .subnav-fixed { +.subnav-fixed { position: fixed; top: 40px; + left: 0; + right: 0; z-index: 1030; - width: 938px; - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; - -webkit-box-shadow: 0 1px 5px rgba(0,0,0,.05); - -moz-box-shadow: 0 1px 5px rgba(0,0,0,.05); - box-shadow: 0 1px 5px rgba(0,0,0,.05); + border-color: #d5d5d5; + border-width: 0 0 1px; /* drop the border on the fixed edges */ + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + -webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); + -moz-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); + box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); +} +.subnav-fixed .nav { + width: 940px; + margin: 0 auto; } @@ -438,7 +454,7 @@ h2 + .row { /* Example sites showcase */ .example-sites img { - max-width: 290px; + max-width: 100%; } .marketing-byline { margin: -18px 0 27px; -- 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 --- docs/assets/css/docs.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 776ca58b9..d0a5623f4 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -19,7 +19,7 @@ body { /* Tweak navbar brand link to be super sleek -------------------------------------------------- */ -body > .navbar-fixed .brand { +.navbar-fixed .brand { padding-right: 0; padding-left: 0; margin-left: 20px; @@ -27,8 +27,12 @@ body > .navbar-fixed .brand { font-weight: bold; color: #000; text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.125); + -webkit-transition: all .2s linear; + -moz-transition: all .2s linear; + transition: all .2s linear; + } -body > .navbar-fixed .brand:hover { +.navbar-fixed .brand:hover { text-decoration: none; } -- cgit v1.2.3 From bacb05608f2d42ef7fdb6fa25241d4268b989387 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 19:43:52 -0800 Subject: redo the form examples to enable better responsive layout --- docs/assets/css/docs.css | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index d0a5623f4..6cb8720c7 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -146,8 +146,6 @@ section { -moz-border-radius: 4px; border-radius: 4px; } -.subhead .nav { -} .subhead .nav a { margin: 0; padding-top: 11px; @@ -477,7 +475,7 @@ h2 + .row { /* Remove bottom margin on example forms in wells */ form.well { - margin-bottom: 0; + padding: 14px; } /* Tighten up spacing */ @@ -558,6 +556,14 @@ form.well { margin-top: 18px; } + /* Subnav */ + .subnav { + background: none; + } + .subnav .nav > li { + float: none; + } + /* Adjust the jumbotron */ .jumbotron h1, .jumbotron p { @@ -580,25 +586,6 @@ form.well { margin: 0 auto 10px; } - /* Subnav */ - .subhead .nav { - padding: 0; - background: none; - } - .subhead .nav > li { - float: none; - } - .subhead .nav li + li a { - border-top: 1px solid #eee; - } - .subhead .subnav-fixed { - position: static; - top: auto; - z-index: auto; - width: auto; - } - - /* Don't space out quick links so much */ .quick-links { margin: 40px 0 0; @@ -632,6 +619,14 @@ form.well { @media (max-width: 768px) { + /* Subnav */ + .subnav-fixed { + position: static; + top: auto; + z-index: auto; + width: auto; + } + /* Adjust the jumbotron */ .jumbotron .benefits { position: relative; -- cgit v1.2.3 From 731821b78f059f78800baa721410341f786698b5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 20:26:54 -0800 Subject: updated docs css to fix subnav on iOS --- docs/assets/css/docs.css | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 6cb8720c7..5fc04b0f9 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -146,7 +146,10 @@ section { -moz-border-radius: 4px; border-radius: 4px; } -.subhead .nav a { +.subnav .nav { + margin-bottom: 0; +} +.subnav .nav a { margin: 0; padding-top: 11px; padding-bottom: 11px; @@ -158,24 +161,25 @@ section { -moz-border-radius: 0; border-radius: 0; } -.subhead .nav a:hover, -.subhead .nav .active a { +.subnav .nav a:hover, +.subnav .nav .active a { background-color: transparent; color: #333; } -.subhead .nav .active a { +.subnav .nav .active a { background-color: #eee; } -.subhead .nav li:first-child a { +.subnav .nav li:first-child a { border-left: 0; -webkit-border-radius: 4px 0 0 4px; -moz-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; } -.subhead .nav li:last-child a { +.subnav .nav li:last-child a { border-right: 0; } +/* Fixed subnav on scroll */ .subnav-fixed { position: fixed; top: 40px; @@ -558,7 +562,7 @@ form.well { /* Subnav */ .subnav { - background: none; + background: #fff; /* whole background property since we use a background-image for gradient */ } .subnav .nav > li { float: none; @@ -620,11 +624,21 @@ form.well { @media (max-width: 768px) { /* Subnav */ - .subnav-fixed { + .subnav { position: static; top: auto; z-index: auto; width: auto; + height: auto; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + } + .subnav .nav a { + border: 0; + } + .subnav .nav li + li a { + border-top: 1px solid #e5e5e5; } /* Adjust the jumbotron */ -- 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 --- docs/assets/css/docs.css | 119 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 91 insertions(+), 28 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 5fc04b0f9..d9f8e438b 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -179,25 +179,27 @@ section { border-right: 0; } -/* Fixed subnav on scroll */ -.subnav-fixed { - position: fixed; - top: 40px; - left: 0; - right: 0; - z-index: 1030; - border-color: #d5d5d5; - border-width: 0 0 1px; /* drop the border on the fixed edges */ - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - -webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); - -moz-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); - box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); -} -.subnav-fixed .nav { - width: 940px; - margin: 0 auto; +/* Fixed subnav on scroll, but only for 940px and up (sorry IE!) */ +@media (min-width: 940px) { + .subnav-fixed { + position: fixed; + top: 40px; + left: 0; + right: 0; + z-index: 1030; + border-color: #d5d5d5; + border-width: 0 0 1px; /* drop the border on the fixed edges */ + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + -webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); + -moz-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); + box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); + } + .subnav-fixed .nav { + width: 940px; + margin: 0 auto; + } } @@ -439,6 +441,72 @@ section { } +/* CSS Chop Shop +-------------------------------------------------- */ +.builder { +} +.builder .span2 { + width: 160px; +} +.builder ul { + margin: 0; + list-style: none; +} +.builder .tabs { + margin-right: 0; +} +.builder .tabs a { + width: 160px; + padding: 14px; + font-size: 14px; +} +.builder .tab-content { + padding: 19px; + margin-left: 189px; + border: 1px solid #e5e5e5; + -webkit-border-radius: 0 4px 4px 4px; + -moz-border-radius: 0 4px 4px 4px; + border-radius: 0 4px 4px 4px; +} + +/* Space out h3s when following a section */ +.builder input + h3, +.builder .checkbox + h3 { + margin-top: 9px; +} + +/* Fields for variables */ +.builder input + h3 { + margin-top: 9px; +} +.builder #variables label { + margin-bottom: 2px; + color: #555; +} +.builder input[type=text] { + margin-bottom: 9px; + font-family: Menlo, Monaco, "Courier New", monospace; + font-size: 12px; + color: #d14; + background-color: #f7f7f9; +} +.builder input[type=text]:focus { + background-color: #fff; +} + + +.builder-actions { + margin-top: 18px; + padding-top: 18px; + border-top: 1px solid #eee; +} +.builder-actions .toggle-all { + float: right; + line-height: 36px; +} + + + /* Misc -------------------------------------------------- */ @@ -560,14 +628,6 @@ form.well { margin-top: 18px; } - /* Subnav */ - .subnav { - background: #fff; /* whole background property since we use a background-image for gradient */ - } - .subnav .nav > li { - float: none; - } - /* Adjust the jumbotron */ .jumbotron h1, .jumbotron p { @@ -630,10 +690,14 @@ form.well { z-index: auto; width: auto; height: auto; + background: #fff; /* whole background property since we use a background-image for gradient */ -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; } + .subnav .nav > li { + float: none; + } .subnav .nav a { border: 0; } @@ -683,7 +747,6 @@ form.well { .jumbotron h1 { font-size: 54px; } - .jumbotron h1, .jumbotron p { margin-right: 0; -- cgit v1.2.3 From ae70d2a8b6db76d0b3a2a2ef4540a270f0f5c257 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 23:44:59 -0800 Subject: refine spacing on fixed subnav --- docs/assets/css/docs.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index d9f8e438b..8c30e733d 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -197,8 +197,9 @@ section { box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); } .subnav-fixed .nav { - width: 940px; + width: 938px; margin: 0 auto; + padding: 0 1px; } } -- 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 --- docs/assets/css/docs.css | 94 ++++++++++++++++++++++++++---------------------- 1 file changed, 52 insertions(+), 42 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 8c30e733d..12c534fb2 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -442,68 +442,78 @@ section { } -/* CSS Chop Shop +/* Download page -------------------------------------------------- */ -.builder { +.download .page-header { + margin-top: 36px; } -.builder .span2 { - width: 160px; -} -.builder ul { - margin: 0; - list-style: none; -} -.builder .tabs { - margin-right: 0; -} -.builder .tabs a { - width: 160px; - padding: 14px; - font-size: 14px; -} -.builder .tab-content { - padding: 19px; - margin-left: 189px; - border: 1px solid #e5e5e5; - -webkit-border-radius: 0 4px 4px 4px; - -moz-border-radius: 0 4px 4px 4px; - border-radius: 0 4px 4px 4px; +.page-header .toggle-all { + margin-top: 13px; } /* Space out h3s when following a section */ -.builder input + h3, -.builder .checkbox + h3 { +.download h3 { + margin-bottom: 5px; +} +.download-builder input + h3, +.download-builder .checkbox + h3 { margin-top: 9px; } /* Fields for variables */ -.builder input + h3 { - margin-top: 9px; -} -.builder #variables label { - margin-bottom: 2px; - color: #555; -} -.builder input[type=text] { +.download-builder input[type=text] { margin-bottom: 9px; font-family: Menlo, Monaco, "Courier New", monospace; font-size: 12px; color: #d14; background-color: #f7f7f9; } -.builder input[type=text]:focus { +.download-builder input[type=text]:focus { background-color: #fff; } +/* Custom, larger checkbox labels */ +.download .checkbox { + padding: 6px 10px 6px 25px; + font-size: 14px; + color: #555; + background-color: #f9f9f9; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + cursor: pointer; +} +.download .checkbox:hover { + color: #333; + background-color: #f5f5f5; +} +.download .checkbox input[type=checkbox] { + position: relative; + top: 1px; +} +.download .checkbox small { + font-size: 12px; + color: #777; +} -.builder-actions { - margin-top: 18px; - padding-top: 18px; - border-top: 1px solid #eee; +/* Giant download button */ +.download-btn { + pading: 18px 20px; + margin: 45px 0; + text-align: center; + border: 1px solid #eee; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } -.builder-actions .toggle-all { - float: right; - line-height: 36px; +.btn.xlarge { + margin: 36px auto; + padding: 14px 24px; + font-size: 30px; + text-align: center; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } -- 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 --- docs/assets/css/docs.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 12c534fb2..0fe480ecb 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -596,9 +596,14 @@ form.well { /* Icons ------------------------- */ +.the-icons { + margin-bottom: 18px; +} .the-icons i { display: block; margin-bottom: 5px; +} +.the-icons i:hover { background-color: rgba(255,0,0,.25); } .the-icons i:after { @@ -606,9 +611,8 @@ form.well { content: attr(class); font-style: normal; margin-left: 20px; - width: 100px; + width: 140px; } - #javascript input[type=checkbox] { position: relative; top: -1px; -- cgit v1.2.3 From a4b8cc2a9c8c7f16c4a93e64d2a187d839bfbb40 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 11:30:30 -0800 Subject: darken active state on subnav with scrollspy added --- docs/assets/css/docs.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 0fe480ecb..600894f38 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -132,6 +132,7 @@ section { .subnav { width: 100%; height: 36px; + overflow: hidden; background-color: #eeeeee; /* Old browsers */ background-repeat: repeat-x; /* Repeat the gradient */ background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */ @@ -167,13 +168,10 @@ section { color: #333; } .subnav .nav .active a { - background-color: #eee; + background-color: #e5e5e5; } .subnav .nav li:first-child a { border-left: 0; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; } .subnav .nav li:last-child a { border-right: 0; -- cgit v1.2.3 From 4ea63e5261ba0c10e2b729e2216105896108733b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 13:33:55 -0800 Subject: finish off the static stuff for build and download page --- docs/assets/css/docs.css | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 600894f38..739ae1fc4 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -125,7 +125,7 @@ section { margin-right: 0; } .subhead h1 { - font-size: 45px; + font-size: 54px; } /* Subnav */ @@ -168,10 +168,17 @@ section { color: #333; } .subnav .nav .active a { - background-color: #e5e5e5; + background-color: #e9e9e9; + border-right-color: #ddd; + border-left: 0; + padding-left: 13px; + -webkit-box-shadow: inset 0 3px 5px rgba(0,0,0,.075); + -moz-box-shadow: inset 0 3px 5px rgba(0,0,0,.075); + box-shadow: inset 0 3px 5px rgba(0,0,0,.075); } .subnav .nav li:first-child a { border-left: 0; + padding-left: 12px; } .subnav .nav li:last-child a { border-right: 0; @@ -464,7 +471,6 @@ section { font-family: Menlo, Monaco, "Courier New", monospace; font-size: 12px; color: #d14; - background-color: #f7f7f9; } .download-builder input[type=text]:focus { background-color: #fff; @@ -473,7 +479,6 @@ section { /* Custom, larger checkbox labels */ .download .checkbox { padding: 6px 10px 6px 25px; - font-size: 14px; color: #555; background-color: #f9f9f9; -webkit-border-radius: 3px; @@ -485,10 +490,6 @@ section { color: #333; background-color: #f5f5f5; } -.download .checkbox input[type=checkbox] { - position: relative; - top: 1px; -} .download .checkbox small { font-size: 12px; color: #777; @@ -496,17 +497,23 @@ section { /* Giant download button */ .download-btn { - pading: 18px 20px; - margin: 45px 0; + margin: 36px 0 108px; +} +.download p, +.download h4 { + max-width: 50%; + margin: 0 auto 18px; + color: #999; text-align: center; - border: 1px solid #eee; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; +} +.download-btn h4 { + margin-bottom: 0; } .btn.xlarge { - margin: 36px auto; - padding: 14px 24px; + display: block; + width: auto; + padding: 19px 24px; + margin-bottom: 27px; font-size: 30px; text-align: center; -webkit-border-radius: 6px; -- cgit v1.2.3 From 7ca3b98d885071bc032ca28e20452ad879cea422 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 13:56:44 -0800 Subject: docs fixes --- docs/assets/css/docs.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 739ae1fc4..b70b039f2 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -266,12 +266,12 @@ section { .marketing p { margin-right: 10px; } -.marketing .icon { +.marketing .bs-icon { float: left; margin: 7px 10px 0 0; opacity: .8; } -.marketing .small-icon { +.marketing .small-bs-icon { float: left; margin: 4px 5px 0 0; } @@ -497,7 +497,7 @@ section { /* Giant download button */ .download-btn { - margin: 36px 0 108px; + margin: 36px 0 108px.i; } .download p, .download h4 { -- 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 --- docs/assets/css/docs.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b70b039f2..3265e324f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -172,9 +172,9 @@ section { border-right-color: #ddd; border-left: 0; padding-left: 13px; - -webkit-box-shadow: inset 0 3px 5px rgba(0,0,0,.075); - -moz-box-shadow: inset 0 3px 5px rgba(0,0,0,.075); - box-shadow: inset 0 3px 5px rgba(0,0,0,.075); + -webkit-box-shadow: inset 0 3px 5px rgba(0,0,0,.05); + -moz-box-shadow: inset 0 3px 5px rgba(0,0,0,.05); + box-shadow: inset 0 3px 5px rgba(0,0,0,.05); } .subnav .nav li:first-child a { border-left: 0; -- cgit v1.2.3 From ce467f70915a6846ed0638422114ee35d29aa1cd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 20:11:13 -0800 Subject: consistency in download page heading --- docs/assets/css/docs.css | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 3265e324f..9f21f901f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -30,7 +30,6 @@ body { -webkit-transition: all .2s linear; -moz-transition: all .2s linear; transition: all .2s linear; - } .navbar-fixed .brand:hover { text-decoration: none; -- 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 --- docs/assets/css/docs.css | 50 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 15 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 9f21f901f..d266dd92e 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -50,31 +50,41 @@ section { line-height: 1; } +/* Faded out hr */ +hr.soften { + height: 1px; + margin: 54px 0; + background-image: -webkit-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0)); + background-image: -moz-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0)); + background-image: -ms-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0)); + background-image: -o-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0)); + border: 0; +} + /* Jumbotrons -------------------------------------------------- */ .jumbotron { position: relative; - text-shadow: 0 1px 0 #fff; } .jumbotron h1 { - margin-right: 40%; margin-bottom: 9px; - font-size: 90px; + font-size: 108px; letter-spacing: -1px; line-height: 1; } .jumbotron p { - margin-right: 32%; - margin-bottom: 20px; + margin-bottom: 18px; font-size: 25px; font-weight: 300; line-height: 36px; + color: #333; } .jumbotron .btn-large { font-size: 20px; + font-weight: normal; padding: 14px 24px; - margin-right: 5px; + margin-right: 10px; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -84,9 +94,26 @@ section { color: #999; } +/* Masthead (docs home) */ +.masthead { + padding: 36px 0 0; +} +.masthead h1, +.masthead p { + text-align: center; +} +.masthead h1 { + margin-bottom: 18px; +} +.masthead p { + margin: 0 5% 27px; +} + + /* Benefits list in masthead */ .benefits { - width: 280px; + display: none; + width: 260px; position: absolute; right: 0; bottom: 0; @@ -213,16 +240,9 @@ section { .quick-links { min-height: 30px; padding: 5px 20px; - margin: 45px 0; + margin: 36px 0; list-style: none; text-align: center; - background-color: #eee; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 0 rgba(0,0,0,.03); - -moz-box-shadow: inset 0 1px 0 rgba(0,0,0,.03); - box-shadow: inset 0 1px 0 rgba(0,0,0,.03); overflow: hidden; } .quick-links li { -- cgit v1.2.3 From ef4d0dd7dbd959f830d4cb7976d6a4b061784ec6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 26 Jan 2012 10:12:25 -0800 Subject: space out masthead a git more --- docs/assets/css/docs.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index d266dd92e..27c446d23 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -96,7 +96,8 @@ hr.soften { /* Masthead (docs home) */ .masthead { - padding: 36px 0 0; + padding-top: 36px; + margin-bottom: 72px; } .masthead h1, .masthead p { -- cgit v1.2.3 From 9c1ec6fb98efb72dbf9618e6c332702082dcd622 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 26 Jan 2012 11:40:29 -0800 Subject: updated homepage docs to distill strapline --- docs/assets/css/docs.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 27c446d23..8745d9985 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -69,7 +69,7 @@ hr.soften { } .jumbotron h1 { margin-bottom: 9px; - font-size: 108px; + font-size: 90px; letter-spacing: -1px; line-height: 1; } @@ -108,6 +108,8 @@ hr.soften { } .masthead p { margin: 0 5% 27px; + font-size: 30px; + line-height: 36px; } -- cgit v1.2.3 From b7f22e27ec89049f4347ae5249e97c08eb8d6a2f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 26 Jan 2012 11:47:40 -0800 Subject: more docs homepage adjustments --- docs/assets/css/docs.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 8745d9985..449199ca0 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -69,7 +69,7 @@ hr.soften { } .jumbotron h1 { margin-bottom: 9px; - font-size: 90px; + font-size: 81px; letter-spacing: -1px; line-height: 1; } @@ -107,7 +107,7 @@ hr.soften { margin-bottom: 18px; } .masthead p { - margin: 0 5% 27px; + margin: 0 5% 18px; font-size: 30px; line-height: 36px; } -- cgit v1.2.3 From f398926e4647df1e7e5a2abdbc9e2e9e775eeb34 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 26 Jan 2012 15:22:52 -0800 Subject: move down background iamge --- docs/assets/css/docs.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 449199ca0..2ef413906 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -14,6 +14,7 @@ body { background-color: #fff; background-image: url(../img/grid-18px-masked.png); background-repeat: repeat-x; + background-position: 0 40px; } -- cgit v1.2.3 From c8d2c4e44297d52339216f7e6664d9105ff554a1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 26 Jan 2012 16:45:01 -0800 Subject: fix height of download button --- docs/assets/css/docs.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 2ef413906..6fa20cf4d 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -538,6 +538,7 @@ hr.soften { padding: 19px 24px; margin-bottom: 27px; font-size: 30px; + line-height: 1; text-align: center; -webkit-border-radius: 6px; -moz-border-radius: 6px; -- 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 --- docs/assets/css/bootstrap-responsive.css | 244 +++ docs/assets/css/bootstrap.css | 3037 ++++++++++++++++++++++++++++++ 2 files changed, 3281 insertions(+) create mode 100644 docs/assets/css/bootstrap-responsive.css create mode 100644 docs/assets/css/bootstrap.css (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css new file mode 100644 index 000000000..02b5c099e --- /dev/null +++ b/docs/assets/css/bootstrap-responsive.css @@ -0,0 +1,244 @@ +.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; + opacity: 1; + filter: alpha(opacity=100); + 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: 84px; + } + .offset2 { + margin-left: 148px; + } + .offset3 { + margin-left: 212px; + } + .offset4 { + margin-left: 276px; + } + .offset5 { + margin-left: 340px; + } + .offset6 { + margin-left: 404px; + } + .offset7 { + margin-left: 468px; + } + .offset8 { + margin-left: 532px; + } + .offset9 { + margin-left: 596px; + } + .offset10 { + margin-left: 660px; + } + .offset11 { + margin-left: 724px; + } + .offset12 { + margin-left: 788px; + } +} +/* +@media (min-width: 1210px) { + + // Reset grid variables + @gridColumns: 12; + @gridColumnWidth: 70px; + @gridGutterWidth: 30px; + @siteWidth: 1170px; + + // Bring grid mixins to recalculate widths + .columns(@columns: 1) { + width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)); + } + .offset(@columns: 1) { + margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2); + } + + .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); } + +} +*/ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css new file mode 100644 index 000000000..cd7268bb7 --- /dev/null +++ b/docs/assets/css/bootstrap.css @@ -0,0 +1,3037 @@ +/*! + * 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 22:05:04 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 From 815a2ae9f26f49137382fd4b186d174c7b1b8c5b Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 26 Jan 2012 22:39:17 -0800 Subject: rebuild + copy images to docs when making --- docs/assets/css/bootstrap.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index cd7268bb7..68e161051 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 22:05:04 PST 2012 + * Date: Thu Jan 26 22:39:03 PST 2012 */ article, aside, @@ -1066,7 +1066,7 @@ table .span12 { margin-left: 0; } .icon { - background-image: url(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(img/glyphicons-halflings-sprite-white.png); + background-image: url(../img/glyphicons-halflings-sprite-white.png); } .icon.glass { background-position: 0 0; -- cgit v1.2.3 From aa594501bd24d51181dc3504602aa4aaefb1cb60 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 26 Jan 2012 23:16:02 -0800 Subject: change typeahead to data-source instead of data-data and add to docs --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 68e161051..28f49391b 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 22:39:03 PST 2012 + * Date: Thu Jan 26 23:15:40 PST 2012 */ article, aside, -- cgit v1.2.3 From 942d1b459568acb9f66525f8f6316a252a199e02 Mon Sep 17 00:00:00 2001 From: Burak Tuyan Date: Fri, 27 Jan 2012 16:33:18 +0200 Subject: Updating to latest version of Glyphicons Halflings set (v.1.5) along with some icon enhancements like: - Updated the Gylphicons Halflings set to version 1.5 (30 new icons) - Optimized the sprite PNG files for minimum filesize without any quality loss - Made some fixes for horizontal alignment at the LESS/CSS level (tags, bold, arrow-up, minus, chevron-down) - Made some fixes for vertical alignment at the LESS/CSS level (chevron-down, resize-vertical, resize-horizontal) - Renamed the old "calendar" class as "list-alt" class (because now we've a real calendar icon) - Changed the "background-position" of the icon class to "14px 14px", so that a wrong class name will not be showing the glass icon and instead will show a blank icon (which is useful for just positioning the text after the icons in some cases) - Added new icons (classes) to the base-css Docs (to both HTML file and Mustache template) - Changed one of the button examples to danger style and used a white icon - Renamed the sprite image files to save a few bytes here and there (from glyphicons-halflings-sprite.png to lyphicons-halflings.png and from glyphicons-halflings-sprite-white.png to glyphicons-halflings-white.png) --- docs/assets/css/bootstrap.css | 108 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 99 insertions(+), 9 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 68e161051..c878d70ff 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1066,8 +1066,8 @@ table .span12 { margin-left: 0; } .icon { - background-image: url(../img/glyphicons-halflings-sprite.png); - background-position: 0 0; + background-image: url(../img/glyphicons-halflings.png); + background-position: 14px 14px; background-repeat: no-repeat; display: inline-block; vertical-align: text-top; @@ -1075,10 +1075,10 @@ table .span12 { height: 14px; } .icon.white { - background-image: url(../img/glyphicons-halflings-sprite-white.png); + background-image: url(../img/glyphicons-halflings-white.png); } .icon.glass { - background-position: 0 0; + background-position: 0 0; } .icon.music { background-position: -24px 0; @@ -1170,7 +1170,7 @@ table .span12 { .icon.refresh { background-position: -240px -24px; } -.icon.calendar { +.icon.list-alt { background-position: -264px -24px; } .icon.lock { @@ -1201,7 +1201,7 @@ table .span12 { background-position: 0 -48px; } .icon.tags { - background-position: -24px -48px; + background-position: -25px -48px; } .icon.book { background-position: -48px -48px; @@ -1219,7 +1219,7 @@ table .span12 { background-position: -144px -48px; } .icon.bold { - background-position: -168px -48px; + background-position: -167px -48px; } .icon.italic { background-position: -192px -48px; @@ -1320,11 +1320,41 @@ table .span12 { .icon.arrow-left { background-position: -240px -96px; } +.icon.plus-sign { + background-position: 0 -96px; +} +.icon.minus-sign { + background-position: -24px -96px; +} +.icon.remove-sign { + background-position: -48px -96px; +} +.icon.ok-sign { + background-position: -72px -96px; +} +.icon.question-sign { + background-position: -96px -96px; +} +.icon.info-sign { + background-position: -120px -96px; +} +.icon.screenshot { + background-position: -144px -96px; +} +.icon.remove-circle { + background-position: -168px -96px; +} +.icon.ok-circle { + background-position: -192px -96px; +} +.icon.ban-circle { + background-position: -216px -96px; +} .icon.arrow-right { background-position: -264px -96px; } .icon.arrow-up { - background-position: -288px -96px; + background-position: -289px -96px; } .icon.arrow-down { background-position: -312px -96px; @@ -1342,11 +1372,71 @@ table .span12 { background-position: -408px -96px; } .icon.minus { - background-position: -432px -96px; + background-position: -433px -96px; } .icon.asterisk { background-position: -456px -96px; } +.icon.exclamation-sign { + background-position: 0 -120px; +} +.icon.gift { + background-position: -24px -120px; +} +.icon.leaf { + background-position: -48px -120px; +} +.icon.fire { + background-position: -72px -120px; +} +.icon.eye-open { + background-position: -96px -120px; +} +.icon.eye-close { + background-position: -120px -120px; +} +.icon.warning-sign { + background-position: -144px -120px; +} +.icon.plane { + background-position: -168px -120px; +} +.icon.calendar { + background-position: -192px -120px; +} +.icon.random { + background-position: -216px -120px; +} +.icon.comment { + background-position: -240px -120px; +} +.icon.magnet { + background-position: -264px -120px; +} +.icon.chevron-up { + background-position: -288px -120px; +} +.icon.chevron-down { + background-position: -313px -119px; +} +.icon.retweet { + background-position: -336px -120px; +} +.icon.shopping-cart { + background-position: -360px -120px; +} +.icon.folder-close { + background-position: -384px -120px; +} +.icon.folder-open { + background-position: -409px -120px; +} +.icon.resize-vertical { + background-position: -432px -119px; +} +.icon.resize-horizontal { + background-position: -456px -118px; +} .dropdown { position: relative; } -- cgit v1.2.3 From 9d0328ff00a1fa28f58b3cefa826bed9e21ab580 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 08:21:39 -0800 Subject: adding outline callout as a fallback for IE--needs testing though, thought I already added this --- docs/assets/css/bootstrap.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 68e161051..3a981f94d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 22:39:03 PST 2012 + * Date: Fri Jan 27 08:21:21 PST 2012 */ article, aside, @@ -604,6 +604,9 @@ input:focus, textarea:focus { -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; + outline: 1px dotted #666 \9; + /* IE6-8 */ + } input[type=file]:focus, input[type=checkbox]:focus, select:focus { -webkit-box-shadow: none; @@ -1831,7 +1834,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 f51e703ba6a87ad504682c16b6dd747ebcfd2afb Mon Sep 17 00:00:00 2001 From: Pete Hopkins Date: Fri, 27 Jan 2012 12:16:36 -0500 Subject: Rebuild bootstrap.css --- docs/assets/css/bootstrap.css | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 3a981f94d..4fe86c977 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 27 08:21:21 PST 2012 + * Date: Fri Jan 27 12:16:22 EST 2012 */ article, aside, @@ -887,6 +887,12 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } +.input-append input:first-child { + *margin-left: -160px; +} +.input-append input:first-child + .add-on { + *margin-left: -21px; +} .search-query { padding-left: 14px; padding-right: 14px; @@ -972,6 +978,7 @@ table { .table-bordered { border: 1px solid #ddd; border-collapse: separate; + *border-collapse: collapsed; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -1834,7 +1841,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 { @@ -2448,6 +2455,8 @@ table .span12 { .btn { display: inline-block; padding: 4px 10px 4px; + *padding: 2px 10px; + *margin-left: 4px; font-size: 13px; line-height: 18px; color: #333333; @@ -2470,6 +2479,9 @@ table .span12 { box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); cursor: pointer; } +.btn:first-child { + *margin-left: 0; +} .btn:hover { color: #333333; text-decoration: none; -- cgit v1.2.3 From e8647c1b118d2c726a8987e9a41aad82da972b57 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 13:20:02 -0800 Subject: huuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuge update to doces and stuff --- docs/assets/css/bootstrap-responsive.css | 2 ++ docs/assets/css/bootstrap.css | 23 ++++++++++++----------- docs/assets/css/docs.css | 32 ++++++++++++++++++-------------- 3 files changed, 32 insertions(+), 25 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 02b5c099e..6886105cb 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -111,6 +111,8 @@ @media (min-width: 768px) and (max-width: 940px) { .container { width: 748px; + padding-left: 10px; + padding-right: 10px; } .span1 { width: 44px; diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 4fe86c977..b772e8bbb 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 27 12:16:22 EST 2012 + * Date: Fri Jan 27 13:19:35 PST 2012 */ article, aside, @@ -1791,11 +1791,12 @@ table .span12 { line-height: 1; color: #ffffff; } -.navbar p { - margin: 0; +.navbar .navbar-text { + margin-bottom: 0; line-height: 40px; + color: #999999; } -.navbar p a:hover { +.navbar .navbar-text a:hover { color: #ffffff; background-color: transparent; } @@ -1841,7 +1842,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 { @@ -1870,7 +1871,7 @@ table .span12 { -moz-border-radius: 4px; border-radius: 4px; } -.navbar-fixed { +.navbar-fixed-top { position: fixed; top: 0; right: 0; @@ -1916,7 +1917,7 @@ table .span12 { margin: 0 5px; overflow: hidden; background-color: #222222; - border-right: 1px solid #444; + border-right: 1px solid #333333; } .navbar .nav.pull-right { margin-left: 10px; @@ -2649,7 +2650,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { margin-bottom: 18px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); background-color: #fcf8e3; - border: 1px solid #f3edd2; + border: 1px solid #fbeed5; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -2664,14 +2665,14 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .alert-success { background-color: #dff0d8; - border-color: #cfe8c4; + border-color: #d6e9c6; } .alert-success, .alert-success .alert-heading { color: #468847; } .alert-danger, .alert-error { background-color: #f2dede; - border-color: #e9c7c7; + border-color: #eed3d7; } .alert-danger, .alert-error, @@ -2681,7 +2682,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .alert-info { background-color: #d9edf7; - border-color: #bfe1f2; + border-color: #bce8f1; } .alert-info, .alert-info .alert-heading { color: #3a87ad; diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 6fa20cf4d..19356df1a 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -20,7 +20,7 @@ body { /* Tweak navbar brand link to be super sleek -------------------------------------------------- */ -.navbar-fixed .brand { +.navbar-fixed-top .brand { padding-right: 0; padding-left: 0; margin-left: 20px; @@ -32,7 +32,7 @@ body { -moz-transition: all .2s linear; transition: all .2s linear; } -.navbar-fixed .brand:hover { +.navbar-fixed-top .brand:hover { text-decoration: none; } @@ -302,14 +302,9 @@ hr.soften { /* Quickstart section for getting le code -------------------------------------------------- */ -.getting-started h3, -.getting-started p { - line-height: 18px; - text-align: center; - margin-bottom: 9px; -} .getting-started p { color: #777; + margin-bottom: 9px; } .getting-started .current-version, .getting-started .current-version a { @@ -322,14 +317,12 @@ hr.soften { display: block; width: 95%; height: auto; - margin-left: auto; - margin-right: auto; font-family: Menlo, Monaco, "Courier New", monospace; font-size: 12px; line-height: 20px; white-space: nowrap; overflow: hidden; - background-color: #f5f5f5; + color: #999; /* Makes inputs behave like true block-level elements */ -webkit-box-sizing: border-box; /* Older Webkit */ -moz-box-sizing: border-box; /* Older FF */ @@ -339,6 +332,9 @@ hr.soften { *width: 80%; *height: 24px; } +.getting-started textarea:focus { + color: #333; +} /* Footer @@ -476,7 +472,7 @@ hr.soften { margin-top: 36px; } .page-header .toggle-all { - margin-top: 13px; + margin-top: 5px; } /* Space out h3s when following a section */ @@ -518,6 +514,11 @@ hr.soften { color: #777; } +/* Variables section */ +#variables label { + margin-bottom: 0; +} + /* Giant download button */ .download-btn { margin: 36px 0 108px.i; @@ -525,13 +526,16 @@ hr.soften { .download p, .download h4 { max-width: 50%; - margin: 0 auto 18px; + margin: 0 auto; color: #999; text-align: center; } -.download-btn h4 { +.download h4 { margin-bottom: 0; } +.download p { + margin-bottom: 18px; +} .btn.xlarge { display: block; width: auto; -- cgit v1.2.3 From a0b40b361a59987c98688fafae05d2eb68b659db Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 13:35:25 -0800 Subject: i18n download page --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 4f1e18ce9..6c630c35e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 27 13:20:51 PST 2012 + * Date: Fri Jan 27 13:35:16 PST 2012 */ article, aside, -- cgit v1.2.3 From d7b8a9c9303f1f1bd69ae02f74bb17aaa87a2ceb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 13:36:08 -0800 Subject: align text in buttons so folks can easily make them different widths --- docs/assets/css/bootstrap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 6c630c35e..9c8aaee5a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 27 13:35:16 PST 2012 + * Date: Fri Jan 27 13:35:54 PST 2012 */ article, aside, @@ -2461,6 +2461,7 @@ table .span12 { font-size: 13px; line-height: 18px; color: #333333; + text-align: center; 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)); -- cgit v1.2.3 From 6fd1e9f4c0903ae4ff4f57bd3cb193ee0ed2b9ad Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Fri, 27 Jan 2012 13:36:31 -0800 Subject: rebuil update layout --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 4f1e18ce9..b365ad0f4 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 27 13:20:51 PST 2012 + * Date: Fri Jan 27 13:34:19 PST 2012 */ article, aside, @@ -1842,7 +1842,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 b1f38bbea85c313f1a9512c821de1255e2a0d537 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 13:39:19 -0800 Subject: update icon examples to show icons in differently sized buttons --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9c8aaee5a..0783aa7ee 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 27 13:35:54 PST 2012 + * Date: Fri Jan 27 13:38:50 PST 2012 */ article, aside, -- cgit v1.2.3 From 84b9a1bfb6ff5d1406f5c0393d6556caff6de40c Mon Sep 17 00:00:00 2001 From: Pete Hopkins Date: Fri, 27 Jan 2012 16:39:38 -0500 Subject: Rebuild css and html --- docs/assets/css/bootstrap.css | 58 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 8 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b2284bc16..e36ec0b3c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 27 11:07:13 PST 2012 + * Date: Fri Jan 27 16:39:29 EST 2012 */ article, aside, @@ -814,6 +814,10 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec } .help-inline { display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; margin-bottom: 9px; vertical-align: middle; padding-left: 5px; @@ -1083,6 +1087,10 @@ table .span12 { vertical-align: text-top; width: 14px; height: 14px; + *margin-right: .3em; +} +.icon:last-child { + *margin-left: 0; } .icon.white { background-image: url(../img/glyphicons-halflings-sprite-white.png); @@ -1360,11 +1368,15 @@ table .span12 { .dropdown { position: relative; } +.dropdown .dropdown-toggle { + *margin-bottom: -3px; +} .caret { display: inline-block; width: 0; height: 0; text-indent: -99999px; + *text-indent: 0; vertical-align: top; border-left: 4px solid transparent; border-right: 4px solid transparent; @@ -1376,7 +1388,6 @@ table .span12 { .dropdown .caret { margin-top: 8px; margin-left: 2px; - *margin-top: 7px; } .dropdown:hover .caret, .open.dropdown .caret { opacity: 1; @@ -1385,6 +1396,7 @@ table .span12 { .dropdown-menu { position: absolute; top: 100%; + left: 0; z-index: 1000; float: left; display: none; @@ -1408,7 +1420,6 @@ table .span12 { -webkit-background-clip: padding-box; -moz-background-clip: padding; background-clip: padding-box; - zoom: 1; *border-right-width: 2px; *border-bottom-width: 2px; } @@ -1423,6 +1434,8 @@ table .span12 { overflow: hidden; background-color: #e5e5e5; border-bottom: 1px solid #ffffff; + *width: 100%; + *margin: -5px 0 5px; } .dropdown-menu a { display: block; @@ -1438,6 +1451,9 @@ table .span12 { text-decoration: none; background-color: #0088cc; } +.dropdown.open { + *z-index: 1000; +} .dropdown.open .dropdown-toggle { color: #ffffff; background: #ccc; @@ -1742,6 +1758,7 @@ table .span12 { } .tabs-left .tabs .active > a, .tabs-left .tabs .active > a:hover { border-color: #ddd transparent #ddd #ddd; + *border-right-color: #ffffff; } .tabs-right .tabs { float: right; @@ -1759,6 +1776,7 @@ table .span12 { } .tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover { border-color: #ddd #ddd #ddd transparent; + *border-left-color: #ffffff; } .navbar { overflow: visible; @@ -1826,7 +1844,7 @@ table .span12 { line-height: 1; color: #ffffff; color: rgba(255, 255, 255, 0.75); - background: #444; + background: #6a6a6a; 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); @@ -2455,8 +2473,6 @@ table .span12 { .btn { display: inline-block; padding: 4px 10px 4px; - *padding: 2px 10px; - *margin-left: 4px; font-size: 13px; line-height: 18px; color: #333333; @@ -2478,6 +2494,7 @@ 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; + *margin-left: .3em; } .btn:first-child { *margin-left: 0; @@ -2525,7 +2542,7 @@ table .span12 { box-shadow: none; } .btn.large { - padding: 9px 14px 9px; + padding: 9px 14px; font-size: 15px; line-height: normal; -webkit-border-radius: 5px; @@ -2536,20 +2553,33 @@ table .span12 { margin-top: 1px; } .btn.small { - padding: 5px 9px 5px; + padding: 5px 9px; font-size: 11px; line-height: 16px; } .btn.small .icon { margin-top: -2px; } +button.btn, input[type=submit].btn { + *padding-top: 2px; + *padding-bottom: 2px; +} button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { padding: 0; border: 0; } +button.btn.large, input[type=submit].btn.large { + *padding-top: 7px; + *padding-bottom: 7px; +} +button.btn.small, input[type=submit].btn.small { + *padding-top: 3px; + *padding-bottom: 3px; +} .btn-group { position: relative; *zoom: 1; + *margin-left: .3em; } .btn-group:before, .btn-group:after { display: table; @@ -2558,11 +2588,18 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .btn-group:after { clear: both; } +.btn-group:first-child { + *margin-left: 0; +} .btn-group + .btn-group { margin-left: 5px; } .btn-toolbar .btn-group { display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; } .btn-group .btn { position: relative; @@ -2615,6 +2652,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -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); + *padding-top: 5px; + *padding-bottom: 5px; +} +.btn-group.open { + *z-index: 1000; } .btn-group.open .dropdown-menu { display: block; -- cgit v1.2.3 From 3807a88ee9ba33f27bc8762efd789f7ff710ed1a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 13:56:50 -0800 Subject: update the docs for icons --- docs/assets/css/bootstrap.css | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index cf2f1b59f..10faa36c0 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 27 13:43:19 PST 2012 + * Date: Fri Jan 27 13:54:49 PST 2012 */ article, aside, @@ -1088,7 +1088,7 @@ table .span12 { background-image: url(../img/glyphicons-halflings-white.png); } .icon.glass { - background-position: 0 0; + background-position: 0 0; } .icon.music { background-position: -24px 0; @@ -1327,23 +1327,20 @@ table .span12 { .icon.chevron-right { background-position: -456px -72px; } -.icon.arrow-left { - background-position: -240px -96px; -} .icon.plus-sign { background-position: 0 -96px; } .icon.minus-sign { - background-position: -24px -96px; + background-position: -24px -96px; } .icon.remove-sign { - background-position: -48px -96px; + background-position: -48px -96px; } .icon.ok-sign { - background-position: -72px -96px; + background-position: -72px -96px; } .icon.question-sign { - background-position: -96px -96px; + background-position: -96px -96px; } .icon.info-sign { background-position: -120px -96px; @@ -1360,6 +1357,9 @@ table .span12 { .icon.ban-circle { background-position: -216px -96px; } +.icon.arrow-left { + background-position: -240px -96px; +} .icon.arrow-right { background-position: -264px -96px; } @@ -1391,16 +1391,16 @@ table .span12 { background-position: 0 -120px; } .icon.gift { - background-position: -24px -120px; + background-position: -24px -120px; } .icon.leaf { - background-position: -48px -120px; + background-position: -48px -120px; } .icon.fire { - background-position: -72px -120px; + background-position: -72px -120px; } .icon.eye-open { - background-position: -96px -120px; + background-position: -96px -120px; } .icon.eye-close { background-position: -120px -120px; @@ -1439,7 +1439,7 @@ table .span12 { background-position: -384px -120px; } .icon.folder-open { - background-position: -409px -120px; + background-position: -408px -120px; } .icon.resize-vertical { background-position: -432px -119px; -- cgit v1.2.3 From 003da1e089edf06c528667009fb59189b5f0e4cc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 14:21:17 -0800 Subject: fix inputs in navbar --- docs/assets/css/bootstrap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 10faa36c0..5ebfba675 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 27 13:54:49 PST 2012 + * Date: Fri Jan 27 14:21:03 PST 2012 */ article, aside, @@ -1901,6 +1901,7 @@ table .span12 { } .navbar-form input, .navbar-form select { display: inline-block; + margin-top: 5px; margin-bottom: 0; } .navbar-search { -- cgit v1.2.3 From 748696a5532100f7a45cbb0d6a138fae6afac5cb Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Fri, 27 Jan 2012 14:44:05 -0800 Subject: add missing paren --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index db6df3a19..176238fc6 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 27 13:37:10 PST 2012 + * Date: Fri Jan 27 14:44:00 PST 2012 */ article, aside, -- cgit v1.2.3 From 22359f9dfdf5d513da163416005345649415b90f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 14:48:35 -0800 Subject: update examples and restore icons --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5ebfba675..7765d7961 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 27 14:21:03 PST 2012 + * Date: Fri Jan 27 14:48:21 PST 2012 */ article, aside, -- cgit v1.2.3 From 800d0b24e08dec4835e7f4126701428c5c5bae2c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 15:28:09 -0800 Subject: remove page-header from docs and add to type.less --- docs/assets/css/bootstrap.css | 10 +++++++++- docs/assets/css/docs.css | 8 -------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 39ac62f7a..2ae5325b2 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 27 14:48:53 PST 2012 + * Date: Fri Jan 27 15:27:51 PST 2012 */ article, aside, @@ -316,6 +316,14 @@ h6 { color: #999999; text-transform: uppercase; } +.page-header { + padding-bottom: 17px; + margin: 18px 0; + border-bottom: 1px solid #eeeeee; +} +.page-header h1 { + line-height: 1; +} ul, ol { padding: 0; margin: 0 0 9px 25px; diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 19356df1a..bc3c97106 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -42,14 +42,6 @@ body { section { padding-top: 60px; } -.page-header { - margin: 18px 0; - border-bottom: 1px solid #eee; -} -.page-header h1 { - margin-bottom: 17px; - line-height: 1; -} /* Faded out hr */ hr.soften { -- cgit v1.2.3 From f6dc566963c63d5113e72f0098ad9da2c414f33f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 16:26:55 -0800 Subject: overhaul navbar behavior in responsive css --- docs/assets/css/bootstrap-responsive.css | 150 ++++++++++++++++++------------- docs/assets/css/bootstrap.css | 4 +- docs/assets/css/docs.css | 37 +++++--- 3 files changed, 118 insertions(+), 73 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 6886105cb..8b1d98b5c 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -3,60 +3,6 @@ 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; - opacity: 1; - filter: alpha(opacity=100); - 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; @@ -88,12 +34,6 @@ } } @media (max-width: 768px) { - .navbar-fixed { - position: absolute; - } - .navbar-fixed .nav { - float: none; - } .container { width: auto; padding: 0 20px; @@ -187,6 +127,96 @@ margin-left: 788px; } } +@media (max-width: 940px) { + body { + padding-top: 0; + } + .navbar-fixed-top { + position: static; + margin-bottom: 36px; + } + .navbar-inner { + padding: 10px; + background-image: none; + } + .navbar .container { + padding: 0; + } + .navbar .brand { + float: none; + display: block; + padding-left: 15px; + padding-right: 15px; + margin: 0; + } + .navbar .nav { + float: none; + margin: 9px 0; + } + .navbar .nav > li { + float: none; + } + .navbar .nav > li > a { + margin-bottom: 2px; + } + .navbar .nav > .vertical-divider { + display: none; + } + .navbar .nav > li > a, .navbar .dropdown-menu a { + padding: 6px 15px; + font-weight: bold; + color: #999999; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + } + .navbar .dropdown-menu li + li a { + margin-bottom: 2px; + } + .navbar .nav > li > a:hover, .navbar .dropdown-menu a:hover { + background-color: #222222; + } + .navbar .dropdown-menu { + position: static; + display: block; + float: none; + max-width: none; + margin: 0 15px; + padding: 0; + background-color: transparent; + border: none; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + } + .navbar .dropdown-menu:before, .navbar .dropdown-menu:after { + display: none; + } + .navbar .dropdown-menu .divider { + display: none; + } + .navbar-form, .navbar-search { + float: none; + padding: 9px 15px; + margin: 9px 0; + border-top: 1px solid #222222; + border-bottom: 1px solid #222222; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + } + .navbar .nav.pull-right { + float: none; + margin-left: 0; + } + .navbar-static .navbar-inner { + padding-left: 10px; + padding-right: 10px; + } +} /* @media (min-width: 1210px) { diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 2ae5325b2..fb95729d9 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 27 15:27:51 PST 2012 + * Date: Fri Jan 27 16:25:59 PST 2012 */ article, aside, @@ -2004,7 +2004,7 @@ table .span12 { color: #ffffff; text-decoration: none; } -.navbar .nav .active > a { +.navbar .nav .active > a, .navbar .nav .active > a:hover { color: #ffffff; text-decoration: none; background-color: #222222; diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index bc3c97106..cf4b1962f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -723,6 +723,11 @@ form.well { @media (max-width: 768px) { + /* Remove any padding from the body */ + body { + padding-top: 0; + } + /* Subnav */ .subnav { position: static; @@ -745,13 +750,6 @@ form.well { border-top: 1px solid #e5e5e5; } - /* Adjust the jumbotron */ - .jumbotron .benefits { - position: relative; - width: auto; - margin: 36px 0; - } - /* Popovers */ .large-bird { display: none; @@ -787,9 +785,14 @@ form.well { .jumbotron h1 { font-size: 54px; } + .masthead p { + font-size: 25px; + line-height: 36px; + } .jumbotron h1, .jumbotron p { margin-right: 0; + margin-left: 0; } } @@ -797,15 +800,27 @@ form.well { @media (min-width: 768px) and (max-width: 940px) { + /* Remove any padding from the body */ + body { + padding-top: 0; + } + /* Scale down the jumbotron content */ .jumbotron h1 { font-size: 72px; } - /* Provide enough space on right-hand side for benefits list */ - .jumbotron h1, - .jumbotron p { - margin-right: 40%; +} + +@media (max-width: 940px) { + + /* Unfloat brand */ + .navbar-fixed-top .brand { + float: none; + margin-left: 0; + padding-left: 15px; + padding-right: 15px; } + } -- cgit v1.2.3 From 997fc33af9a4cbdc078e85ee491f777d0dd2d51a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 16:40:14 -0800 Subject: clean up use of mixins to highlight them appropriately in your fav editor --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b87a1c804..de895021a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 27 16:35:26 PST 2012 + * Date: Fri Jan 27 16:39:57 PST 2012 */ article, aside, @@ -1944,7 +1944,7 @@ table .span12 { line-height: 1; color: #ffffff; color: rgba(255, 255, 255, 0.75); - background: #6a6a6a; + background: #666; 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); -- cgit v1.2.3 From 7e72eb5063470a3728d612acd2cc0368aabc8664 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 18:33:25 -0800 Subject: new tab focus style and mixin --- docs/assets/css/bootstrap.css | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index de895021a..a6dd95e84 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 27 16:39:57 PST 2012 + * Date: Fri Jan 27 18:33:07 PST 2012 */ article, aside, @@ -35,6 +35,11 @@ html { } a:focus { outline: thin dotted; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; + -moz-outline: 5px auto -moz-mac-focusring; + -moz-outline-radius: 6px; + -moz-outline-offset: 0; } a:hover, a:active { outline: 0; @@ -611,8 +616,7 @@ input:focus, textarea:focus { -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; - outline: 1px dotted #666 \9; + outline: thin dotted \9; /* IE6-8 */ } @@ -620,7 +624,12 @@ 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; + outline: thin dotted; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; + -moz-outline: 5px auto -moz-mac-focusring; + -moz-outline-radius: 6px; + -moz-outline-offset: 0; } .input-mini { width: 60px; @@ -2612,7 +2621,12 @@ table .span12 { transition: background-position 0.1s linear; } .btn:focus { - outline: 1px dotted #666; + outline: thin dotted; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; + -moz-outline: 5px auto -moz-mac-focusring; + -moz-outline-radius: 6px; + -moz-outline-offset: 0; } .btn.active, .btn:active { background-image: none; -- cgit v1.2.3 From aaa530c27e387ff266345aee026b50f779be88bc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 18:44:17 -0800 Subject: combined .disabled and [disabled] and confirmed in ie7/8 --- docs/assets/css/bootstrap.css | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index a6dd95e84..80f078be7 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 27 18:33:07 PST 2012 + * Date: Fri Jan 27 18:43:22 PST 2012 */ article, aside, @@ -2498,9 +2498,7 @@ table .span12 { .btn.primary:hover, .btn.primary:active, .btn.primary.active, -.btn.primary.disabled { - background-color: #0055cc; -} +.btn.primary.disabled, .btn.primary[disabled] { background-color: #0055cc; } @@ -2522,9 +2520,7 @@ table .span12 { .btn.danger:hover, .btn.danger:active, .btn.danger.active, -.btn.danger.disabled { - background-color: #c43c35; -} +.btn.danger.disabled, .btn.danger[disabled] { background-color: #c43c35; } @@ -2546,9 +2542,7 @@ table .span12 { .btn.success:hover, .btn.success:active, .btn.success.active, -.btn.success.disabled { - background-color: #57a957; -} +.btn.success.disabled, .btn.success[disabled] { background-color: #57a957; } @@ -2570,9 +2564,7 @@ table .span12 { .btn.info:hover, .btn.info:active, .btn.info.active, -.btn.info.disabled { - background-color: #339bb9; -} +.btn.info.disabled, .btn.info[disabled] { background-color: #339bb9; } @@ -2636,17 +2628,7 @@ table .span12 { 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] { +.btn.disabled, .btn[disabled] { cursor: default; background-image: none; background-color: #e6e6e6; -- cgit v1.2.3 From 7fc6e12b79a8ba445e41db00627530b06544bfde Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 18:49:00 -0800 Subject: comment icons that are 1px off --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 80f078be7..790f98340 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 27 18:43:22 PST 2012 + * Date: Fri Jan 27 18:48:54 PST 2012 */ article, aside, @@ -1209,7 +1209,7 @@ table .span12 { background-position: -264px -24px; } .icon.lock { - background-position: -288px -24px; + background-position: -287px -24px; } .icon.flag { background-position: -312px -24px; -- cgit v1.2.3 From d02c6957d44761c35121cb88af727802ce4d9e5e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 19:49:56 -0800 Subject: fixing up buttons and examples of implementing icons --- docs/assets/css/bootstrap.css | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 790f98340..6eff3a589 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 27 18:48:54 PST 2012 + * Date: Fri Jan 27 19:45:56 PST 2012 */ article, aside, @@ -2691,6 +2691,10 @@ button.btn.small, input[type=submit].btn.small { .btn-group + .btn-group { margin-left: 5px; } +.btn-toolbar { + margin-top: 9px; + margin-bottom: 9px; +} .btn-toolbar .btn-group { display: inline-block; *display: inline; @@ -2769,9 +2773,13 @@ button.btn.small, input[type=submit].btn.small { 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-top: 7px; margin-left: 0; } +.btn:hover .caret, .open.btn-group .caret { + opacity: 1; + filter: alpha(opacity=100); +} .primary .caret, .danger .caret, .info .caret, -- cgit v1.2.3 From 0fa642291843fbeab66960c6fc635681c1241586 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 19:57:53 -0800 Subject: icon spacing in small buttons and nav lists --- docs/assets/css/bootstrap.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 6eff3a589..c1562c203 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 27 19:45:56 PST 2012 + * Date: Fri Jan 27 19:56:12 PST 2012 */ article, aside, @@ -1673,6 +1673,9 @@ table .span12 { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); background-color: #0088cc; } +.nav.list .icon { + margin-right: 2px; +} .tabs, .pills { *zoom: 1; } @@ -2655,7 +2658,7 @@ table .span12 { line-height: 16px; } .btn.small .icon { - margin-top: -2px; + margin-top: -1px; } button.btn, input[type=submit].btn { *padding-top: 2px; -- cgit v1.2.3 From 9800196bf7067b560e062dabfcb51f9b9c7e8dd5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 20:05:03 -0800 Subject: use quotes on attr selectors more consistently --- docs/assets/css/bootstrap.css | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c1562c203..ff7f8ea5e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 27 19:56:12 PST 2012 + * Date: Fri Jan 27 20:04:50 PST 2012 */ article, aside, @@ -528,7 +528,7 @@ select, label input, label textarea, label select { display: block; } -input[type=image], input[type=checkbox], input[type=radio] { +input[type="image"], input[type="checkbox"], input[type="radio"] { width: auto; height: auto; padding: 0; @@ -543,7 +543,7 @@ input[type=image], input[type=checkbox], input[type=radio] { -moz-border-radius: 0; border-radius: 0; } -input[type=file] { +input[type="file"] { padding: initial; line-height: initial; border: initial; @@ -553,11 +553,11 @@ input[type=file] { -moz-box-shadow: none; box-shadow: none; } -input[type=button], input[type=reset], input[type=submit] { +input[type="button"], input[type="reset"], input[type="submit"] { width: auto; height: auto; } -select, input[type=file] { +select, input[type="file"] { height: 28px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ @@ -573,7 +573,7 @@ select { select[multiple], select[size] { height: auto; } -input[type=image] { +input[type="image"] { -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; @@ -581,13 +581,13 @@ input[type=image] { textarea { height: auto; } -input[type=hidden] { +input[type="hidden"] { display: none; } .radio, .checkbox { padding-left: 18px; } -.radio input[type=radio], .checkbox input[type=checkbox] { +.radio input[type="radio"], .checkbox input[type="checkbox"] { float: left; margin-left: -18px; } @@ -620,7 +620,7 @@ input:focus, textarea:focus { /* IE6-8 */ } -input[type=file]:focus, input[type=checkbox]:focus, select:focus { +input[type="file"]:focus, input[type="checkbox"]:focus, select:focus { -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; @@ -2660,19 +2660,19 @@ table .span12 { .btn.small .icon { margin-top: -1px; } -button.btn, input[type=submit].btn { +button.btn, input[type="submit"].btn { *padding-top: 2px; *padding-bottom: 2px; } -button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { +button.btn::-moz-focus-inner, input[type="submit"].btn::-moz-focus-inner { padding: 0; border: 0; } -button.btn.large, input[type=submit].btn.large { +button.btn.large, input[type="submit"].btn.large { *padding-top: 7px; *padding-bottom: 7px; } -button.btn.small, input[type=submit].btn.small { +button.btn.small, input[type="submit"].btn.small { *padding-top: 3px; *padding-bottom: 3px; } -- cgit v1.2.3 From 4e191c423d2d1e834a4cb57ae246d03a82272ee4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 20:17:03 -0800 Subject: update progress bars to have a solid edge until 100% filled --- docs/assets/css/bootstrap.css | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index ff7f8ea5e..861ef9141 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 27 20:04:50 PST 2012 + * Date: Fri Jan 27 20:16:25 PST 2012 */ article, aside, @@ -2926,12 +2926,8 @@ a.thumbnail:hover { background-position: 40px 0; } } -.progress, .progress .bar { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} .progress { + overflow: hidden; height: 18px; margin-bottom: 18px; background-color: #f7f7f7; @@ -2945,6 +2941,9 @@ a.thumbnail:hover { -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); + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } .progress .bar { width: 0%; -- cgit v1.2.3 From 15d3a4797f3435d1531804369df87fa4e574b874 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Fri, 27 Jan 2012 21:06:09 -0800 Subject: simplify build process more - remove really annoying date. --- docs/assets/css/bootstrap-responsive.css | 2 +- docs/assets/css/bootstrap.css | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 8b1d98b5c..acebb64d3 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -273,4 +273,4 @@ .offset12 { .offset(12); } } -*/ +*/ \ No newline at end of file diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 861ef9141..fc0481807 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,6 @@ * 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 27 20:16:25 PST 2012 */ article, aside, @@ -1971,7 +1970,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 3934d1b6c4cb975967235547b77e90b4c8c91be2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 21:08:04 -0800 Subject: rgba text color on active buttons for a bit more contrast from their non-active siblings --- docs/assets/css/bootstrap.css | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 861ef9141..002c937a0 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * 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 27 20:16:25 PST 2012 + * Date: Fri Jan 27 21:07:37 PST 2012 */ article, aside, @@ -2486,6 +2486,12 @@ table .span12 { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); color: #ffffff; } +.btn.primary.active, +.btn.danger.active, +.btn.success.active, +.btn.info.active { + color: rgba(255, 255, 255, 0.75); +} .btn.primary { background-color: #0074cc; background-image: -moz-linear-gradient(top, #0088cc, #0055cc); @@ -2630,6 +2636,7 @@ table .span12 { 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; + color: rgba(0, 0, 0, 0.5); } .btn.disabled, .btn[disabled] { cursor: default; @@ -2747,7 +2754,10 @@ button.btn.small, input[type="submit"].btn.small { -moz-border-radius-bottomright: 6px; border-bottom-right-radius: 6px; } -.btn-group .btn:hover, .btn-group .btn:focus, .btn-group .btn:active { +.btn-group .btn:hover, +.btn-group .btn:focus, +.btn-group .btn:active, +.btn-group .btn.active { z-index: 2; } .btn-group .dropdown-toggle { -- cgit v1.2.3 From 78120edf728ede35f2338b42ae30fff1bd7f086e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 21:20:58 -0800 Subject: add clearfix to control-group for longer labels and any other unforeseen circumstances --- docs/assets/css/bootstrap.css | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0ad058814..c097c8f58 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -951,6 +951,14 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec } .form-horizontal .control-group { margin-bottom: 18px; + *zoom: 1; +} +.form-horizontal .control-group:before, .form-horizontal .control-group:after { + display: table; + content: ""; +} +.form-horizontal .control-group:after { + clear: both; } .form-horizontal .control-group > label { float: left; -- cgit v1.2.3 From ad78caa72639aa377caf584efc26fe7a5682b15c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 21:25:35 -0800 Subject: fix right aligned dropdowns in navbar by adding left: auto; to nix default alignment --- docs/assets/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c097c8f58..d9e8213dc 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2100,6 +2100,7 @@ table .span12 { color: #ffffff; } .navbar .nav.pull-right .dropdown-menu { + left: auto; right: 0; } .navbar .nav.pull-right .dropdown-menu:before { -- cgit v1.2.3 From e726b231ba0c0c0effb13c9458842d64bda0e58c Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Fri, 27 Jan 2012 21:59:06 -0800 Subject: add toggle to docs for popover/tooltip --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d9e8213dc..ebe480eec 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1978,7 +1978,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 cb8606f2c84adb57c82dd7bd401574a2376ff952 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 22:52:45 -0800 Subject: adding wells and close icon to the docs under misc in components, with a new subnav style --- docs/assets/css/docs.css | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index cf4b1962f..5a6bd971f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -154,7 +154,6 @@ hr.soften { .subnav { width: 100%; height: 36px; - overflow: hidden; background-color: #eeeeee; /* Old browsers */ background-repeat: repeat-x; /* Repeat the gradient */ background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */ @@ -172,37 +171,39 @@ hr.soften { .subnav .nav { margin-bottom: 0; } -.subnav .nav a { +.subnav .nav > li > a { margin: 0; padding-top: 11px; padding-bottom: 11px; font-size: 13px; - color: #777; + text-shadow: 0 1px 0 rgba(255,255,255,.5); border-left: 1px solid #f5f5f5; border-right: 1px solid #e5e5e5; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } -.subnav .nav a:hover, -.subnav .nav .active a { - background-color: transparent; - color: #333; -} -.subnav .nav .active a { +.subnav .nav > .active > a, +.subnav .nav > .active > a:hover { + padding-left: 13px; + color: #777; background-color: #e9e9e9; border-right-color: #ddd; border-left: 0; - padding-left: 13px; -webkit-box-shadow: inset 0 3px 5px rgba(0,0,0,.05); -moz-box-shadow: inset 0 3px 5px rgba(0,0,0,.05); box-shadow: inset 0 3px 5px rgba(0,0,0,.05); } -.subnav .nav li:first-child a { +.subnav .nav > .active > a .caret, +.subnav .nav > .active > a:hover .caret { + border-top-color: #777; +} +.subnav .nav > li:first-child > a, +.subnav .nav > li:first-child > a:hover { border-left: 0; padding-left: 12px; } -.subnav .nav li:last-child a { +.subnav .nav > li:last-child > a { border-right: 0; } -- cgit v1.2.3 From 7a756168b52f5bd0af2aedd629379a80e8682c14 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 22:56:48 -0800 Subject: fix regression in textarea shadows --- docs/assets/css/bootstrap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index ebe480eec..7be53d91f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -615,6 +615,7 @@ input:focus, textarea:focus { -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; outline: thin dotted \9; /* IE6-8 */ @@ -1978,7 +1979,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 ce69b70719581f87e2542710fa92fa4163acefc7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 23:53:56 -0800 Subject: give append/prepend inputs higher z-index on focus --- docs/assets/css/bootstrap.css | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7be53d91f..7a5568041 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -861,6 +861,13 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } +.input-prepend input:focus, +.input-append input:focus, +.input-prepend .uneditable-input:focus, +.input-append .uneditable-input:focus { + position: relative; + z-index: 2; +} .input-prepend .uneditable-input, .input-append .uneditable-input { border-left-color: #ccc; } -- cgit v1.2.3 From d448e6921e6fc39e4fe7f484da004b2196517478 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 00:23:30 -0800 Subject: rewrite the code section of the type docs --- docs/assets/css/docs.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 5a6bd971f..d13686ea7 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -681,6 +681,7 @@ form.well { } .jumbotron p { margin-right: 0; + margin-left: 0; font-size: 18px; line-height: 24px; } @@ -695,6 +696,10 @@ form.well { .quick-links { margin: 40px 0 0; } + .quick-links li { + margin-top: 5px; + margin-bottom: 5px; + } /* hide the bullets on mobile since our horizontal space is limited */ .quick-links .divider { display: none; @@ -744,7 +749,7 @@ form.well { .subnav .nav > li { float: none; } - .subnav .nav a { + .subnav .nav > li > a { border: 0; } .subnav .nav li + li a { -- cgit v1.2.3 From 963e5e0eda465f3718381fb8c02f69269b51afeb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 00:27:49 -0800 Subject: scope subnav link styles to first child, and no dropdowns --- docs/assets/css/docs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index d13686ea7..061a231df 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -752,7 +752,7 @@ form.well { .subnav .nav > li > a { border: 0; } - .subnav .nav li + li a { + .subnav .nav > li + li a { border-top: 1px solid #e5e5e5; } -- cgit v1.2.3 From 342a99f1d01edfa20d744781cbecffcd4239fa39 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 00:29:38 -0800 Subject: block level page-header h1 small for readability on 480px and under --- docs/assets/css/bootstrap-responsive.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index acebb64d3..3936d8c20 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -3,6 +3,10 @@ visibility: hidden; } @media (max-width: 480px) { + .page-header h1 small { + display: block; + line-height: 18px; + } .form-horizontal .control-group > label { float: none; width: auto; -- cgit v1.2.3 From cc01d3c367a26bfed36c9eabbf074dccc8570dfa Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 00:31:55 -0800 Subject: extend block level smalls to h2s in docs --- docs/assets/css/docs.css | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 061a231df..41029ded1 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -657,14 +657,13 @@ form.well { } /* Change up some type stuff */ - h1 small { - display: block; - line-height: 20px; - } - /* More space between sections */ h2 { margin-top: 27px; } + h2 small { + display: block; + line-height: 18px; + } h3 { margin-top: 18px; } -- cgit v1.2.3 From 4737d693e00989a0f90f832a7c8f4f784df14077 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 28 Jan 2012 00:36:37 -0800 Subject: remove quick start section to simplify landing page + start rewriting application js to work ie7 --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7a5568041..cd0d620bf 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1986,7 +1986,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 967030cb532c642f076d1e1fc4e5a1e2cee18561 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 00:39:22 -0800 Subject: modal refinements in docs and general responsiveness --- docs/assets/css/bootstrap-responsive.css | 7 ++++--- docs/assets/css/docs.css | 9 +++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 3936d8c20..e48a234f9 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -24,9 +24,9 @@ } .modal { position: absolute; - top: 20px; - left: 20px; - right: 20px; + top: 10px; + left: 10px; + right: 10px; width: auto; margin: 0; } @@ -35,6 +35,7 @@ } .modal-header .close { padding: 10px; + margin: -10px; } } @media (max-width: 768px) { diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 41029ded1..0b221e3b2 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -723,6 +723,15 @@ form.well { word-wrap: break-word; word-break: break-all; } + + /* Modal example */ + .modal-example .modal { + position: relative; + top: auto; + right: auto; + bottom: auto; + left: auto; + } } -- cgit v1.2.3 From f1851ab1338938bf6315e223789e345f20cfb4b1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 00:43:25 -0800 Subject: change text on js docs page to improve rendering on iphone, update responsive for carousel considerations --- docs/assets/css/bootstrap-responsive.css | 3 +++ docs/assets/css/bootstrap.css | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index e48a234f9..e91f25539 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -37,6 +37,9 @@ padding: 10px; margin: -10px; } + .carousel-caption { + position: static; + } } @media (max-width: 768px) { .container { diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index cd0d620bf..7a5568041 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1986,7 +1986,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 d4659521386eab794eaf67f57e8762656aa28de7 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 28 Jan 2012 11:03:39 -0800 Subject: clean up js api for dropdowns --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7a5568041..cd0d620bf 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1986,7 +1986,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 28ba9d69c82895bbd9a1d66cea855119f4aba349 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 11:21:39 -0800 Subject: nav, buttons, and docs updates to account for outline: 0; on :active --- docs/assets/css/bootstrap.css | 18 ++++++++---------- docs/assets/css/docs.css | 17 +++++++++++++++-- 2 files changed, 23 insertions(+), 12 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7a5568041..bc4961b05 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -36,9 +36,6 @@ a:focus { outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; - -moz-outline: 5px auto -moz-mac-focusring; - -moz-outline-radius: 6px; - -moz-outline-offset: 0; } a:hover, a:active { outline: 0; @@ -627,9 +624,6 @@ input[type="file"]:focus, input[type="checkbox"]:focus, select:focus { outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; - -moz-outline: 5px auto -moz-mac-focusring; - -moz-outline-radius: 6px; - -moz-outline-offset: 0; } .input-mini { width: 60px; @@ -1490,9 +1484,12 @@ table .span12 { .dropdown { position: relative; } -.dropdown .dropdown-toggle { +.dropdown-toggle { *margin-bottom: -3px; } +.dropdown-toggle:active, .open .dropdown-toggle { + outline: 0; +} .caret { display: inline-block; width: 0; @@ -2641,9 +2638,6 @@ table .span12 { outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; - -moz-outline: 5px auto -moz-mac-focusring; - -moz-outline-radius: 6px; - -moz-outline-offset: 0; } .btn.active, .btn:active { background-image: none; @@ -2653,6 +2647,7 @@ table .span12 { background-color: #e6e6e6; background-color: #d9d9d9 \9; color: rgba(0, 0, 0, 0.5); + outline: 0; } .btn.disabled, .btn[disabled] { cursor: default; @@ -2776,6 +2771,9 @@ button.btn.small, input[type="submit"].btn.small { .btn-group .btn.active { z-index: 2; } +.btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle { + outline: 0; +} .btn-group .dropdown-toggle { padding-left: 8px; padding-right: 8px; diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 0b221e3b2..8c92f087f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -173,10 +173,9 @@ hr.soften { } .subnav .nav > li > a { margin: 0; - padding-top: 11px; + padding-top: 11px; padding-bottom: 11px; font-size: 13px; - text-shadow: 0 1px 0 rgba(255,255,255,.5); border-left: 1px solid #f5f5f5; border-right: 1px solid #e5e5e5; -webkit-border-radius: 0; @@ -202,10 +201,18 @@ hr.soften { .subnav .nav > li:first-child > a:hover { border-left: 0; padding-left: 12px; + -webkit-border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; } .subnav .nav > li:last-child > a { border-right: 0; } +.subnav .dropdown-menu { + -webkit-border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + border-radius: 0 0 4px 4px; +} /* Fixed subnav on scroll, but only for 940px and up (sorry IE!) */ @media (min-width: 940px) { @@ -229,6 +236,12 @@ hr.soften { margin: 0 auto; padding: 0 1px; } + .subnav .nav > li:first-child > a, + .subnav .nav > li:first-child > a:hover { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + } } -- cgit v1.2.3 From f1dc214977ed2613565a0c4a9846864c84fb2602 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 11:24:34 -0800 Subject: increase padding on modal-header after decreasing h3 line-height --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5265b14df..3e3379c3d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1983,7 +1983,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 { @@ -2288,7 +2288,7 @@ table .span12 { top: 50%; } .modal-header { - padding: 5px 15px; + padding: 9px 15px; border-bottom: 1px solid #eee; } .modal-header .close { -- cgit v1.2.3 From 12d3c2fe74bbe2570e47a2c8d7154a3011bd0770 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 28 Jan 2012 12:08:41 -0800 Subject: fix z-index issue with modals for popovers,tooltips,and dropdowns --- docs/assets/css/bootstrap.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index cd0d620bf..1cce5e9df 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2238,6 +2238,18 @@ table .span12 { .pager .previous a { float: left; } +.modal-open .dropdown-menu { + z-index: 2050; +} +.modal-open .dropdown.open { + *z-index: 2050; +} +.modal-open .popover { + z-index: 2060; +} +.modal-open .tooltip { + z-index: 2070; +} .modal-backdrop { position: fixed; top: 0; -- cgit v1.2.3 From 2bfda031cebcde7361797dd54badeb91d4cb98cf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 12:43:19 -0800 Subject: darken buttons, uncomment out firefox keyframes from progress bars --- docs/assets/css/bootstrap.css | 90 +++++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 41 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 3e3379c3d..b6fe4d492 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1983,7 +1983,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 { @@ -2506,15 +2506,15 @@ table .span12 { color: rgba(255, 255, 255, 0.75); } .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-color: #006dcc; + background-image: -moz-linear-gradient(top, #0088cc, #0044cc); + background-image: -ms-linear-gradient(top, #0088cc, #0044cc); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); + background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); + background-image: -o-linear-gradient(top, #0088cc, #0044cc); + background-image: linear-gradient(top, #0088cc, #0044cc); background-repeat: repeat-x; - border-color: #0055cc #0055cc #003580; + border-color: #0044cc #0044cc #002a80; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } .btn.primary:hover, @@ -2522,21 +2522,21 @@ table .span12 { .btn.primary.active, .btn.primary.disabled, .btn.primary[disabled] { - background-color: #0055cc; + background-color: #0044cc; } .btn.primary:active, .btn.primary.active { - background-color: #004099 \9; + background-color: #003399 \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-color: #da4f49; + background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); + background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); + background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); + background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); + background-image: linear-gradient(top, #ee5f5b, #bd362f); background-repeat: repeat-x; - border-color: #c43c35 #c43c35 #882a25; + border-color: #bd362f #bd362f #802420; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } .btn.danger:hover, @@ -2544,21 +2544,21 @@ table .span12 { .btn.danger.active, .btn.danger.disabled, .btn.danger[disabled] { - background-color: #c43c35; + background-color: #bd362f; } .btn.danger:active, .btn.danger.active { - background-color: #9c302a \9; + background-color: #942a25 \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-color: #5bb75b; + background-image: -moz-linear-gradient(top, #62c462, #51a351); + background-image: -ms-linear-gradient(top, #62c462, #51a351); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); + background-image: -webkit-linear-gradient(top, #62c462, #51a351); + background-image: -o-linear-gradient(top, #62c462, #51a351); + background-image: linear-gradient(top, #62c462, #51a351); background-repeat: repeat-x; - border-color: #57a957 #57a957 #3d773d; + border-color: #51a351 #51a351 #387038; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } .btn.success:hover, @@ -2566,21 +2566,21 @@ table .span12 { .btn.success.active, .btn.success.disabled, .btn.success[disabled] { - background-color: #57a957; + background-color: #51a351; } .btn.success:active, .btn.success.active { - background-color: #458845 \9; + background-color: #408140 \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-color: #49afcd; + background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); + background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); + background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); + background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); + background-image: linear-gradient(top, #5bc0de, #2f96b4); background-repeat: repeat-x; - border-color: #339bb9 #339bb9 #22697d; + border-color: #2f96b4 #2f96b4 #1f6377; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } .btn.info:hover, @@ -2588,10 +2588,10 @@ table .span12 { .btn.info.active, .btn.info.disabled, .btn.info[disabled] { - background-color: #339bb9; + background-color: #2f96b4; } .btn.info:active, .btn.info.active { - background-color: #287a91 \9; + background-color: #24748c \9; } .btn { display: inline-block; @@ -2942,6 +2942,14 @@ a.thumbnail:hover { 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; -- cgit v1.2.3 From b77161f8647f791319c684a191c2308b6dd05100 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 12:49:26 -0800 Subject: reset border-radius only for ie9? --- docs/assets/css/bootstrap.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f69943c67..8cd2d9e36 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -535,9 +535,7 @@ 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; + border-radius: 0 \0/; } input[type="file"] { padding: initial; -- cgit v1.2.3 From 70c6a6cd855a617b086682ef919e02cf67d4e86e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 12:58:26 -0800 Subject: fix border and border radius on radios/checkboxes for iOS, fix forms docs alignment on small devices --- docs/assets/css/bootstrap-responsive.css | 3 +- docs/assets/css/bootstrap.css | 1 + docs/assets/css/docs.css | 62 +++----------------------------- 3 files changed, 8 insertions(+), 58 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index e91f25539..0d975824b 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -20,7 +20,8 @@ padding-top: 0; } .form-horizontal .form-actions { - padding-left: 0; + padding-left: 10px; + padding-right: 10px; } .modal { position: absolute; diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 8cd2d9e36..74cef08f2 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -534,6 +534,7 @@ input[type="image"], input[type="checkbox"], input[type="radio"] { line-height: normal; border: none; + border: initial; cursor: pointer; border-radius: 0 \0/; } diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 8c92f087f..a48558395 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -306,42 +306,6 @@ hr.soften { } -/* Quickstart section for getting le code --------------------------------------------------- */ -.getting-started p { - color: #777; - margin-bottom: 9px; -} -.getting-started .current-version, -.getting-started .current-version a { - color: #999; -} -.getting-started form { - margin-bottom: 0; -} -.getting-started textarea { - display: block; - width: 95%; - height: auto; - font-family: Menlo, Monaco, "Courier New", monospace; - font-size: 12px; - line-height: 20px; - white-space: nowrap; - overflow: hidden; - color: #999; - /* Makes inputs behave like true block-level elements */ - -webkit-box-sizing: border-box; /* Older Webkit */ - -moz-box-sizing: border-box; /* Older FF */ - -ms-box-sizing: border-box; /* IE8 */ - box-sizing: border-box; /* CSS3 spec*/ - /* Hacks for IE7 to make this work just okay enough to function */ - *width: 80%; - *height: 24px; -} -.getting-started textarea:focus { - color: #333; -} - /* Footer -------------------------------------------------- */ @@ -354,27 +318,6 @@ hr.soften { margin-bottom: 0; color: #555; } -.footer dl { - margin-bottom: 0; -} -.footer dl dt { - font-size: 11px; - color: #999; - text-transform: uppercase; -} -.footer dl dd + dt { - margin-top: 18px; -} -.footer dl dd { - margin-left: 0; - font-size: 12px; -} -.footer dl a { - color: #999; -} -.footer dl a:hover { - color: #555; -} @@ -745,6 +688,11 @@ form.well { bottom: auto; left: auto; } + + /* Forms docs */ + .form-docs { + padding-left: 0; /* down from 10px */ + } } -- cgit v1.2.3 From 296d06a285d91200b4063f3bdde65c094495ee24 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 13:07:01 -0800 Subject: add checkbox/radio border for ios in responsive --- docs/assets/css/bootstrap-responsive.css | 3 +++ docs/assets/css/bootstrap.css | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 0d975824b..b991d1242 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -7,6 +7,9 @@ display: block; line-height: 18px; } + input[type="checkbox"], input[type="radio"] { + border: 1px solid #ccc; + } .form-horizontal .control-group > label { float: none; width: auto; diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 74cef08f2..d9050d3b6 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -533,8 +533,7 @@ input[type="image"], input[type="checkbox"], input[type="radio"] { /* IE7 */ line-height: normal; - border: none; - border: initial; + border: 0; cursor: pointer; border-radius: 0 \0/; } -- cgit v1.2.3 From 1a22c3b30aa67b4f092b164fad188050af8bbab2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 13:13:01 -0800 Subject: restore IE filters, but reset them on buttons --- docs/assets/css/bootstrap.css | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d9050d3b6..43ec1e417 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1911,6 +1911,7 @@ 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); @@ -2125,6 +2126,7 @@ 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; @@ -2524,8 +2526,10 @@ table .span12 { background-image: -o-linear-gradient(top, #0088cc, #0044cc); background-image: linear-gradient(top, #0088cc, #0044cc); background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0); border-color: #0044cc #0044cc #002a80; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn.primary:hover, .btn.primary:active, @@ -2546,8 +2550,10 @@ table .span12 { background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); background-image: linear-gradient(top, #ee5f5b, #bd362f); background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); border-color: #bd362f #bd362f #802420; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn.danger:hover, .btn.danger:active, @@ -2568,8 +2574,10 @@ table .span12 { background-image: -o-linear-gradient(top, #62c462, #51a351); background-image: linear-gradient(top, #62c462, #51a351); background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); border-color: #51a351 #51a351 #387038; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn.success:hover, .btn.success:active, @@ -2590,8 +2598,10 @@ table .span12 { background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); background-image: linear-gradient(top, #5bc0de, #2f96b4); background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); border-color: #2f96b4 #2f96b4 #1f6377; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn.info:hover, .btn.info:active, @@ -2619,6 +2629,7 @@ 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; @@ -2980,6 +2991,7 @@ 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); @@ -3002,6 +3014,7 @@ 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); @@ -3041,6 +3054,7 @@ 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; @@ -3060,6 +3074,7 @@ 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; @@ -3079,6 +3094,7 @@ 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 9db4f2a344ebf452b88ac4af0261192f3a8e9eb6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 14:30:45 -0800 Subject: change .span* inputs to use content-sizing: border-box; to make them behave as block level elements --- docs/assets/css/bootstrap-responsive.css | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index b991d1242..19c465e44 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -7,6 +7,33 @@ display: block; line-height: 18px; } + input[class*="span"], + select[class*="span"], + textarea[class*="span"], + .uneditable-input { + display: block; + width: 100%; + height: 28px; + /* Make inputs at least the height of their button counterpart */ + + /* Makes inputs behave like true block-level elements */ + + -webkit-box-sizing: border-box; + /* Older Webkit */ + + -moz-box-sizing: border-box; + /* Older FF */ + + -ms-box-sizing: border-box; + /* IE8 */ + + box-sizing: border-box; + /* CSS3 spec*/ + + } + .input-prepend input[class*="span"], .input-append input[class*="span"] { + width: auto; + } input[type="checkbox"], input[type="radio"] { border: 1px solid #ccc; } -- cgit v1.2.3 From 7843a665fdc18c1199766d6c65f192209ec35741 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 14:50:56 -0800 Subject: vertical align inline checkboxes/radios to improve rendering in topbar --- docs/assets/css/bootstrap.css | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 43ec1e417..7b47aebef 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -591,6 +591,7 @@ input[type="hidden"] { .radio.inline, .checkbox.inline { display: inline-block; margin-bottom: 0; + vertical-align: middle; } .radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline { margin-left: 10px; @@ -1953,6 +1954,12 @@ table .span12 { margin-top: 5px; margin-bottom: 0; } +.navbar-form .radio, .navbar-form .checkbox { + margin-top: 5px; +} +.navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] { + margin-top: 3px; +} .navbar-search { position: relative; float: left; -- cgit v1.2.3 From 23e076c1bb73c4950d473cb36218937b2607bc13 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 15:09:23 -0800 Subject: add in a navbar button for toggling the nav items --- docs/assets/css/bootstrap-responsive.css | 3 + docs/assets/css/bootstrap.css | 2081 +++++++++++++++--------------- 2 files changed, 1067 insertions(+), 1017 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 19c465e44..3731713e8 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -86,6 +86,9 @@ width: auto; margin: 0; } + .btn-navbar { + display: block; + } } @media (min-width: 768px) and (max-width: 940px) { .container { diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7b47aebef..43181db38 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1645,1258 +1645,1305 @@ table .span12 { filter: alpha(opacity=40); cursor: pointer; } -.nav { - margin-left: 0; - margin-bottom: 18px; - list-style: none; +.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; } -.nav > li > a { - display: block; +.btn.primary.active, +.btn.danger.active, +.btn.success.active, +.btn.info.active { + color: rgba(255, 255, 255, 0.75); } -.nav > li > a:hover { - text-decoration: none; - background-color: #eeeeee; +.btn.primary { + background-color: #006dcc; + background-image: -moz-linear-gradient(top, #0088cc, #0044cc); + background-image: -ms-linear-gradient(top, #0088cc, #0044cc); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); + background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); + background-image: -o-linear-gradient(top, #0088cc, #0044cc); + background-image: linear-gradient(top, #0088cc, #0044cc); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0); + border-color: #0044cc #0044cc #002a80; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } -.nav.list { - padding-left: 14px; - padding-right: 14px; - margin-bottom: 0; +.btn.primary:hover, +.btn.primary:active, +.btn.primary.active, +.btn.primary.disabled, +.btn.primary[disabled] { + background-color: #0044cc; } -.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); +.btn.primary:active, .btn.primary.active { + background-color: #003399 \9; } -.nav.list .nav-header { - font-size: 11px; - font-weight: bold; - line-height: 18px; - color: #999999; - text-transform: uppercase; +.btn.danger { + background-color: #da4f49; + background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); + background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); + background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); + background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); + background-image: linear-gradient(top, #ee5f5b, #bd362f); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); + border-color: #bd362f #bd362f #802420; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } -.nav.list > li + .nav-header { - margin-top: 9px; +.btn.danger:hover, +.btn.danger:active, +.btn.danger.active, +.btn.danger.disabled, +.btn.danger[disabled] { + background-color: #bd362f; } -.nav.list .active > a { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #0088cc; +.btn.danger:active, .btn.danger.active { + background-color: #942a25 \9; } -.nav.list .icon { - margin-right: 2px; +.btn.success { + background-color: #5bb75b; + background-image: -moz-linear-gradient(top, #62c462, #51a351); + background-image: -ms-linear-gradient(top, #62c462, #51a351); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); + background-image: -webkit-linear-gradient(top, #62c462, #51a351); + background-image: -o-linear-gradient(top, #62c462, #51a351); + background-image: linear-gradient(top, #62c462, #51a351); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); + border-color: #51a351 #51a351 #387038; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } -.tabs, .pills { - *zoom: 1; +.btn.success:hover, +.btn.success:active, +.btn.success.active, +.btn.success.disabled, +.btn.success[disabled] { + background-color: #51a351; } -.tabs:before, -.pills:before, -.tabs:after, -.pills:after { - display: table; - content: ""; +.btn.success:active, .btn.success.active { + background-color: #408140 \9; } -.tabs:after, .pills:after { - clear: both; +.btn.info { + background-color: #49afcd; + background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); + background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); + background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); + background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); + background-image: linear-gradient(top, #5bc0de, #2f96b4); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); + border-color: #2f96b4 #2f96b4 #1f6377; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } -.tabs > li, .pills > li { - float: left; +.btn.info:hover, +.btn.info:active, +.btn.info.active, +.btn.info.disabled, +.btn.info[disabled] { + background-color: #2f96b4; } -.tabs > li > a, .pills > li > a { - padding-right: 12px; - padding-left: 12px; - margin-right: 2px; - line-height: 14px; +.btn.info:active, .btn.info.active { + background-color: #24748c \9; } -.tabs { - border-bottom: 1px solid #ddd; +.btn { + display: inline-block; + padding: 4px 10px 4px; + font-size: 13px; + line-height: 18px; + color: #333333; + text-align: center; + 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; + 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; + *margin-left: .3em; } -.tabs > li { - margin-bottom: -1px; +.btn:first-child { + *margin-left: 0; } -.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; +.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; } -.tabs > li > a:hover { - border-color: #eeeeee #eeeeee #dddddd; +.btn:focus { + outline: thin dotted; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; } -.tabs > .active > a, .tabs > .active > a:hover { - color: #555555; - background-color: #ffffff; - border: 1px solid #ddd; - border-bottom-color: transparent; +.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; + color: rgba(0, 0, 0, 0.5); + outline: 0; +} +.btn.disabled, .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; } -.pills > li > a { - padding-top: 8px; - padding-bottom: 8px; - margin-top: 2px; - margin-bottom: 2px; +.btn.large { + padding: 9px 14px; + font-size: 15px; + line-height: normal; -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; +.btn.large .icon { + margin-top: 1px; } -.nav.stacked > li > a { - margin-right: 0; +.btn.small { + padding: 5px 9px; + font-size: 11px; + line-height: 16px; } -.tabs.stacked { - border-bottom: 0; +.btn.small .icon { + margin-top: -1px; } -.tabs.stacked > li > a { - border: 1px solid #ddd; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; +button.btn, input[type="submit"].btn { + *padding-top: 2px; + *padding-bottom: 2px; } -.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; +button.btn::-moz-focus-inner, input[type="submit"].btn::-moz-focus-inner { + padding: 0; + border: 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; +button.btn.large, input[type="submit"].btn.large { + *padding-top: 7px; + *padding-bottom: 7px; } -.tabs.stacked > li > a:hover { - border-color: #ddd; - z-index: 2; +button.btn.small, input[type="submit"].btn.small { + *padding-top: 3px; + *padding-bottom: 3px; } -.pills.stacked > li > a { - margin-bottom: 3px; +.btn-group { + position: relative; + *zoom: 1; + *margin-left: .3em; } -.pills.stacked > li:last-child > a { - margin-bottom: 1px; +.btn-group:before, .btn-group:after { + display: table; + content: ""; } -.pills .dropdown-menu, .tabs .dropdown-menu { - margin-top: 1px; - border-width: 1px; +.btn-group:after { + clear: both; } -.pills .dropdown-menu { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; +.btn-group:first-child { + *margin-left: 0; } -.tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret { - border-top-color: #0088cc; - margin-top: 6px; +.btn-group + .btn-group { + margin-left: 5px; } -.tabs .dropdown-toggle:hover .caret, .pills .dropdown-toggle:hover .caret { - border-top-color: #005580; +.btn-toolbar { + margin-top: 9px; + margin-bottom: 9px; } -.tabs .active .dropdown-toggle .caret, .pills .active .dropdown-toggle .caret { - border-top-color: #333333; +.btn-toolbar .btn-group { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; } -.nav > .dropdown.active > a:hover { - color: #000000; - cursor: pointer; +.btn-group .btn { + position: relative; + float: left; + margin-left: -1px; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } -.tabs .open .dropdown-toggle, .pills .open .dropdown-toggle, .nav > .open.active > a:hover { - color: #ffffff; - background-color: #999999; - border-color: #999999; +.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; } -.nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret { - border-top-color: #ffffff; - opacity: 1; - filter: alpha(opacity=100); +.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; } -.tabs.stacked .open > a:hover { - border-color: #999999; +.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; } -.tabbable { - *zoom: 1; +.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; } -.tabbable:before, .tabbable:after { - display: table; - content: ""; +.btn-group .btn:hover, +.btn-group .btn:focus, +.btn-group .btn:active, +.btn-group .btn.active { + z-index: 2; } -.tabbable:after { - clear: both; +.btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle { + outline: 0; } -.tabs-below .tabs, .tabs-right .tabs, .tabs-left .tabs { - border-bottom: 0; +.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); + *padding-top: 5px; + *padding-bottom: 5px; } -.tab-content > .tab-pane, .pill-content > .pill-pane { - display: none; +.btn-group.open { + *z-index: 1000; } -.tab-content > .active, .pill-content > .active { +.btn-group.open .dropdown-menu { display: block; + margin-top: 1px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; } -.tabs-below .tabs { - border-top: 1px solid #ddd; +.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); } -.tabs-below .tabs > li { - margin-top: -1px; - margin-bottom: 0; +.btn .caret { + margin-top: 7px; + margin-left: 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; +.btn:hover .caret, .open.btn-group .caret { + opacity: 1; + filter: alpha(opacity=100); } -.tabs-below .tabs > li > a:hover { - border-bottom-color: transparent; - border-top-color: #ddd; +.primary .caret, +.danger .caret, +.info .caret, +.success .caret { + border-top-color: #ffffff; + opacity: 0.75; + filter: alpha(opacity=75); } -.tabs-below .tabs .active > a, .tabs-below .tabs .active > a:hover { - border-color: transparent #ddd #ddd #ddd; +.btn.small .caret { + margin-top: 4px; } -.tabs-left .tabs > li, .tabs-right .tabs > li { - float: none; +.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 #fbeed5; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } -.tabs-left .tabs > li > a, .tabs-right .tabs > li > a { - min-width: 74px; - margin-right: 0; - margin-bottom: 3px; +.alert, .alert-heading { + color: #c09853; } -.tabs-left .tabs { - float: left; - margin-right: 19px; - border-right: 1px solid #ddd; +.alert .close { + position: relative; + right: -21px; + line-height: 18px; } -.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; +.alert-success { + background-color: #dff0d8; + border-color: #d6e9c6; } -.tabs-left .tabs > li > a:hover { - border-color: #eeeeee #dddddd #eeeeee #eeeeee; +.alert-success, .alert-success .alert-heading { + color: #468847; } -.tabs-left .tabs .active > a, .tabs-left .tabs .active > a:hover { - border-color: #ddd transparent #ddd #ddd; - *border-right-color: #ffffff; +.alert-danger, .alert-error { + background-color: #f2dede; + border-color: #eed3d7; } -.tabs-right .tabs { - float: right; - margin-left: 19px; - border-left: 1px solid #ddd; +.alert-danger, +.alert-error, +.alert-danger .alert-heading, +.alert-error .alert-heading { + color: #b94a48; } -.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; +.alert-info { + background-color: #d9edf7; + border-color: #bce8f1; } -.tabs-right .tabs > li > a:hover { - border-color: #eeeeee #eeeeee #eeeeee #dddddd; +.alert-info, .alert-info .alert-heading { + color: #3a87ad; } -.tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover { - border-color: #ddd #ddd #ddd transparent; - *border-left-color: #ffffff; +.alert-block { + padding-top: 14px; + padding-bottom: 14px; } -.navbar { - overflow: visible; +.alert-block > p, .alert-block > ul { + margin-bottom: 0; } -.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; - 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); +.alert-block p + p { + margin-top: 5px; } -.navbar .brand:hover { - color: #ffffff; - text-decoration: none; +.nav { + margin-left: 0; + margin-bottom: 18px; + list-style: none; } -.navbar .brand { - float: left; +.nav > li > a { display: block; - padding: 8px 20px 12px; - margin-left: -20px; - font-size: 20px; - font-weight: 200; - line-height: 1; - color: #ffffff; } -.navbar .navbar-text { +.nav > li > a:hover { + text-decoration: none; + background-color: #eeeeee; +} +.nav.list { + padding-left: 14px; + padding-right: 14px; margin-bottom: 0; - line-height: 40px; - color: #999999; } -.navbar .navbar-text a:hover { - color: #ffffff; - background-color: transparent; +.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); } -.navbar .btn, .navbar .btn-group { - margin-top: 5px; +.nav.list .nav-header { + font-size: 11px; + font-weight: bold; + line-height: 18px; + color: #999999; + text-transform: uppercase; } -.navbar .btn-group .btn { - margin-top: 0; +.nav.list > li + .nav-header { + margin-top: 9px; } -.navbar-form { - margin-bottom: 0; +.nav.list .active > a { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); + background-color: #0088cc; } -.navbar-form input, .navbar-form select { - display: inline-block; - margin-top: 5px; - margin-bottom: 0; +.nav.list .icon { + margin-right: 2px; } -.navbar-form .radio, .navbar-form .checkbox { - margin-top: 5px; +.tabs, .pills { + *zoom: 1; } -.navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] { - margin-top: 3px; +.tabs:before, +.pills:before, +.tabs:after, +.pills:after { + display: table; + content: ""; } -.navbar-search { - position: relative; +.tabs:after, .pills:after { + clear: both; +} +.tabs > li, .pills > li { 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: #666; - 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; +.tabs > li > a, .pills > li > a { + padding-right: 12px; + padding-left: 12px; + margin-right: 2px; + line-height: 14px; } -.navbar-search .search-query :-moz-placeholder { - color: #eeeeee; +.tabs { + border-bottom: 1px solid #ddd; } -.navbar-search .search-query::-webkit-input-placeholder { - color: #eeeeee; +.tabs > li { + margin-bottom: -1px; } -.navbar-search .search-query:hover { - color: #ffffff; - background-color: #999999; - background-color: rgba(255, 255, 255, 0.5); +.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; } -.navbar-search .search-query:focus, .navbar-search .search-query.focused { - padding: 5px 10px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; +.tabs > li > a:hover { + border-color: #eeeeee #eeeeee #dddddd; +} +.tabs > .active > a, .tabs > .active > a:hover { + color: #555555; 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; + border: 1px solid #ddd; + border-bottom-color: transparent; + cursor: default; } -.navbar-static { - margin-bottom: 18px; +.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; } -.navbar-static .navbar-inner { - padding-left: 20px; - padding-right: 20px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; +.pills .active > a, .pills .active > a:hover { + color: #ffffff; + background-color: #0088cc; } -.navbar-fixed-top { - position: fixed; - top: 0; - right: 0; - left: 0; - z-index: 1030; +.nav.stacked > li { + float: none; } -.navbar .nav { - position: relative; - left: 0; - display: block; - float: left; - margin: 0 10px 0 0; +.nav.stacked > li > a { + margin-right: 0; } -.navbar .nav.pull-right { - float: right; +.tabs.stacked { + border-bottom: 0; } -.navbar .nav > li { - display: block; - float: left; +.tabs.stacked > li > a { + border: 1px solid #ddd; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } -.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); +.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; } -.navbar .nav > li > a:hover { - background-color: transparent; - color: #ffffff; - text-decoration: none; +.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; } -.navbar .nav .active > a, .navbar .nav .active > a:hover { - color: #ffffff; - text-decoration: none; - background-color: #222222; - background-color: rgba(0, 0, 0, 0.5); +.tabs.stacked > li > a:hover { + border-color: #ddd; + z-index: 2; } -.navbar .vertical-divider { - height: 40px; - width: 1px; - margin: 0 5px; - overflow: hidden; - background-color: #222222; - border-right: 1px solid #333333; +.pills.stacked > li > a { + margin-bottom: 3px; } -.navbar .nav.pull-right { - margin-left: 10px; - margin-right: 0; +.pills.stacked > li:last-child > a { + margin-bottom: 1px; } -.navbar .dropdown-menu { +.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; } -.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; +.tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret { + border-top-color: #0088cc; + margin-top: 6px; } -.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; +.tabs .dropdown-toggle:hover .caret, .pills .dropdown-toggle:hover .caret { + border-top-color: #005580; } -.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret { - border-top-color: #ffffff; +.tabs .active .dropdown-toggle .caret, .pills .active .dropdown-toggle .caret { + border-top-color: #333333; } -.navbar .nav .active .caret { +.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); } -.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle { - background-color: transparent; +.tabs.stacked .open > a:hover { + border-color: #999999; } -.navbar .nav .active > .dropdown-toggle:hover { - color: #ffffff; +.tabbable { + *zoom: 1; } -.navbar .nav.pull-right .dropdown-menu { - left: auto; - right: 0; +.tabbable:before, .tabbable:after { + display: table; + content: ""; } -.navbar .nav.pull-right .dropdown-menu:before { - left: auto; - right: 12px; +.tabbable:after { + clear: both; } -.navbar .nav.pull-right .dropdown-menu:after { - left: auto; - right: 13px; +.tabs-below .tabs, .tabs-right .tabs, .tabs-left .tabs { + border-bottom: 0; } -.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; - 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; +.tab-content > .tab-pane, .pill-content > .pill-pane { + display: none; } -.breadcrumb li { - display: inline; - text-shadow: 0 1px 0 #ffffff; +.tab-content > .active, .pill-content > .active { + display: block; } -.breadcrumb .divider { - padding: 0 5px; - color: #999999; +.tabs-below .tabs { + border-top: 1px solid #ddd; } -.breadcrumb .active a { - color: #333333; +.tabs-below .tabs > li { + margin-top: -1px; + margin-bottom: 0; } -.pagination { - height: 36px; - margin: 18px 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; } -.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); +.tabs-below .tabs > li > a:hover { + border-bottom-color: transparent; + border-top-color: #ddd; } -.pagination li { - display: inline; +.tabs-below .tabs .active > a, .tabs-below .tabs .active > a:hover { + border-color: transparent #ddd #ddd #ddd; } -.pagination a { +.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; - padding: 0 14px; - line-height: 34px; - text-decoration: none; - border: 1px solid #ddd; - border-left-width: 0; + margin-right: 19px; + border-right: 1px solid #ddd; } -.pagination a:hover, .pagination .active a { - background-color: #f5f5f5; +.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; } -.pagination .active a { - color: #999999; +.tabs-left .tabs > li > a:hover { + border-color: #eeeeee #dddddd #eeeeee #eeeeee; } -.pagination .disabled a, .pagination .disabled a:hover { - color: #999999; - background-color: transparent; - cursor: default; +.tabs-left .tabs .active > a, .tabs-left .tabs .active > a:hover { + border-color: #ddd transparent #ddd #ddd; + *border-right-color: #ffffff; } -.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; +.tabs-right .tabs { + float: right; + margin-left: 19px; + border-left: 1px solid #ddd; } -.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; +.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; } -.pagination-centered { - text-align: center; +.tabs-right .tabs > li > a:hover { + border-color: #eeeeee #eeeeee #eeeeee #dddddd; } -.pagination-right { - text-align: right; +.tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover { + border-color: #ddd #ddd #ddd transparent; + *border-left-color: #ffffff; } -.pager { - margin-left: 0; - margin-bottom: 18px; - list-style: none; - text-align: center; - *zoom: 1; +.navbar { + overflow: visible; } -.pager:before, .pager:after { - display: table; - content: ""; +.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; + 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); } -.pager:after { - clear: both; +.btn-navbar { + display: none; + float: right; + padding: 7px 10px; + margin-left: 10px; + margin-right: 10px; + 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; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); + border-color: #222222 #222222 #000000; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); +} +.btn-navbar:hover, +.btn-navbar:active, +.btn-navbar.active, +.btn-navbar.disabled, +.btn-navbar[disabled] { + background-color: #222222; } -.pager li { - display: inline; +.btn-navbar:active, .btn-navbar.active { + background-color: #080808 \9; } -.pager a { - display: inline-block; - padding: 6px 15px; +.btn-navbar .i-bar { + display: block; + width: 18px; + height: 2px; background-color: #f5f5f5; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; + -webkit-border-radius: 1px; + -moz-border-radius: 1px; + border-radius: 1px; + -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); + -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); + box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); +} +.btn-navbar .i-bar + .i-bar { + margin-top: 3px; } -.pager .next a { - float: right; +.navbar .brand:hover { + color: #ffffff; + text-decoration: none; } -.pager .previous a { +.navbar .brand { float: left; + display: block; + padding: 8px 20px 12px; + margin-left: -20px; + font-size: 20px; + font-weight: 200; + line-height: 1; + color: #ffffff; } -.modal-open .dropdown-menu { - z-index: 2050; -} -.modal-open .dropdown.open { - *z-index: 2050; -} -.modal-open .popover { - z-index: 2060; -} -.modal-open .tooltip { - z-index: 2070; -} -.modal-backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1040; - background-color: #000000; -} -.modal-backdrop.fade { - opacity: 0; +.navbar .navbar-text { + margin-bottom: 0; + line-height: 40px; + color: #999999; } -.modal-backdrop, .modal-backdrop.fade.in { - opacity: 0.8; - filter: alpha(opacity=80); +.navbar .navbar-text a:hover { + color: #ffffff; + background-color: transparent; } -.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; +.navbar .btn, .navbar .btn-group { + margin-top: 5px; } -.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%; +.navbar .btn-group .btn { + margin-top: 0; } -.modal.fade.in { - top: 50%; +.navbar-form { + margin-bottom: 0; } -.modal-header { - padding: 9px 15px; - border-bottom: 1px solid #eee; +.navbar-form input, .navbar-form select { + display: inline-block; + margin-top: 5px; + margin-bottom: 0; } -.modal-header .close { - margin-top: 2px; +.navbar-form .radio, .navbar-form .checkbox { + margin-top: 5px; } -.modal-body { - padding: 15px; +.navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] { + margin-top: 3px; } -.modal-footer { - padding: 14px 15px 15px; +.navbar-search { + position: relative; + float: left; + margin-top: 6px; 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: ""; +.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: #666; + 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; } -.modal-footer:after { - clear: both; +.navbar-search .search-query :-moz-placeholder { + color: #eeeeee; } -.modal-footer .btn { - float: right; - margin-left: 5px; - margin-bottom: 0; +.navbar-search .search-query::-webkit-input-placeholder { + color: #eeeeee; } -.tooltip { - position: absolute; - z-index: 1020; - display: block; - visibility: visible; - padding: 5px; - font-size: 11px; - opacity: 0; - filter: alpha(opacity=0); +.navbar-search .search-query:hover { + color: #ffffff; + background-color: #999999; + background-color: rgba(255, 255, 255, 0.5); } -.tooltip.in { - opacity: 0.8; - filter: alpha(opacity=80); +.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; } -.tooltip.top { - margin-top: -2px; +.navbar-static { + margin-bottom: 18px; } -.tooltip.right { - margin-left: 2px; +.navbar-static .navbar-inner { + padding-left: 20px; + padding-right: 20px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } -.tooltip.bottom { - margin-top: 2px; +.navbar-fixed-top { + position: fixed; + top: 0; + right: 0; + left: 0; + z-index: 1030; } -.tooltip.left { - margin-left: -2px; +.navbar .nav { + position: relative; + left: 0; + display: block; + float: left; + margin: 0 10px 0 0; } -.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; +.navbar .nav.pull-right { + float: right; } -.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; +.navbar .nav > li { + display: block; + float: left; } -.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; +.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); } -.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; +.navbar .nav > li > a:hover { + background-color: transparent; + color: #ffffff; + text-decoration: none; } -.tooltip-inner { - max-width: 200px; - padding: 3px 8px; +.navbar .nav .active > a, .navbar .nav .active > a:hover { color: #ffffff; - text-align: center; text-decoration: none; - background-color: #000000; + 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 #333333; +} +.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; } -.tooltip-arrow { - position: absolute; - width: 0; - height: 0; -} -.popover { +.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: 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; + top: -7px; + left: 9px; } -.popover .arrow { +.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; - 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); + top: -6px; + left: 10px; } -.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; +.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret { + border-top-color: #ffffff; } -.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; +.navbar .nav .active .caret { + opacity: 1; + filter: alpha(opacity=100); } -.popover .content p, .popover .content ul, .popover .content ol { - margin-bottom: 0; +.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle { + background-color: transparent; } -.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); +.navbar .nav .active > .dropdown-toggle:hover { color: #ffffff; } -.btn.primary.active, -.btn.danger.active, -.btn.success.active, -.btn.info.active { - color: rgba(255, 255, 255, 0.75); -} -.btn.primary { - background-color: #006dcc; - background-image: -moz-linear-gradient(top, #0088cc, #0044cc); - background-image: -ms-linear-gradient(top, #0088cc, #0044cc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); - background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); - background-image: -o-linear-gradient(top, #0088cc, #0044cc); - background-image: linear-gradient(top, #0088cc, #0044cc); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0); - border-color: #0044cc #0044cc #002a80; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn.primary:hover, -.btn.primary:active, -.btn.primary.active, -.btn.primary.disabled, -.btn.primary[disabled] { - background-color: #0044cc; -} -.btn.primary:active, .btn.primary.active { - background-color: #003399 \9; -} -.btn.danger { - background-color: #da4f49; - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(top, #ee5f5b, #bd362f); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); - border-color: #bd362f #bd362f #802420; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn.danger:hover, -.btn.danger:active, -.btn.danger.active, -.btn.danger.disabled, -.btn.danger[disabled] { - background-color: #bd362f; -} -.btn.danger:active, .btn.danger.active { - background-color: #942a25 \9; -} -.btn.success { - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(top, #62c462, #51a351); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); - border-color: #51a351 #51a351 #387038; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn.success:hover, -.btn.success:active, -.btn.success.active, -.btn.success.disabled, -.btn.success[disabled] { - background-color: #51a351; -} -.btn.success:active, .btn.success.active { - background-color: #408140 \9; -} -.btn.info { - background-color: #49afcd; - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); - background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(top, #5bc0de, #2f96b4); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); - border-color: #2f96b4 #2f96b4 #1f6377; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.navbar .nav.pull-right .dropdown-menu { + left: auto; + right: 0; } -.btn.info:hover, -.btn.info:active, -.btn.info.active, -.btn.info.disabled, -.btn.info[disabled] { - background-color: #2f96b4; +.navbar .nav.pull-right .dropdown-menu:before { + left: auto; + right: 12px; } -.btn.info:active, .btn.info.active { - background-color: #24748c \9; +.navbar .nav.pull-right .dropdown-menu:after { + left: auto; + right: 13px; } -.btn { - display: inline-block; - padding: 4px 10px 4px; - font-size: 13px; - line-height: 18px; - color: #333333; - text-align: center; - 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; - 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; - *margin-left: .3em; +.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; + 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; } -.btn:first-child { - *margin-left: 0; +.breadcrumb li { + display: inline; + text-shadow: 0 1px 0 #ffffff; } -.btn:hover { +.breadcrumb .divider { + padding: 0 5px; + color: #999999; +} +.breadcrumb .active a { 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: thin dotted; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; +.pagination { + height: 36px; + margin: 18px 0; } -.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; - color: rgba(0, 0, 0, 0.5); - outline: 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); } -.btn.disabled, .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; +.pagination li { + display: inline; } -.btn.large { - padding: 9px 14px; - font-size: 15px; - line-height: normal; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; +.pagination a { + float: left; + padding: 0 14px; + line-height: 34px; + text-decoration: none; + border: 1px solid #ddd; + border-left-width: 0; } -.btn.large .icon { - margin-top: 1px; +.pagination a:hover, .pagination .active a { + background-color: #f5f5f5; } -.btn.small { - padding: 5px 9px; - font-size: 11px; - line-height: 16px; +.pagination .active a { + color: #999999; } -.btn.small .icon { - margin-top: -1px; +.pagination .disabled a, .pagination .disabled a:hover { + color: #999999; + background-color: transparent; + cursor: default; } -button.btn, input[type="submit"].btn { - *padding-top: 2px; - *padding-bottom: 2px; +.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; } -button.btn::-moz-focus-inner, input[type="submit"].btn::-moz-focus-inner { - padding: 0; - border: 0; +.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; } -button.btn.large, input[type="submit"].btn.large { - *padding-top: 7px; - *padding-bottom: 7px; +.pagination-centered { + text-align: center; } -button.btn.small, input[type="submit"].btn.small { - *padding-top: 3px; - *padding-bottom: 3px; +.pagination-right { + text-align: right; } -.btn-group { - position: relative; +.pager { + margin-left: 0; + margin-bottom: 18px; + list-style: none; + text-align: center; *zoom: 1; - *margin-left: .3em; } -.btn-group:before, .btn-group:after { +.pager:before, .pager:after { display: table; content: ""; } -.btn-group:after { +.pager:after { clear: both; } -.btn-group:first-child { - *margin-left: 0; +.pager li { + display: inline; } -.btn-group + .btn-group { - margin-left: 5px; +.pager a { + display: inline-block; + padding: 6px 15px; + background-color: #f5f5f5; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; } -.btn-toolbar { - margin-top: 9px; - margin-bottom: 9px; +.pager .next a { + float: right; } -.btn-toolbar .btn-group { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ +.pager .previous a { + float: left; +} +.modal-open .dropdown-menu { + z-index: 2050; +} +.modal-open .dropdown.open { + *z-index: 2050; +} +.modal-open .popover { + z-index: 2060; +} +.modal-open .tooltip { + z-index: 2070; +} +.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 */ - *zoom: 1; + -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; } -.btn-group .btn { - position: relative; - float: left; - margin-left: -1px; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; +.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%; } -.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; +.modal.fade.in { + top: 50%; +} +.modal-header { + padding: 9px 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; } -.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; +.modal-footer:before, .modal-footer:after { + display: table; + content: ""; } -.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; +.modal-footer:after { + clear: both; } -.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; +.modal-footer .btn { + float: right; + margin-left: 5px; + margin-bottom: 0; } -.btn-group .btn:hover, -.btn-group .btn:focus, -.btn-group .btn:active, -.btn-group .btn.active { - z-index: 2; +.tooltip { + position: absolute; + z-index: 1020; + display: block; + visibility: visible; + padding: 5px; + font-size: 11px; + opacity: 0; + filter: alpha(opacity=0); } -.btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle { - outline: 0; +.tooltip.in { + opacity: 0.8; + filter: alpha(opacity=80); } -.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); - *padding-top: 5px; - *padding-bottom: 5px; +.tooltip.top { + margin-top: -2px; } -.btn-group.open { - *z-index: 1000; +.tooltip.right { + margin-left: 2px; } -.btn-group.open .dropdown-menu { - display: block; - margin-top: 1px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; +.tooltip.bottom { + margin-top: 2px; } -.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); +.tooltip.left { + margin-left: -2px; } -.btn .caret { - margin-top: 7px; - margin-left: 0; +.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; } -.btn:hover .caret, .open.btn-group .caret { - opacity: 1; - filter: alpha(opacity=100); +.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; } -.primary .caret, -.danger .caret, -.info .caret, -.success .caret { - border-top-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.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; } -.btn.small .caret { - margin-top: 4px; +.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; } -.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 #fbeed5; +.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; } -.alert, .alert-heading { - color: #c09853; +.tooltip-arrow { + position: absolute; + width: 0; + height: 0; } -.alert .close { - position: relative; - right: -21px; - line-height: 18px; +.popover { + position: absolute; + top: 0; + left: 0; + z-index: 1010; + display: none; + padding: 5px; } -.alert-success { - background-color: #dff0d8; - border-color: #d6e9c6; +.popover.top { + margin-top: -5px; } -.alert-success, .alert-success .alert-heading { - color: #468847; +.popover.right { + margin-left: 5px; } -.alert-danger, .alert-error { - background-color: #f2dede; - border-color: #eed3d7; +.popover.bottom { + margin-top: 5px; } -.alert-danger, -.alert-error, -.alert-danger .alert-heading, -.alert-error .alert-heading { - color: #b94a48; +.popover.left { + margin-left: -5px; } -.alert-info { - background-color: #d9edf7; - border-color: #bce8f1; +.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; } -.alert-info, .alert-info .alert-heading { - color: #3a87ad; +.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; } -.alert-block { - padding-top: 14px; - padding-bottom: 14px; +.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; } -.alert-block > p, .alert-block > ul { - margin-bottom: 0; +.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; } -.alert-block p + p { - margin-top: 5px; +.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; } .thumbnails { margin-left: -20px; -- cgit v1.2.3 From 6493cd22c0c72c60354ebbd6d7887bcbbf4e263a Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 28 Jan 2012 15:14:57 -0800 Subject: blah --- docs/assets/css/bootstrap.css | 5 ----- 1 file changed, 5 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 43ec1e417..4771ff449 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3195,11 +3195,6 @@ a.thumbnail:hover { 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; -- cgit v1.2.3 From b8a683d7f250a11d349a3e5de0d75ace9d67df0c Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 28 Jan 2012 15:42:07 -0800 Subject: turn off brand hover for now + get nav toggling in mobile --- docs/assets/css/bootstrap-responsive.css | 10 +++++++--- docs/assets/css/bootstrap.css | 1 - 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 3731713e8..631c904e7 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -86,9 +86,6 @@ width: auto; margin: 0; } - .btn-navbar { - display: block; - } } @media (min-width: 768px) and (max-width: 940px) { .container { @@ -258,6 +255,13 @@ padding-left: 10px; padding-right: 10px; } + .btn-navbar { + display: block; + } + .nav-collapse { + overflow: hidden; + height: 0; + } } /* @media (min-width: 1210px) { diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e538be2a4..e928bb6d1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2356,7 +2356,6 @@ button.btn.small, input[type="submit"].btn.small { margin-top: 3px; } .navbar .brand:hover { - color: #ffffff; text-decoration: none; } .navbar .brand { -- cgit v1.2.3 From 22d52fca46c792c08bd316298c4dd85e52bf531f Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 28 Jan 2012 16:21:55 -0800 Subject: fix goign between small view large view with responsive collapse --- docs/assets/css/docs.css | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index a48558395..b06065365 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -47,10 +47,10 @@ section { hr.soften { height: 1px; margin: 54px 0; - background-image: -webkit-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0)); - background-image: -moz-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0)); - background-image: -ms-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0)); - background-image: -o-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0)); + background-image: -webkit-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0)); + background-image: -moz-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0)); + background-image: -ms-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0)); + background-image: -o-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0)); border: 0; } @@ -166,7 +166,7 @@ hr.soften { border: 1px solid #e5e5e5; -webkit-border-radius: 4px; -moz-border-radius: 4px; - border-radius: 4px; + border-radius: 4px; } .subnav .nav { margin-bottom: 0; @@ -695,6 +695,11 @@ form.well { } } +@media (min-width: 940px) { + .nav-collapse.collapse { + height: auto !important; + } +} @media (max-width: 768px) { @@ -788,7 +793,7 @@ form.well { } @media (max-width: 940px) { - + /* Unfloat brand */ .navbar-fixed-top .brand { float: none; -- cgit v1.2.3 From 475b985a0efaf534b56089f12c570d7861ce72f5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 16:37:43 -0800 Subject: remove padding from first-child of inline radios/checkboxes --- docs/assets/css/bootstrap.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e928bb6d1..1b572090c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -596,6 +596,9 @@ input[type="hidden"] { .radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline { margin-left: 10px; } +.controls > .radio.inline:first-child, .controls > .checkbox.inline:first-child { + padding-top: 5px; +} 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); -- cgit v1.2.3 From 06df91ac559686e947c3c1fbfbdd2b7dcfc5a56b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 16:48:03 -0800 Subject: remove background from accordion, and use border instead --- docs/assets/css/bootstrap.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1b572090c..bf1116f53 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3165,7 +3165,8 @@ a.thumbnail:hover { margin-bottom: 18px; } .accordion-group { - background-color: #f5f5f5; + margin-bottom: 2px; + border: 1px solid #e5e5e5; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -3177,9 +3178,6 @@ a.thumbnail:hover { display: block; padding: 8px 15px; } -.accordion-body { - margin-bottom: 2px; -} .accordion-inner { padding: 9px 15px; border-top: 1px solid #e5e5e5; -- cgit v1.2.3 From 4fa931e403ec3ae2f8f7f690c6c4040365f68ba9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 18:11:31 -0800 Subject: fix the navbar click and a few jank responsive problems --- docs/assets/css/bootstrap-responsive.css | 142 ++++++++++++++++++------------- docs/assets/css/bootstrap.css | 4 +- docs/assets/css/docs.css | 23 ++++- 3 files changed, 105 insertions(+), 64 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 631c904e7..b0fbd9d7b 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -175,22 +175,23 @@ margin-bottom: 36px; } .navbar-inner { - padding: 10px; + padding: 5px; background-image: none; } .navbar .container { padding: 0; } .navbar .brand { - float: none; - display: block; - padding-left: 15px; - padding-right: 15px; - margin: 0; + padding-left: 10px; + padding-right: 10px; + margin: 0 0 0 -5px; + } + .navbar .nav-collapse { + clear: left; } .navbar .nav { float: none; - margin: 9px 0; + margin: 0 0 9px; } .navbar .nav > li { float: none; @@ -217,8 +218,10 @@ } .navbar .dropdown-menu { position: static; - display: block; + top: auto; + left: auto; float: none; + display: block; max-width: none; margin: 0 15px; padding: 0; @@ -263,60 +266,83 @@ height: 0; } } -/* @media (min-width: 1210px) { - - // Reset grid variables - @gridColumns: 12; - @gridColumnWidth: 70px; - @gridGutterWidth: 30px; - @siteWidth: 1170px; - - // Bring grid mixins to recalculate widths - .columns(@columns: 1) { - width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)); - } - .offset(@columns: 1) { - margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2); - } - .container { - width: @siteWidth; + width: 1170px; } .row { - margin-left: @gridGutterWidth * -1; + margin-left: -30px; } [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); } - + 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: 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; + } } -*/ \ No newline at end of file diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index bf1116f53..6916e9361 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2315,8 +2315,8 @@ button.btn.small, input[type="submit"].btn.small { display: none; float: right; padding: 7px 10px; - margin-left: 10px; - margin-right: 10px; + margin-left: 5px; + margin-right: 5px; background-color: #2c2c2c; background-image: -moz-linear-gradient(top, #333333, #222222); background-image: -ms-linear-gradient(top, #333333, #222222); diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b06065365..cc7ca0c63 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -522,6 +522,7 @@ h2 + .row { /* Example sites showcase */ .example-sites img { max-width: 100%; + margin: 0 auto; } .marketing-byline { margin: -18px 0 27px; @@ -646,6 +647,10 @@ form.well { padding: 10px 14px; margin: 0 auto 10px; } + /* Masthead (home page jumbotron) */ + .masthead { + padding-top: 0; + } /* Don't space out quick links so much */ .quick-links { @@ -669,8 +674,9 @@ form.well { display: block; max-width: 300px; margin: 0 auto 18px; + text-align: center; } - .example-sites img { + .example-sites .thumbnail > img { max-width: 270px; } @@ -796,11 +802,20 @@ form.well { /* Unfloat brand */ .navbar-fixed-top .brand { - float: none; + float: left; margin-left: 0; - padding-left: 15px; - padding-right: 15px; + padding-left: 10px; + padding-right: 10px; } } +/* LARGE DESKTOP SCREENS */ +@media (min-width: 1210px) { + + /* Update subnav container */ + .subnav-fixed .nav { + width: 1168px; /* 2px less to account for left/right borders being removed when in fixed mode */ + } + +} -- cgit v1.2.3 From e532228721734492d6f2741f729525cc1bb3c77c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 18:25:05 -0800 Subject: more responsive tweaks for tablet --- docs/assets/css/bootstrap-responsive.css | 55 +++++++++++++++----------------- 1 file changed, 26 insertions(+), 29 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index b0fbd9d7b..bbfc0ac5a 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -89,81 +89,78 @@ } @media (min-width: 768px) and (max-width: 940px) { .container { - width: 748px; - padding-left: 10px; - padding-right: 10px; + width: 724px; + padding-left: 20px; + padding-right: 20px; } .span1 { - width: 44px; + width: 42px; } .span2 { - width: 108px; + width: 104px; } .span3 { - width: 172px; + width: 166px; } .span4 { - width: 236px; + width: 228px; } .span5 { - width: 300px; + width: 290px; } .span6 { - width: 364px; + width: 352px; } .span7 { - width: 428px; + width: 414px; } .span8 { - width: 492px; + width: 476px; } .span9 { - width: 556px; + width: 538px; } .span10 { - width: 620px; + width: 600px; } .span11 { - width: 684px; + width: 662px; } .span12 { - width: 748px; + width: 724px; } .offset1 { - margin-left: 84px; + margin-left: 82px; } .offset2 { - margin-left: 148px; + margin-left: 144px; } .offset3 { - margin-left: 212px; + margin-left: 206px; } .offset4 { - margin-left: 276px; + margin-left: 268px; } .offset5 { - margin-left: 340px; + margin-left: 330px; } .offset6 { - margin-left: 404px; + margin-left: 392px; } .offset7 { - margin-left: 468px; + margin-left: 454px; } .offset8 { - margin-left: 532px; + margin-left: 516px; } .offset9 { - margin-left: 596px; + margin-left: 578px; } .offset10 { - margin-left: 660px; + margin-left: 640px; } .offset11 { - margin-left: 724px; - } - .offset12 { - margin-left: 788px; + margin-left: 702px; } } @media (max-width: 940px) { -- cgit v1.2.3 From e17c9249d2bef78355711ce305e1a8d36bd75c3e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 18:27:09 -0800 Subject: fix dropdowns in subnav --- docs/assets/css/docs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index cc7ca0c63..430191a6f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -732,7 +732,7 @@ form.well { .subnav .nav > li > a { border: 0; } - .subnav .nav > li + li a { + .subnav .nav > li + li > a { border-top: 1px solid #e5e5e5; } -- cgit v1.2.3 From cf1b46bda4853e8501c2b9587219535376a9cc36 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 18:46:41 -0800 Subject: fix alert close position --- docs/assets/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 6916e9361..43ef8547f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2002,6 +2002,7 @@ button.btn.small, input[type="submit"].btn.small { } .alert .close { position: relative; + top: -2px; right: -21px; line-height: 18px; } -- cgit v1.2.3 From 3e462f1fb27b3ca97135948dc74ccef55336c8bb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 20:26:27 -0800 Subject: update docs to simplify some css --- docs/assets/css/docs.css | 30 ------------------------------ 1 file changed, 30 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 430191a6f..f36fa76d6 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -106,35 +106,6 @@ hr.soften { } -/* Benefits list in masthead */ -.benefits { - display: none; - width: 260px; - position: absolute; - right: 0; - bottom: 0; -} -.benefits ul { - list-style: none; - margin: 0; -} -.benefits li { - font-size: 16px; - font-weight: 300; - line-height: 35px; - color: #555; -} -.benefits li + li { - border-top: 1px solid #f5f5f5; -} -.benefits h4 { - color: #555; -} -.benefits span { - padding-right: 5px; - color: #999; -} - /* Specific jumbotrons ------------------------- */ /* supporting docs pages */ @@ -175,7 +146,6 @@ hr.soften { margin: 0; padding-top: 11px; padding-bottom: 11px; - font-size: 13px; border-left: 1px solid #f5f5f5; border-right: 1px solid #e5e5e5; -webkit-border-radius: 0; -- cgit v1.2.3 From f1e520badd51d01ebcd33758966ef868e5cdd1c2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 20:34:07 -0800 Subject: clarify and tweak media queries --- docs/assets/css/bootstrap-responsive.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index bbfc0ac5a..f40f0c110 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -263,7 +263,7 @@ height: 0; } } -@media (min-width: 1210px) { +@media (min-width: 1200px) { .container { width: 1170px; } -- cgit v1.2.3 From 59d9983ebcc889b5e5626d672311e92657bfe3e8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 22:03:14 -0800 Subject: updates to responsive and docs for responsive navbar --- docs/assets/css/bootstrap.css | 3 +++ docs/assets/css/docs.css | 7 ++----- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 43ef8547f..e09e58a82 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2359,6 +2359,9 @@ button.btn.small, input[type="submit"].btn.small { .btn-navbar .i-bar + .i-bar { margin-top: 3px; } +.nav-collapse.collapse { + height: auto !important; +} .navbar .brand:hover { text-decoration: none; } diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index f36fa76d6..7876f300a 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -671,11 +671,6 @@ form.well { } } -@media (min-width: 940px) { - .nav-collapse.collapse { - height: auto !important; - } -} @media (max-width: 768px) { @@ -768,6 +763,7 @@ form.well { } + @media (max-width: 940px) { /* Unfloat brand */ @@ -780,6 +776,7 @@ form.well { } + /* LARGE DESKTOP SCREENS */ @media (min-width: 1210px) { -- cgit v1.2.3 From 487dbfdda4692e3212f13d5e6282d7818b4c9934 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 22:14:51 -0800 Subject: namespace progress bars and labels classes --- docs/assets/css/bootstrap.css | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e09e58a82..a17a4475d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3003,16 +3003,16 @@ a.thumbnail:hover { -moz-border-radius: 3px; border-radius: 3px; } -.label.important { +.label-important { background-color: #b94a48; } -.label.warning { +.label-warning { background-color: #f89406; } -.label.success { +.label-success { background-color: #468847; } -.label.info { +.label-info { background-color: #3a87ad; } @-webkit-keyframes progress-bar-stripes { @@ -3105,7 +3105,7 @@ a.thumbnail:hover { -moz-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; } -.progress.danger .bar { +.progress-danger .bar { background-color: #dd514c; background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); @@ -3116,7 +3116,7 @@ a.thumbnail:hover { background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); } -.progress.danger.striped .bar { +.progress-danger.progress-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); @@ -3125,7 +3125,7 @@ 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); } -.progress.success .bar { +.progress-success .bar { background-color: #5eb95e; background-image: -moz-linear-gradient(top, #62c462, #57a957); background-image: -ms-linear-gradient(top, #62c462, #57a957); @@ -3136,7 +3136,7 @@ a.thumbnail:hover { background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); } -.progress.success.striped .bar { +.progress-success.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); @@ -3145,7 +3145,7 @@ 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); } -.progress.info .bar { +.progress-info .bar { background-color: #4bb1cf; background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); @@ -3156,7 +3156,7 @@ a.thumbnail:hover { background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); } -.progress.info.striped .bar { +.progress-info.progress-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); -- cgit v1.2.3 From 62f4a1571a3801c867b80c228464cc9c695f1d13 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 22:48:25 -0800 Subject: revamped the thumbnails examples to make them work and look better at higher resolution --- docs/assets/css/bootstrap-responsive.css | 6 ++++++ docs/assets/css/bootstrap.css | 2 ++ 2 files changed, 8 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index f40f0c110..ca03cecde 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -342,4 +342,10 @@ .offset11 { margin-left: 1130px; } + .thumbnails { + margin-left: -30px; + } + .thumbnails > li { + margin-left: 30px; + } } diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index a17a4475d..37b774fb9 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2988,6 +2988,8 @@ a.thumbnail:hover { .thumbnail > img { display: block; max-width: 100%; + margin-left: auto; + margin-right: auto; } .thumbnail .caption { padding: 9px; -- cgit v1.2.3 From bca269299b242c55a2511e752429c07d7639f7d2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 23:40:52 -0800 Subject: removing required .navbar-static class, rewrote docs to reflect the change, and updated the upgrade docs page to include the navbar section --- docs/assets/css/bootstrap.css | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 37b774fb9..efd221991 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2296,9 +2296,11 @@ button.btn.small, input[type="submit"].btn.small { } .navbar { overflow: visible; + margin-bottom: 18px; } .navbar-inner { - background-color: #222222; + padding-left: 20px; + padding-right: 20px; background-color: #2c2c2c; background-image: -moz-linear-gradient(top, #333333, #222222); background-image: -ms-linear-gradient(top, #333333, #222222); @@ -2308,6 +2310,9 @@ button.btn.small, input[type="submit"].btn.small { background-image: linear-gradient(top, #333333, #222222); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; -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); @@ -2452,16 +2457,6 @@ button.btn.small, input[type="submit"].btn.small { 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-top { position: fixed; top: 0; @@ -2469,6 +2464,13 @@ button.btn.small, input[type="submit"].btn.small { left: 0; z-index: 1030; } +.navbar-fixed-top .navbar-inner { + padding-left: 0; + padding-right: 0; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} .navbar .nav { position: relative; left: 0; -- cgit v1.2.3 From 15a1c0ce7988aaf715096760fa99eff7b23937f4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 23:58:39 -0800 Subject: add swatches to the color variables in less docs page --- docs/assets/css/docs.css | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 7876f300a..9b8244d49 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -470,6 +470,30 @@ hr.soften { +/* Color swatches on LESS docs page +-------------------------------------------------- */ +/* Sets the width of the td */ +.swatch-col { + width: 30px; +} +/* Le swatch */ +.swatch { + display: inline-block; + width: 30px; + height: 20px; + margin: -6px 0; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +/* For white swatches, give a border */ +.swatch-bordered { + width: 28px; + height: 18px; + border: 1px solid #eee; +} + + /* Misc -------------------------------------------------- */ -- cgit v1.2.3 From 7bf27674523c35f8803311a964dc72a7093351c0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jan 2012 00:07:01 -0800 Subject: remove form docs from the styles and markup, it's no longer needed --- docs/assets/css/bootstrap.css | 13 ++++++++++++- docs/assets/css/docs.css | 17 ----------------- 2 files changed, 12 insertions(+), 18 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index efd221991..c96818a56 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -943,9 +943,20 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec display: inline-block; margin-bottom: 0; } -.form-search label, .form-inline label { +.form-search label, +.form-inline label, +.form-search .input-append, +.form-inline .input-append, +.form-search .input-prepend, +.form-inline .input-prepend { display: inline-block; } +.form-search .input-append .add-on, +.form-inline .input-prepend .add-on, +.form-search .input-append .add-on, +.form-inline .input-prepend .add-on { + vertical-align: middle; +} .control-group { margin-bottom: 9px; } diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 9b8244d49..74b548628 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -543,19 +543,6 @@ form.well { margin: 18px 0; } -/* Form docs for horizontal forms */ -.form-docs { - padding-left: 10px; -} -.form-docs h3, -.form-docs p, -.form-docs li { - color: #777; -} -.form-docs hr { - margin: 18px 0; -} - /* Fake the :focus state to demo it */ .focused { border-color: rgba(82,168,236,.8); @@ -689,10 +676,6 @@ form.well { left: auto; } - /* Forms docs */ - .form-docs { - padding-left: 0; /* down from 10px */ - } } -- cgit v1.2.3 From 48529ad01fa2a60bfc9179743dcb5379e8ff944f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jan 2012 13:06:57 -0800 Subject: last minute addition of a simple fluid grid for our fluid examples; it needs work, so we're not documenting it now --- docs/assets/css/bootstrap-responsive.css | 101 +++++++++++++++++++++++++++++-- docs/assets/css/bootstrap.css | 76 ++++++++++++++--------- 2 files changed, 144 insertions(+), 33 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index ca03cecde..44e0125c1 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -77,6 +77,9 @@ width: auto; padding: 0 20px; } + .row-fluid { + width: 100%; + } .row { margin-left: 0; } @@ -162,6 +165,50 @@ .offset11 { margin-left: 702px; } + .row-fluid { + width: 102.76243093919337%; + margin-left: -2.762430939%; + } + .row-fluid [class*="span"] { + float: left; + margin-left: 2.762430939%; + } + .row-fluid .span1 { + width: 5.6451612899588115%; + } + .row-fluid .span2 { + width: 13.978494622708812%; + } + .row-fluid .span3 { + width: 22.31182795545881%; + } + .row-fluid .span4 { + width: 30.64516128820881%; + } + .row-fluid .span5 { + width: 38.97849462095881%; + } + .row-fluid .span6 { + width: 47.311827953708814%; + } + .row-fluid .span7 { + width: 55.645161286458816%; + } + .row-fluid .span8 { + width: 63.97849461920882%; + } + .row-fluid .span9 { + width: 72.31182795195882%; + } + .row-fluid .span10 { + width: 80.64516128470882%; + } + .row-fluid .span11 { + width: 88.97849461745884%; + } + .row-fluid .span12 { + width: 97.31182795020881%; + } } @media (max-width: 940px) { body { @@ -169,7 +216,7 @@ } .navbar-fixed-top { position: static; - margin-bottom: 36px; + margin-bottom: 18px; } .navbar-inner { padding: 5px; @@ -264,6 +311,12 @@ } } @media (min-width: 1200px) { + .thumbnails { + margin-left: -30px; + } + .thumbnails > li { + margin-left: 30px; + } .container { width: 1170px; } @@ -342,10 +395,48 @@ .offset11 { margin-left: 1130px; } - .thumbnails { - margin-left: -30px; + .row-fluid { + width: 102.56143440326584%; + margin-left: -2.56%; } - .thumbnails > li { - margin-left: 30px; + .row-fluid [class*="span"] { + float: left; + margin-left: 2.56%; + } + .row-fluid .span1 { + width: 5.832601732615312%; + } + .row-fluid .span2 { + width: 14.16126839928198%; + } + .row-fluid .span3 { + width: 22.489935065948643%; + } + .row-fluid .span4 { + width: 30.818601732615313%; + } + .row-fluid .span5 { + width: 39.14726839928198%; + } + .row-fluid .span6 { + width: 47.47593506594863%; + } + .row-fluid .span7 { + width: 55.8046017326153%; + } + .row-fluid .span8 { + width: 64.13326839928197%; + } + .row-fluid .span9 { + width: 72.46193506594864%; + } + .row-fluid .span10 { + width: 80.7906017326153%; + } + .row-fluid .span11 { + width: 89.11926839928198%; + } + .row-fluid .span12 { + width: 97.44793506594864%; } } diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c96818a56..60383fba0 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -126,7 +126,7 @@ a:hover { margin-left: 20px; } .span1 { - width: 60px; + width: 59.99999999999999px; } .span2 { width: 140px; @@ -194,6 +194,50 @@ a:hover { .offset11 { margin-left: 900px; } +.row-fluid { + width: 102.12765957421277%; + margin-left: -2.127659574%; +} +.row-fluid [class*="span"] { + float: left; + margin-left: 2.127659574%; +} +.row-fluid .span1 { + width: 6.249999999619791%; +} +.row-fluid .span2 { + width: 14.58333333211979%; +} +.row-fluid .span3 { + width: 22.91666666461979%; +} +.row-fluid .span4 { + width: 31.24999999711979%; +} +.row-fluid .span5 { + width: 39.58333332961979%; +} +.row-fluid .span6 { + width: 47.91666666211979%; +} +.row-fluid .span7 { + width: 56.24999999461979%; +} +.row-fluid .span8 { + width: 64.58333332711977%; +} +.row-fluid .span9 { + width: 72.91666665961978%; +} +.row-fluid .span10 { + width: 81.24999999211977%; +} +.row-fluid .span11 { + width: 89.58333332461977%; +} +.row-fluid .span12 { + width: 97.91666665711978%; +} .container { width: 940px; margin-left: auto; @@ -207,42 +251,18 @@ a:hover { .container:after { clear: both; } -.fluid-container { - position: relative; - min-width: 940px; +.container-fluid { padding-left: 20px; padding-right: 20px; *zoom: 1; } -.fluid-container:before, .fluid-container:after { +.container-fluid:before, .container-fluid:after { display: table; content: ""; } -.fluid-container:after { +.container-fluid: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 4e5b0e185e8cc9df3a77361380a44b16689fd2f7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jan 2012 13:12:13 -0800 Subject: refined pager styles to give a border on the links and improved hover state --- docs/assets/css/bootstrap.css | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 60383fba0..3f36aaa4d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2707,12 +2707,17 @@ button.btn.small, input[type="submit"].btn.small { } .pager a { display: inline-block; - padding: 6px 15px; - background-color: #f5f5f5; + padding: 5px 14px; + background-color: #fff; + border: 1px solid #ddd; -webkit-border-radius: 15px; -moz-border-radius: 15px; border-radius: 15px; } +.pager a:hover { + text-decoration: none; + background-color: #f5f5f5; +} .pager .next a { float: right; } -- cgit v1.2.3 From 9fa8bde44d9bb6f26b16c7633a01bbe5ce7b20a4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jan 2012 13:15:38 -0800 Subject: fix animated/striped gradients in progress bars --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 3f36aaa4d..675446f62 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3127,7 +3127,7 @@ a.thumbnail:hover { -o-transition: width 0.6s ease; transition: width 0.6s ease; } -.progress.striped .bar { +.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); -- cgit v1.2.3 From 278858e70698f0dcf8651cb59b13e48fe756d8bd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jan 2012 13:25:13 -0800 Subject: fix form styles on prepend/append for consistency, update code docs with examples of the code snippets --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 675446f62..5330b5102 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -894,7 +894,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec min-width: 16px; height: 18px; margin-right: -1px; - padding: 4px 4px 4px 5px; + padding: 4px 5px; font-weight: normal; line-height: 18px; color: #999999; -- cgit v1.2.3 From 9e7f5025b494927e9ffc88119b0b9426f7487a62 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jan 2012 14:07:14 -0800 Subject: update collapsible nav in navbar --- docs/assets/css/bootstrap-responsive.css | 7 +++++-- docs/assets/css/bootstrap.css | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 44e0125c1..68ccf676f 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -218,7 +218,7 @@ position: static; margin-bottom: 18px; } - .navbar-inner { + .navbar-fixed-top .navbar-inner { padding: 5px; background-image: none; } @@ -305,10 +305,13 @@ .btn-navbar { display: block; } - .nav-collapse { + .nav-collapse.collapse { overflow: hidden; height: 0; } + .nav-collapse.collapse.in { + height: auto; + } } @media (min-width: 1200px) { .thumbnails { diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5330b5102..9b6217fbd 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2396,7 +2396,7 @@ button.btn.small, input[type="submit"].btn.small { margin-top: 3px; } .nav-collapse.collapse { - height: auto !important; + height: auto; } .navbar .brand:hover { text-decoration: none; -- cgit v1.2.3 From 702d3b6dfe7a150deb090f70d7d9c2a2964a3eb2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jan 2012 16:35:55 -0800 Subject: fix broken navbar collapse --- docs/assets/css/bootstrap-responsive.css | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 68ccf676f..76e27d672 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -305,12 +305,14 @@ .btn-navbar { display: block; } - .nav-collapse.collapse { + .nav-collapse { overflow: hidden; height: 0; } - .nav-collapse.collapse.in { - height: auto; +} +@media (min-width: 940px) { + .nav-collapse.collapse { + height: auto !important; } } @media (min-width: 1200px) { -- cgit v1.2.3 From 2ba1b01f8d9a0410d9cf45532d8924d858af74cd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jan 2012 17:03:05 -0800 Subject: subnav adjustments --- docs/assets/css/docs.css | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 74b548628..1380b9e6c 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -707,6 +707,13 @@ form.well { .subnav .nav > li + li > a { border-top: 1px solid #e5e5e5; } + .subnav .nav > li:first-child > a, + .subnav .nav > li:first-child > a:hover { + -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; + } + /* Popovers */ .large-bird { -- cgit v1.2.3 From fae04c8ac1da675338c1cfaf3922223980667281 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 29 Jan 2012 19:04:26 -0800 Subject: add license for responsive and rebuild --- docs/assets/css/bootstrap-responsive.css | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 76e27d672..8fadecceb 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -1,3 +1,12 @@ +/*! + * Bootstrap Responsive 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. + */ .hidden { display: none; visibility: hidden; -- cgit v1.2.3 From ae7f94eeff733584cbdc80a2d13a85f136a7744e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 00:39:44 -0800 Subject: overhaul grid mixins and variables, standardize fluid grid system and enable it across responsive layouts --- docs/assets/css/bootstrap-responsive.css | 196 ++++++++++++++++++++++++------- docs/assets/css/bootstrap.css | 78 ++++-------- docs/assets/css/docs.css | 1 + 3 files changed, 179 insertions(+), 96 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 76e27d672..fb1d62692 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -83,7 +83,7 @@ .row { margin-left: 0; } - .row > [class*="span"] { + .row > [class*="span"], .row-fluid > [class*="span"] { float: none; display: block; width: auto; @@ -91,10 +91,20 @@ } } @media (min-width: 768px) and (max-width: 940px) { - .container { - width: 724px; - padding-left: 20px; - padding-right: 20px; + .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: 42px; @@ -129,7 +139,7 @@ .span11 { width: 662px; } - .span12 { + .span12, .container { width: 724px; } .offset1 { @@ -166,48 +176,94 @@ margin-left: 702px; } .row-fluid { - width: 102.76243093919337%; - margin-left: -2.762430939%; + width: 100%; + *zoom: 1; + } + .row-fluid:before, .row-fluid:after { + display: table; + content: ""; + } + .row-fluid:after { + clear: both; } .row-fluid [class*="span"] { float: left; margin-left: 2.762430939%; } + .row-fluid [class*="span"]:first-child { + margin-left: 0; + } .row-fluid .span1 { - width: 5.6451612899588115%; + width: 5.801104972%; } .row-fluid .span2 { - width: 13.978494622708812%; + width: 14.364640883%; } .row-fluid .span3 { - width: 22.31182795545881%; + width: 22.928176794%; } .row-fluid .span4 { - width: 30.64516128820881%; + width: 31.491712705%; } .row-fluid .span5 { - width: 38.97849462095881%; + width: 40.055248616%; } .row-fluid .span6 { - width: 47.311827953708814%; + width: 48.618784527%; } .row-fluid .span7 { - width: 55.645161286458816%; + width: 57.182320438000005%; } .row-fluid .span8 { - width: 63.97849461920882%; + width: 65.74585634900001%; } .row-fluid .span9 { - width: 72.31182795195882%; + width: 74.30939226%; } .row-fluid .span10 { - width: 80.64516128470882%; + width: 82.87292817100001%; } .row-fluid .span11 { - width: 88.97849461745884%; + width: 91.436464082%; } .row-fluid .span12 { - width: 97.31182795020881%; + width: 99.999999993%; + } + input.span1, textarea.span1, .uneditable-input.span1 { + width: 32px; + } + input.span2, textarea.span2, .uneditable-input.span2 { + width: 94px; + } + input.span3, textarea.span3, .uneditable-input.span3 { + width: 156px; + } + input.span4, textarea.span4, .uneditable-input.span4 { + width: 218px; + } + input.span5, textarea.span5, .uneditable-input.span5 { + width: 280px; + } + input.span6, textarea.span6, .uneditable-input.span6 { + width: 342px; + } + input.span7, textarea.span7, .uneditable-input.span7 { + width: 404px; + } + input.span8, textarea.span8, .uneditable-input.span8 { + width: 466px; + } + input.span9, textarea.span9, .uneditable-input.span9 { + width: 528px; + } + input.span10, textarea.span10, .uneditable-input.span10 { + width: 590px; + } + input.span11, textarea.span11, .uneditable-input.span11 { + width: 652px; + } + input.span12, textarea.span12, .uneditable-input.span12 { + width: 714px; } } @media (max-width: 940px) { @@ -316,19 +372,19 @@ } } @media (min-width: 1200px) { - .thumbnails { + .row { margin-left: -30px; + *zoom: 1; } - .thumbnails > li { - margin-left: 30px; + .row:before, .row:after { + display: table; + content: ""; } - .container { - width: 1170px; - } - .row { - margin-left: -30px; + .row:after { + clear: both; } [class*="span"] { + float: left; margin-left: 30px; } .span1 { @@ -364,7 +420,7 @@ .span11 { width: 1070px; } - .span12 { + .span12, .container { width: 1170px; } .offset1 { @@ -401,47 +457,99 @@ margin-left: 1130px; } .row-fluid { - width: 102.56143440326584%; - margin-left: -2.56%; + width: 100%; + *zoom: 1; + } + .row-fluid:before, .row-fluid:after { + display: table; + content: ""; + } + .row-fluid:after { + clear: both; } .row-fluid [class*="span"] { float: left; - margin-left: 2.56%; + margin-left: 2.564102564%; + } + .row-fluid [class*="span"]:first-child { + margin-left: 0; } .row-fluid .span1 { - width: 5.832601732615312%; + width: 5.982905983%; } .row-fluid .span2 { - width: 14.16126839928198%; + width: 14.529914530000001%; } .row-fluid .span3 { - width: 22.489935065948643%; + width: 23.076923077%; } .row-fluid .span4 { - width: 30.818601732615313%; + width: 31.623931624%; } .row-fluid .span5 { - width: 39.14726839928198%; + width: 40.170940171000005%; } .row-fluid .span6 { - width: 47.47593506594863%; + width: 48.717948718%; } .row-fluid .span7 { - width: 55.8046017326153%; + width: 57.264957265%; } .row-fluid .span8 { - width: 64.13326839928197%; + width: 65.81196581200001%; } .row-fluid .span9 { - width: 72.46193506594864%; + width: 74.358974359%; } .row-fluid .span10 { - width: 80.7906017326153%; + width: 82.905982906%; } .row-fluid .span11 { - width: 89.11926839928198%; + width: 91.45299145300001%; } .row-fluid .span12 { - width: 97.44793506594864%; + width: 100%; + } + input.span1, textarea.span1, .uneditable-input.span1 { + width: 60px; + } + input.span2, textarea.span2, .uneditable-input.span2 { + width: 160px; + } + input.span3, textarea.span3, .uneditable-input.span3 { + width: 260px; + } + input.span4, textarea.span4, .uneditable-input.span4 { + width: 360px; + } + input.span5, textarea.span5, .uneditable-input.span5 { + width: 460px; + } + input.span6, textarea.span6, .uneditable-input.span6 { + width: 560px; + } + input.span7, textarea.span7, .uneditable-input.span7 { + width: 660px; + } + input.span8, textarea.span8, .uneditable-input.span8 { + width: 760px; + } + input.span9, textarea.span9, .uneditable-input.span9 { + width: 860px; + } + input.span10, textarea.span10, .uneditable-input.span10 { + width: 960px; + } + input.span11, textarea.span11, .uneditable-input.span11 { + width: 1060px; + } + input.span12, textarea.span12, .uneditable-input.span12 { + width: 1160px; + } + .thumbnails { + margin-left: -30px; + } + .thumbnails > li { + margin-left: 30px; } } diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9b6217fbd..b6766f0aa 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -126,7 +126,7 @@ a:hover { margin-left: 20px; } .span1 { - width: 59.99999999999999px; + width: 60px; } .span2 { width: 140px; @@ -158,7 +158,7 @@ a:hover { .span11 { width: 860px; } -.span12 { +.span12, .container { width: 940px; } .offset1 { @@ -195,48 +195,58 @@ a:hover { margin-left: 900px; } .row-fluid { - width: 102.12765957421277%; - margin-left: -2.127659574%; + width: 100%; + *zoom: 1; +} +.row-fluid:before, .row-fluid:after { + display: table; + content: ""; +} +.row-fluid:after { + clear: both; } .row-fluid [class*="span"] { float: left; margin-left: 2.127659574%; } +.row-fluid [class*="span"]:first-child { + margin-left: 0; +} .row-fluid .span1 { - width: 6.249999999619791%; + width: 6.382978723%; } .row-fluid .span2 { - width: 14.58333333211979%; + width: 14.89361702%; } .row-fluid .span3 { - width: 22.91666666461979%; + width: 23.404255317%; } .row-fluid .span4 { - width: 31.24999999711979%; + width: 31.914893614%; } .row-fluid .span5 { - width: 39.58333332961979%; + width: 40.425531911%; } .row-fluid .span6 { - width: 47.91666666211979%; + width: 48.93617020799999%; } .row-fluid .span7 { - width: 56.24999999461979%; + width: 57.446808505%; } .row-fluid .span8 { - width: 64.58333332711977%; + width: 65.95744680199999%; } .row-fluid .span9 { - width: 72.91666665961978%; + width: 74.468085099%; } .row-fluid .span10 { - width: 81.24999999211977%; + width: 82.97872339599999%; } .row-fluid .span11 { - width: 89.58333332461977%; + width: 91.489361693%; } .row-fluid .span12 { - width: 97.91666665711978%; + width: 99.99999998999999%; } .container { width: 940px; @@ -708,42 +718,6 @@ input.span11, textarea.span11, .uneditable-input.span11 { 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], diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 1380b9e6c..acbcc6941 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -553,6 +553,7 @@ form.well { } /* For input sizes, make them display block */ +.docs-input-sizes select, .docs-input-sizes input[type=text] { display: block; margin-bottom: 9px; -- cgit v1.2.3 From 8f448610a944efd134170f44e305ec6710bcff1a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 01:09:34 -0800 Subject: rename vertical-divider to divider-vertical, add more space around the divider --- docs/assets/css/bootstrap-responsive.css | 2 +- docs/assets/css/bootstrap.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index da6440bd2..8d2743709 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -308,7 +308,7 @@ .navbar .nav > li > a { margin-bottom: 2px; } - .navbar .nav > .vertical-divider { + .navbar .nav > .divider-vertical { display: none; } .navbar .nav > li > a, .navbar .dropdown-menu a { diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b6766f0aa..5a9068829 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2509,10 +2509,10 @@ button.btn.small, input[type="submit"].btn.small { background-color: #222222; background-color: rgba(0, 0, 0, 0.5); } -.navbar .vertical-divider { +.navbar .divider-vertical { height: 40px; width: 1px; - margin: 0 5px; + margin: 0 9px; overflow: hidden; background-color: #222222; border-right: 1px solid #333333; -- cgit v1.2.3 From f4e5bc1c536f0e2bd77958dd5575863808d4cfe4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 01:20:51 -0800 Subject: namespace popover values --- docs/assets/css/bootstrap.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5a9068829..82b7dc249 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2928,7 +2928,7 @@ button.btn.small, input[type="submit"].btn.small { width: 0; height: 0; } -.popover .inner { +.popover-inner { padding: 3px; width: 280px; overflow: hidden; @@ -2941,7 +2941,7 @@ button.btn.small, input[type="submit"].btn.small { -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 { +.popover-title { padding: 9px 15px; line-height: 1; background-color: #f5f5f5; @@ -2950,7 +2950,7 @@ button.btn.small, input[type="submit"].btn.small { -moz-border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0; } -.popover .content { +.popover-content { padding: 14px; background-color: #ffffff; -webkit-border-radius: 0 0 3px 3px; @@ -2960,7 +2960,7 @@ button.btn.small, input[type="submit"].btn.small { -moz-background-clip: padding-box; background-clip: padding-box; } -.popover .content p, .popover .content ul, .popover .content ol { +.popover-content p, .popover-content ul, .popover-content ol { margin-bottom: 0; } .thumbnails { -- cgit v1.2.3 From 9ba70796e2a25154689fa428d07018e877bbd6e4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 07:40:24 -0800 Subject: remove top 5px padding from first inline radio/checkbox --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 82b7dc249..61e5e3e58 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -627,7 +627,7 @@ input[type="hidden"] { margin-left: 10px; } .controls > .radio.inline:first-child, .controls > .checkbox.inline:first-child { - padding-top: 5px; + padding-top: 0; } input, textarea { -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -- cgit v1.2.3 From 2d40b07afc62ce9d899a290ab33222fd18287190 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 08:15:28 -0800 Subject: adding warning (orange) button, fix responsive navbar problem --- docs/assets/css/bootstrap-responsive.css | 9 +++++---- docs/assets/css/bootstrap.css | 31 +++++++++++++++++++++++++++++-- 2 files changed, 34 insertions(+), 6 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 8d2743709..8fe389563 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -195,11 +195,11 @@ .row-fluid:after { clear: both; } - .row-fluid [class*="span"] { + .row-fluid > [class*="span"] { float: left; margin-left: 2.762430939%; } - .row-fluid [class*="span"]:first-child { + .row-fluid > [class*="span"]:first-child { margin-left: 0; } .row-fluid .span1 { @@ -288,6 +288,7 @@ background-image: none; } .navbar .container { + width: auto; padding: 0; } .navbar .brand { @@ -476,11 +477,11 @@ .row-fluid:after { clear: both; } - .row-fluid [class*="span"] { + .row-fluid > [class*="span"] { float: left; margin-left: 2.564102564%; } - .row-fluid [class*="span"]:first-child { + .row-fluid > [class*="span"]:first-child { margin-left: 0; } .row-fluid .span1 { diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 61e5e3e58..7d987a56c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -205,11 +205,11 @@ a:hover { .row-fluid:after { clear: both; } -.row-fluid [class*="span"] { +.row-fluid > [class*="span"] { float: left; margin-left: 2.127659574%; } -.row-fluid [class*="span"]:first-child { +.row-fluid > [class*="span"]:first-child { margin-left: 0; } .row-fluid .span1 { @@ -1655,6 +1655,8 @@ table .span12 { } .btn.primary, .btn.primary:hover, +.btn.warning, +.btn.warning:hover, .btn.danger, .btn.danger:hover, .btn.success, @@ -1665,6 +1667,7 @@ table .span12 { color: #ffffff; } .btn.primary.active, +.btn.warning.active, .btn.danger.active, .btn.success.active, .btn.info.active { @@ -1694,6 +1697,30 @@ table .span12 { .btn.primary:active, .btn.primary.active { background-color: #003399 \9; } +.btn.warning { + background-color: #faa732; + background-image: -moz-linear-gradient(top, #fbb450, #f89406); + background-image: -ms-linear-gradient(top, #fbb450, #f89406); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); + background-image: -webkit-linear-gradient(top, #fbb450, #f89406); + background-image: -o-linear-gradient(top, #fbb450, #f89406); + background-image: linear-gradient(top, #fbb450, #f89406); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); + border-color: #f89406 #f89406 #ad6704; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +} +.btn.warning:hover, +.btn.warning:active, +.btn.warning.active, +.btn.warning.disabled, +.btn.warning[disabled] { + background-color: #f89406; +} +.btn.warning:active, .btn.warning.active { + background-color: #c67605 \9; +} .btn.danger { background-color: #da4f49; background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); -- cgit v1.2.3 From 3722c34b5032e5f1d4f6e8d28260b16ee48af4da Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 08:20:37 -0800 Subject: account for floated inputs in the .navbar-form --- docs/assets/css/bootstrap.css | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7d987a56c..2caba5f4d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2429,6 +2429,14 @@ button.btn.small, input[type="submit"].btn.small { } .navbar-form { margin-bottom: 0; + *zoom: 1; +} +.navbar-form:before, .navbar-form:after { + display: table; + content: ""; +} +.navbar-form:after { + clear: both; } .navbar-form input, .navbar-form select { display: inline-block; -- cgit v1.2.3 From ac581eebac209ce20591bac2f726f35a9b22d750 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 09:19:25 -0800 Subject: large carousel images and margin bottom added --- docs/assets/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 2caba5f4d..787e3f2ff 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3237,6 +3237,7 @@ a.thumbnail:hover { } .carousel { position: relative; + margin-bottom: 18px; line-height: 1; } .carousel-inner { -- cgit v1.2.3 From e94e0f1cf94e8232933a05cfe61efdb49dd64249 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 09:41:31 -0800 Subject: implement @textColor for body text --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 787e3f2ff..8045e561d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -99,7 +99,7 @@ body { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; line-height: 18px; - color: #555555; + color: #333333; background-color: #ffffff; } a { -- cgit v1.2.3 From 155047c3e6cfe589f1f244cdeb4e37244ab206ca Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 30 Jan 2012 13:59:05 -0800 Subject: speed up topbar animation for responsive --- docs/assets/css/bootstrap-responsive.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 8fe389563..f00ec1de3 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -374,6 +374,7 @@ .nav-collapse { overflow: hidden; height: 0; + -webkit-transform: translate3d(0, 0, 0); } } @media (min-width: 940px) { -- cgit v1.2.3 From 21bebe77feb9265b06d65e1e941cf7c73c4d90c1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 20:50:51 -0800 Subject: refactor buttons.less --- docs/assets/css/bootstrap.css | 172 +++++++++++++++++++++--------------------- docs/assets/css/docs.css | 2 +- 2 files changed, 87 insertions(+), 87 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 8045e561d..c377d6f97 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1653,6 +1653,92 @@ table .span12 { filter: alpha(opacity=40); cursor: pointer; } +.btn { + display: inline-block; + padding: 4px 10px 4px; + font-size: 13px; + line-height: 18px; + color: #333333; + text-align: center; + 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; + 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; + *margin-left: .3em; +} +.btn:first-child { + *margin-left: 0; +} +.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: thin dotted; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; +} +.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; + color: rgba(0, 0, 0, 0.5); + outline: 0; +} +.btn.disabled, .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; + 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; + font-size: 11px; + line-height: 16px; +} +.btn.small .icon { + margin-top: -1px; +} .btn.primary, .btn.primary:hover, .btn.warning, @@ -1793,92 +1879,6 @@ table .span12 { .btn.info:active, .btn.info.active { background-color: #24748c \9; } -.btn { - display: inline-block; - padding: 4px 10px 4px; - font-size: 13px; - line-height: 18px; - color: #333333; - text-align: center; - 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; - 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; - *margin-left: .3em; -} -.btn:first-child { - *margin-left: 0; -} -.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: thin dotted; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} -.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; - color: rgba(0, 0, 0, 0.5); - outline: 0; -} -.btn.disabled, .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; - 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; - font-size: 11px; - line-height: 16px; -} -.btn.small .icon { - margin-top: -1px; -} button.btn, input[type="submit"].btn { *padding-top: 2px; *padding-bottom: 2px; diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index acbcc6941..026872a34 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -73,7 +73,7 @@ hr.soften { line-height: 36px; color: #333; } -.jumbotron .btn-large { +.jumbotron .btn { font-size: 20px; font-weight: normal; padding: 14px 24px; -- cgit v1.2.3 From 0f3a073b8dca534e78c09b71999d5a2632e2245d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 21:15:57 -0800 Subject: *really* refactor the buttons and update them all over the docs --- docs/assets/css/bootstrap.css | 122 +++++++++++++++++++++--------------------- docs/assets/css/docs.css | 6 +-- 2 files changed, 64 insertions(+), 64 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c377d6f97..ec8a5f3ff 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1700,7 +1700,7 @@ table .span12 { outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } -.btn.active, .btn:active { +.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); @@ -1710,7 +1710,7 @@ table .span12 { color: rgba(0, 0, 0, 0.5); outline: 0; } -.btn.disabled, .btn[disabled] { +.btn-disabled, .btn[disabled] { cursor: default; background-image: none; background-color: #e6e6e6; @@ -1720,7 +1720,7 @@ table .span12 { -moz-box-shadow: none; box-shadow: none; } -.btn.large { +.btn-large { padding: 9px 14px; font-size: 15px; line-height: normal; @@ -1728,38 +1728,38 @@ table .span12 { -moz-border-radius: 5px; border-radius: 5px; } -.btn.large .icon { +.btn-large .icon { margin-top: 1px; } -.btn.small { +.btn-small { padding: 5px 9px; font-size: 11px; line-height: 16px; } -.btn.small .icon { +.btn-small .icon { margin-top: -1px; } -.btn.primary, -.btn.primary:hover, -.btn.warning, -.btn.warning:hover, -.btn.danger, -.btn.danger:hover, -.btn.success, -.btn.success:hover, -.btn.info, -.btn.info:hover { +.btn-primary, +.btn-primary:hover, +.btn-warning, +.btn-warning: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.active, -.btn.warning.active, -.btn.danger.active, -.btn.success.active, -.btn.info.active { +.btn-primary.active, +.btn-warning.active, +.btn-danger.active, +.btn-success.active, +.btn-info.active { color: rgba(255, 255, 255, 0.75); } -.btn.primary { +.btn-primary { background-color: #006dcc; background-image: -moz-linear-gradient(top, #0088cc, #0044cc); background-image: -ms-linear-gradient(top, #0088cc, #0044cc); @@ -1773,17 +1773,17 @@ table .span12 { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } -.btn.primary:hover, -.btn.primary:active, -.btn.primary.active, -.btn.primary.disabled, -.btn.primary[disabled] { +.btn-primary:hover, +.btn-primary:active, +.btn-primary.active, +.btn-primary.disabled, +.btn-primary[disabled] { background-color: #0044cc; } -.btn.primary:active, .btn.primary.active { +.btn-primary:active, .btn-primary.active { background-color: #003399 \9; } -.btn.warning { +.btn-warning { background-color: #faa732; background-image: -moz-linear-gradient(top, #fbb450, #f89406); background-image: -ms-linear-gradient(top, #fbb450, #f89406); @@ -1797,17 +1797,17 @@ table .span12 { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } -.btn.warning:hover, -.btn.warning:active, -.btn.warning.active, -.btn.warning.disabled, -.btn.warning[disabled] { +.btn-warning:hover, +.btn-warning:active, +.btn-warning.active, +.btn-warning.disabled, +.btn-warning[disabled] { background-color: #f89406; } -.btn.warning:active, .btn.warning.active { +.btn-warning:active, .btn-warning.active { background-color: #c67605 \9; } -.btn.danger { +.btn-danger { background-color: #da4f49; background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f); @@ -1821,17 +1821,17 @@ table .span12 { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } -.btn.danger:hover, -.btn.danger:active, -.btn.danger.active, -.btn.danger.disabled, -.btn.danger[disabled] { +.btn-danger:hover, +.btn-danger:active, +.btn-danger.active, +.btn-danger.disabled, +.btn-danger[disabled] { background-color: #bd362f; } -.btn.danger:active, .btn.danger.active { +.btn-danger:active, .btn-danger.active { background-color: #942a25 \9; } -.btn.success { +.btn-success { background-color: #5bb75b; background-image: -moz-linear-gradient(top, #62c462, #51a351); background-image: -ms-linear-gradient(top, #62c462, #51a351); @@ -1845,17 +1845,17 @@ table .span12 { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } -.btn.success:hover, -.btn.success:active, -.btn.success.active, -.btn.success.disabled, -.btn.success[disabled] { +.btn-success:hover, +.btn-success:active, +.btn-success.active, +.btn-success.disabled, +.btn-success[disabled] { background-color: #51a351; } -.btn.success:active, .btn.success.active { +.btn-success:active, .btn-success.active { background-color: #408140 \9; } -.btn.info { +.btn-info { background-color: #49afcd; background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4); @@ -1869,14 +1869,14 @@ table .span12 { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } -.btn.info:hover, -.btn.info:active, -.btn.info.active, -.btn.info.disabled, -.btn.info[disabled] { +.btn-info:hover, +.btn-info:active, +.btn-info.active, +.btn-info.disabled, +.btn-info[disabled] { background-color: #2f96b4; } -.btn.info:active, .btn.info.active { +.btn-info:active, .btn-info.active { background-color: #24748c \9; } button.btn, input[type="submit"].btn { @@ -2008,15 +2008,15 @@ button.btn.small, input[type="submit"].btn.small { opacity: 1; filter: alpha(opacity=100); } -.primary .caret, -.danger .caret, -.info .caret, -.success .caret { +.btn-primary .caret, +.btn-danger .caret, +.btn-info .caret, +.btn-success .caret { border-top-color: #ffffff; opacity: 0.75; filter: alpha(opacity=75); } -.btn.small .caret { +.btn-small .caret { margin-top: 4px; } .alert { diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 026872a34..a5ad9631a 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -73,7 +73,7 @@ hr.soften { line-height: 36px; color: #333; } -.jumbotron .btn { +.jumbotron .btn-large { font-size: 20px; font-weight: normal; padding: 14px 24px; @@ -440,7 +440,7 @@ hr.soften { /* Giant download button */ .download-btn { - margin: 36px 0 108px.i; + margin: 36px 0 108px; } .download p, .download h4 { @@ -455,7 +455,7 @@ hr.soften { .download p { margin-bottom: 18px; } -.btn.xlarge { +.download-btn .btn { display: block; width: auto; padding: 19px 24px; -- cgit v1.2.3 From 31911659a200d39d8494f35f8fd71863ac1226d0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 21:29:50 -0800 Subject: refactor the navs to use prefixed classes, because you know, consistency is beast mode --- docs/assets/css/bootstrap.css | 106 +++++++++++++++++++++--------------------- 1 file changed, 53 insertions(+), 53 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index ec8a5f3ff..60e54ce9d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2084,65 +2084,65 @@ button.btn.small, input[type="submit"].btn.small { text-decoration: none; background-color: #eeeeee; } -.nav.list { +.nav-list { padding-left: 14px; padding-right: 14px; margin-bottom: 0; } -.nav.list > li > a, .nav.list .nav-header { +.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 { +.nav-list .nav-header { font-size: 11px; font-weight: bold; line-height: 18px; color: #999999; text-transform: uppercase; } -.nav.list > li + .nav-header { +.nav-list > li + .nav-header { margin-top: 9px; } -.nav.list .active > a { +.nav-list .active > a { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); background-color: #0088cc; } -.nav.list .icon { +.nav-list .icon { margin-right: 2px; } -.tabs, .pills { +.nav-tabs, .nav-pills { *zoom: 1; } -.tabs:before, -.pills:before, -.tabs:after, -.pills:after { +.nav-tabs:before, +.nav-pills:before, +.nav-tabs:after, +.nav-pills:after { display: table; content: ""; } -.tabs:after, .pills:after { +.nav-tabs:after, .nav-pills:after { clear: both; } -.tabs > li, .pills > li { +.nav-tabs > li, .nav-pills > li { float: left; } -.tabs > li > a, .pills > li > a { +.nav-tabs > li > a, .nav-pills > li > a { padding-right: 12px; padding-left: 12px; margin-right: 2px; line-height: 14px; } -.tabs { +.nav-tabs { border-bottom: 1px solid #ddd; } -.tabs > li { +.nav-tabs > li { margin-bottom: -1px; } -.tabs > li > a { +.nav-tabs > li > a { padding-top: 9px; padding-bottom: 9px; border: 1px solid transparent; @@ -2150,17 +2150,17 @@ button.btn.small, input[type="submit"].btn.small { -moz-border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0; } -.tabs > li > a:hover { +.nav-tabs > li > a:hover { border-color: #eeeeee #eeeeee #dddddd; } -.tabs > .active > a, .tabs > .active > a:hover { +.nav-tabs > .active > a, .nav-tabs > .active > a:hover { color: #555555; background-color: #ffffff; border: 1px solid #ddd; border-bottom-color: transparent; cursor: default; } -.pills > li > a { +.nav-pills > li > a { padding-top: 8px; padding-bottom: 8px; margin-top: 2px; @@ -2169,69 +2169,69 @@ button.btn.small, input[type="submit"].btn.small { -moz-border-radius: 5px; border-radius: 5px; } -.pills .active > a, .pills .active > a:hover { +.nav-pills .active > a, .nav-pills .active > a:hover { color: #ffffff; background-color: #0088cc; } -.nav.stacked > li { +.nav-stacked > li { float: none; } -.nav.stacked > li > a { +.nav-stacked > li > a { margin-right: 0; } -.tabs.stacked { +.nav-tabs.nav-stacked { border-bottom: 0; } -.tabs.stacked > li > a { +.nav-tabs.nav-stacked > li > a { border: 1px solid #ddd; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } -.tabs.stacked > li:first-child > a { +.nav-tabs.nav-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 { +.nav-tabs.nav-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 { +.nav-tabs.nav-stacked > li > a:hover { border-color: #ddd; z-index: 2; } -.pills.stacked > li > a { +.nav-pills.nav-stacked > li > a { margin-bottom: 3px; } -.pills.stacked > li:last-child > a { +.nav-pills.nav-stacked > li:last-child > a { margin-bottom: 1px; } -.pills .dropdown-menu, .tabs .dropdown-menu { +.nav-tabs .dropdown-menu, .nav-pills .dropdown-menu { margin-top: 1px; border-width: 1px; } -.pills .dropdown-menu { +.nav-pills .dropdown-menu { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; } -.tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret { +.nav-tabs .dropdown-toggle .caret, .nav-pills .dropdown-toggle .caret { border-top-color: #0088cc; margin-top: 6px; } -.tabs .dropdown-toggle:hover .caret, .pills .dropdown-toggle:hover .caret { +.nav-tabs .dropdown-toggle:hover .caret, .nav-pills .dropdown-toggle:hover .caret { border-top-color: #005580; } -.tabs .active .dropdown-toggle .caret, .pills .active .dropdown-toggle .caret { +.nav-tabs .active .dropdown-toggle .caret, .nav-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 { +.nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, .nav > .open.active > a:hover { color: #ffffff; background-color: #999999; border-color: #999999; @@ -2241,7 +2241,7 @@ button.btn.small, input[type="submit"].btn.small { opacity: 1; filter: alpha(opacity=100); } -.tabs.stacked .open > a:hover { +.tabs-stacked .open > a:hover { border-color: #999999; } .tabbable { @@ -2254,7 +2254,7 @@ button.btn.small, input[type="submit"].btn.small { .tabbable:after { clear: both; } -.tabs-below .tabs, .tabs-right .tabs, .tabs-left .tabs { +.tabs-below .nav-tabs, .tabs-right .nav-tabs, .tabs-left .nav-tabs { border-bottom: 0; } .tab-content > .tab-pane, .pill-content > .pill-pane { @@ -2263,66 +2263,66 @@ button.btn.small, input[type="submit"].btn.small { .tab-content > .active, .pill-content > .active { display: block; } -.tabs-below .tabs { +.tabs-below .nav-tabs { border-top: 1px solid #ddd; } -.tabs-below .tabs > li { +.tabs-below .nav-tabs > li { margin-top: -1px; margin-bottom: 0; } -.tabs-below .tabs > li > a { +.tabs-below .nav-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 { +.tabs-below .nav-tabs > li > a:hover { border-bottom-color: transparent; border-top-color: #ddd; } -.tabs-below .tabs .active > a, .tabs-below .tabs .active > a:hover { +.tabs-below .nav-tabs .active > a, .tabs-below .nav-tabs .active > a:hover { border-color: transparent #ddd #ddd #ddd; } -.tabs-left .tabs > li, .tabs-right .tabs > li { +.tabs-left .nav-tabs > li, .tabs-right .nav-tabs > li { float: none; } -.tabs-left .tabs > li > a, .tabs-right .tabs > li > a { +.tabs-left .nav-tabs > li > a, .tabs-right .nav-tabs > li > a { min-width: 74px; margin-right: 0; margin-bottom: 3px; } -.tabs-left .tabs { +.tabs-left .nav-tabs { float: left; margin-right: 19px; border-right: 1px solid #ddd; } -.tabs-left .tabs > li > a { +.tabs-left .nav-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 { +.tabs-left .nav-tabs > li > a:hover { border-color: #eeeeee #dddddd #eeeeee #eeeeee; } -.tabs-left .tabs .active > a, .tabs-left .tabs .active > a:hover { +.tabs-left .nav-tabs .active > a, .tabs-left .nav-tabs .active > a:hover { border-color: #ddd transparent #ddd #ddd; *border-right-color: #ffffff; } -.tabs-right .tabs { +.tabs-right .nav-tabs { float: right; margin-left: 19px; border-left: 1px solid #ddd; } -.tabs-right .tabs > li > a { +.tabs-right .nav-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 { +.tabs-right .nav-tabs > li > a:hover { border-color: #eeeeee #eeeeee #eeeeee #dddddd; } -.tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover { +.tabs-right .nav-tabs .active > a, .tabs-right .nav-tabs .active > a:hover { border-color: #ddd #ddd #ddd transparent; *border-left-color: #ffffff; } -- cgit v1.2.3 From 47a68ae3aa8cad828eebe529403b46210c9d9d16 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 22:57:00 -0800 Subject: update icons everywhere to be scoped per other components, fix broken elements on js docs page --- docs/assets/css/bootstrap.css | 254 +++++++++++++++++++++--------------------- docs/assets/css/docs.css | 6 +- 2 files changed, 130 insertions(+), 130 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 60e54ce9d..2ffef9edf 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1112,380 +1112,380 @@ table .span12 { width: 924px; margin-left: 0; } -.icon { - background-image: url(../img/glyphicons-halflings.png); - background-position: 14px 14px; - background-repeat: no-repeat; +.i { display: inline-block; - vertical-align: text-top; width: 14px; height: 14px; + vertical-align: text-top; + background-image: url(../img/glyphicons-halflings.png); + background-position: 14px 14px; + background-repeat: no-repeat; *margin-right: .3em; } -.icon:last-child { +.i:last-child { *margin-left: 0; } -.icon.white { +.i-white { background-image: url(../img/glyphicons-halflings-white.png); } -.icon.glass { +.i-glass { background-position: 0 0; } -.icon.music { +.i-music { background-position: -24px 0; } -.icon.search { +.i-search { background-position: -48px 0; } -.icon.envelope { +.i-envelope { background-position: -72px 0; } -.icon.heart { +.i-heart { background-position: -96px 0; } -.icon.star { +.i-star { background-position: -120px 0; } -.icon.star-empty { +.i-star-empty { background-position: -144px 0; } -.icon.user { +.i-user { background-position: -168px 0; } -.icon.film { +.i-film { background-position: -192px 0; } -.icon.th-large { +.i-th-large { background-position: -216px 0; } -.icon.th { +.i-th { background-position: -240px 0; } -.icon.th-list { +.i-th-list { background-position: -264px 0; } -.icon.ok { +.i-ok { background-position: -288px 0; } -.icon.remove { +.i-remove { background-position: -312px 0; } -.icon.zoom-in { +.i-zoom-in { background-position: -336px 0; } -.icon.zoom-out { +.i-zoom-out { background-position: -360px 0; } -.icon.off { +.i-off { background-position: -384px 0; } -.icon.signal { +.i-signal { background-position: -408px 0; } -.icon.cog { +.i-cog { background-position: -432px 0; } -.icon.trash { +.i-trash { background-position: -456px 0; } -.icon.home { +.i-home { background-position: 0 -24px; } -.icon.file { +.i-file { background-position: -24px -24px; } -.icon.time { +.i-time { background-position: -48px -24px; } -.icon.road { +.i-road { background-position: -72px -24px; } -.icon.download-alt { +.i-download-alt { background-position: -96px -24px; } -.icon.download { +.i-download { background-position: -120px -24px; } -.icon.upload { +.i-upload { background-position: -144px -24px; } -.icon.inbox { +.i-inbox { background-position: -168px -24px; } -.icon.play-circle { +.i-play-circle { background-position: -192px -24px; } -.icon.repeat { +.i-repeat { background-position: -216px -24px; } -.icon.refresh { +.i-refresh { background-position: -240px -24px; } -.icon.list-alt { +.i-list-alt { background-position: -264px -24px; } -.icon.lock { +.i-lock { background-position: -287px -24px; } -.icon.flag { +.i-flag { background-position: -312px -24px; } -.icon.headphones { +.i-headphones { background-position: -336px -24px; } -.icon.volume-off { +.i-volume-off { background-position: -360px -24px; } -.icon.volume-down { +.i-volume-down { background-position: -384px -24px; } -.icon.volume-up { +.i-volume-up { background-position: -408px -24px; } -.icon.qrcode { +.i-qrcode { background-position: -432px -24px; } -.icon.barcode { +.i-barcode { background-position: -456px -24px; } -.icon.tag { +.i-tag { background-position: 0 -48px; } -.icon.tags { +.i-tags { background-position: -25px -48px; } -.icon.book { +.i-book { background-position: -48px -48px; } -.icon.bookmark { +.i-bookmark { background-position: -72px -48px; } -.icon.print { +.i-print { background-position: -96px -48px; } -.icon.camera { +.i-camera { background-position: -120px -48px; } -.icon.font { +.i-font { background-position: -144px -48px; } -.icon.bold { +.i-bold { background-position: -167px -48px; } -.icon.italic { +.i-italic { background-position: -192px -48px; } -.icon.text-height { +.i-text-height { background-position: -216px -48px; } -.icon.text-width { +.i-text-width { background-position: -240px -48px; } -.icon.align-left { +.i-align-left { background-position: -264px -48px; } -.icon.align-center { +.i-align-center { background-position: -288px -48px; } -.icon.align-right { +.i-align-right { background-position: -312px -48px; } -.icon.align-justify { +.i-align-justify { background-position: -336px -48px; } -.icon.list { +.i-list { background-position: -360px -48px; } -.icon.indent-left { +.i-indent-left { background-position: -384px -48px; } -.icon.indent-right { +.i-indent-right { background-position: -408px -48px; } -.icon.facetime-video { +.i-facetime-video { background-position: -432px -48px; } -.icon.picture { +.i-picture { background-position: -456px -48px; } -.icon.pencil { +.i-pencil { background-position: 0 -72px; } -.icon.map-marker { +.i-map-marker { background-position: -24px -72px; } -.icon.adjust { +.i-adjust { background-position: -48px -72px; } -.icon.tint { +.i-tint { background-position: -72px -72px; } -.icon.edit { +.i-edit { background-position: -96px -72px; } -.icon.share { +.i-share { background-position: -120px -72px; } -.icon.check { +.i-check { background-position: -144px -72px; } -.icon.move { +.i-move { background-position: -168px -72px; } -.icon.step-backward { +.i-step-backward { background-position: -192px -72px; } -.icon.fast-backward { +.i-fast-backward { background-position: -216px -72px; } -.icon.backward { +.i-backward { background-position: -240px -72px; } -.icon.play { +.i-play { background-position: -264px -72px; } -.icon.pause { +.i-pause { background-position: -288px -72px; } -.icon.stop { +.i-stop { background-position: -312px -72px; } -.icon.forward { +.i-forward { background-position: -336px -72px; } -.icon.fast-forward { +.i-fast-forward { background-position: -360px -72px; } -.icon.step-forward { +.i-step-forward { background-position: -384px -72px; } -.icon.eject { +.i-eject { background-position: -408px -72px; } -.icon.chevron-left { +.i-chevron-left { background-position: -432px -72px; } -.icon.chevron-right { +.i-chevron-right { background-position: -456px -72px; } -.icon.plus-sign { +.i-plus-sign { background-position: 0 -96px; } -.icon.minus-sign { +.i-minus-sign { background-position: -24px -96px; } -.icon.remove-sign { +.i-remove-sign { background-position: -48px -96px; } -.icon.ok-sign { +.i-ok-sign { background-position: -72px -96px; } -.icon.question-sign { +.i-question-sign { background-position: -96px -96px; } -.icon.info-sign { +.i-info-sign { background-position: -120px -96px; } -.icon.screenshot { +.i-screenshot { background-position: -144px -96px; } -.icon.remove-circle { +.i-remove-circle { background-position: -168px -96px; } -.icon.ok-circle { +.i-ok-circle { background-position: -192px -96px; } -.icon.ban-circle { +.i-ban-circle { background-position: -216px -96px; } -.icon.arrow-left { +.i-arrow-left { background-position: -240px -96px; } -.icon.arrow-right { +.i-arrow-right { background-position: -264px -96px; } -.icon.arrow-up { +.i-arrow-up { background-position: -289px -96px; } -.icon.arrow-down { +.i-arrow-down { background-position: -312px -96px; } -.icon.share-alt { +.i-share-alt { background-position: -336px -96px; } -.icon.resize-full { +.i-resize-full { background-position: -360px -96px; } -.icon.resize-small { +.i-resize-small { background-position: -384px -96px; } -.icon.plus { +.i-plus { background-position: -408px -96px; } -.icon.minus { +.i-minus { background-position: -433px -96px; } -.icon.asterisk { +.i-asterisk { background-position: -456px -96px; } -.icon.exclamation-sign { +.i-exclamation-sign { background-position: 0 -120px; } -.icon.gift { +.i-gift { background-position: -24px -120px; } -.icon.leaf { +.i-leaf { background-position: -48px -120px; } -.icon.fire { +.i-fire { background-position: -72px -120px; } -.icon.eye-open { +.i-eye-open { background-position: -96px -120px; } -.icon.eye-close { +.i-eye-close { background-position: -120px -120px; } -.icon.warning-sign { +.i-warning-sign { background-position: -144px -120px; } -.icon.plane { +.i-plane { background-position: -168px -120px; } -.icon.calendar { +.i-calendar { background-position: -192px -120px; } -.icon.random { +.i-random { background-position: -216px -120px; } -.icon.comment { +.i-comment { background-position: -240px -120px; } -.icon.magnet { +.i-magnet { background-position: -264px -120px; } -.icon.chevron-up { +.i-chevron-up { background-position: -288px -120px; } -.icon.chevron-down { +.i-chevron-down { background-position: -313px -119px; } -.icon.retweet { +.i-retweet { background-position: -336px -120px; } -.icon.shopping-cart { +.i-shopping-cart { background-position: -360px -120px; } -.icon.folder-close { +.i-folder-close { background-position: -384px -120px; } -.icon.folder-open { +.i-folder-open { background-position: -408px -120px; } -.icon.resize-vertical { +.i-resize-vertical { background-position: -432px -119px; } -.icon.resize-horizontal { +.i-resize-horizontal { background-position: -456px -118px; } .dropdown { diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index a5ad9631a..7b6e4ef3a 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -564,14 +564,14 @@ form.well { .the-icons { margin-bottom: 18px; } -.the-icons i { +.the-icons .i { display: block; margin-bottom: 5px; } -.the-icons i:hover { +.the-icons .i:hover { background-color: rgba(255,0,0,.25); } -.the-icons i:after { +.the-icons .i:after { display: block; content: attr(class); font-style: normal; -- cgit v1.2.3 From 1cff29c33f97fc40de1f8d582d7b1a3f4c7783c5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 23:02:24 -0800 Subject: restore a few commented out responsive items --- docs/assets/css/bootstrap-responsive.css | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index f00ec1de3..35e96bbcd 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -285,7 +285,6 @@ } .navbar-fixed-top .navbar-inner { padding: 5px; - background-image: none; } .navbar .container { width: auto; -- cgit v1.2.3 From 61b47e91b800e022f1736da772eb23aa9077f2f1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 23:10:29 -0800 Subject: update layout docs --- docs/assets/css/docs.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 7b6e4ef3a..9d07f3c44 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -356,8 +356,8 @@ hr.soften { height: 240px; } .mini-layout.fluid .mini-layout-body { - width: 60%; - margin-left: 10px; + width: 77.5%; + margin-left: 2.5%; } -- cgit v1.2.3 From 5c9a687665f7851435e29b28afb02b450a5903a4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 23:16:27 -0800 Subject: fix button styles on active and disabled --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 2ffef9edf..e1413d440 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1700,7 +1700,7 @@ table .span12 { outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } -.btn-active, .btn:active { +.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); @@ -1710,7 +1710,7 @@ table .span12 { color: rgba(0, 0, 0, 0.5); outline: 0; } -.btn-disabled, .btn[disabled] { +.btn.disabled, .btn[disabled] { cursor: default; background-image: none; background-color: #e6e6e6; -- cgit v1.2.3 From d533310bd2fa157edb076f9047af8f1cff0fca05 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 23:24:35 -0800 Subject: once more, overhaul the icons and use the css regex selector on our icons --- docs/assets/css/bootstrap.css | 4 ++-- docs/assets/css/docs.css | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e1413d440..2fe20c332 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1112,7 +1112,7 @@ table .span12 { width: 924px; margin-left: 0; } -.i { +[class*="i-"] { display: inline-block; width: 14px; height: 14px; @@ -1122,7 +1122,7 @@ table .span12 { background-repeat: no-repeat; *margin-right: .3em; } -.i:last-child { +[class*="i-"]:last-child { *margin-left: 0; } .i-white { diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 9d07f3c44..cc64d3166 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -564,14 +564,14 @@ form.well { .the-icons { margin-bottom: 18px; } -.the-icons .i { +.the-icons i { display: block; margin-bottom: 5px; } -.the-icons .i:hover { +.the-icons i:hover { background-color: rgba(255,0,0,.25); } -.the-icons .i:after { +.the-icons i:after { display: block; content: attr(class); font-style: normal; -- cgit v1.2.3 From 4d93b639164f4331dc8b52ae1bcb824dddb97370 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 23:27:58 -0800 Subject: disable cursor on disabled and active pagination links --- docs/assets/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 2fe20c332..ce589dd80 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2674,6 +2674,7 @@ button.btn.small, input[type="submit"].btn.small { } .pagination .active a { color: #999999; + cursor: default; } .pagination .disabled a, .pagination .disabled a:hover { color: #999999; -- cgit v1.2.3 From b7713b83fa25f4b28869fe846b04baac00ca781b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 31 Jan 2012 00:11:19 -0800 Subject: chance icon class --- docs/assets/css/bootstrap.css | 250 +++++++++++++++++++++--------------------- 1 file changed, 125 insertions(+), 125 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index ce589dd80..7d519a608 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1112,7 +1112,7 @@ table .span12 { width: 924px; margin-left: 0; } -[class*="i-"] { +[class*="icon-"] { display: inline-block; width: 14px; height: 14px; @@ -1122,370 +1122,370 @@ table .span12 { background-repeat: no-repeat; *margin-right: .3em; } -[class*="i-"]:last-child { +[class*="icon-"]:last-child { *margin-left: 0; } -.i-white { +.icon-white { background-image: url(../img/glyphicons-halflings-white.png); } -.i-glass { +.icon-glass { background-position: 0 0; } -.i-music { +.icon-music { background-position: -24px 0; } -.i-search { +.icon-search { background-position: -48px 0; } -.i-envelope { +.icon-envelope { background-position: -72px 0; } -.i-heart { +.icon-heart { background-position: -96px 0; } -.i-star { +.icon-star { background-position: -120px 0; } -.i-star-empty { +.icon-star-empty { background-position: -144px 0; } -.i-user { +.icon-user { background-position: -168px 0; } -.i-film { +.icon-film { background-position: -192px 0; } -.i-th-large { +.icon-th-large { background-position: -216px 0; } -.i-th { +.icon-th { background-position: -240px 0; } -.i-th-list { +.icon-th-list { background-position: -264px 0; } -.i-ok { +.icon-ok { background-position: -288px 0; } -.i-remove { +.icon-remove { background-position: -312px 0; } -.i-zoom-in { +.icon-zoom-in { background-position: -336px 0; } -.i-zoom-out { +.icon-zoom-out { background-position: -360px 0; } -.i-off { +.icon-off { background-position: -384px 0; } -.i-signal { +.icon-signal { background-position: -408px 0; } -.i-cog { +.icon-cog { background-position: -432px 0; } -.i-trash { +.icon-trash { background-position: -456px 0; } -.i-home { +.icon-home { background-position: 0 -24px; } -.i-file { +.icon-file { background-position: -24px -24px; } -.i-time { +.icon-time { background-position: -48px -24px; } -.i-road { +.icon-road { background-position: -72px -24px; } -.i-download-alt { +.icon-download-alt { background-position: -96px -24px; } -.i-download { +.icon-download { background-position: -120px -24px; } -.i-upload { +.icon-upload { background-position: -144px -24px; } -.i-inbox { +.icon-inbox { background-position: -168px -24px; } -.i-play-circle { +.icon-play-circle { background-position: -192px -24px; } -.i-repeat { +.icon-repeat { background-position: -216px -24px; } -.i-refresh { +.icon-refresh { background-position: -240px -24px; } -.i-list-alt { +.icon-list-alt { background-position: -264px -24px; } -.i-lock { +.icon-lock { background-position: -287px -24px; } -.i-flag { +.icon-flag { background-position: -312px -24px; } -.i-headphones { +.icon-headphones { background-position: -336px -24px; } -.i-volume-off { +.icon-volume-off { background-position: -360px -24px; } -.i-volume-down { +.icon-volume-down { background-position: -384px -24px; } -.i-volume-up { +.icon-volume-up { background-position: -408px -24px; } -.i-qrcode { +.icon-qrcode { background-position: -432px -24px; } -.i-barcode { +.icon-barcode { background-position: -456px -24px; } -.i-tag { +.icon-tag { background-position: 0 -48px; } -.i-tags { +.icon-tags { background-position: -25px -48px; } -.i-book { +.icon-book { background-position: -48px -48px; } -.i-bookmark { +.icon-bookmark { background-position: -72px -48px; } -.i-print { +.icon-print { background-position: -96px -48px; } -.i-camera { +.icon-camera { background-position: -120px -48px; } -.i-font { +.icon-font { background-position: -144px -48px; } -.i-bold { +.icon-bold { background-position: -167px -48px; } -.i-italic { +.icon-italic { background-position: -192px -48px; } -.i-text-height { +.icon-text-height { background-position: -216px -48px; } -.i-text-width { +.icon-text-width { background-position: -240px -48px; } -.i-align-left { +.icon-align-left { background-position: -264px -48px; } -.i-align-center { +.icon-align-center { background-position: -288px -48px; } -.i-align-right { +.icon-align-right { background-position: -312px -48px; } -.i-align-justify { +.icon-align-justify { background-position: -336px -48px; } -.i-list { +.icon-list { background-position: -360px -48px; } -.i-indent-left { +.icon-indent-left { background-position: -384px -48px; } -.i-indent-right { +.icon-indent-right { background-position: -408px -48px; } -.i-facetime-video { +.icon-facetime-video { background-position: -432px -48px; } -.i-picture { +.icon-picture { background-position: -456px -48px; } -.i-pencil { +.icon-pencil { background-position: 0 -72px; } -.i-map-marker { +.icon-map-marker { background-position: -24px -72px; } -.i-adjust { +.icon-adjust { background-position: -48px -72px; } -.i-tint { +.icon-tint { background-position: -72px -72px; } -.i-edit { +.icon-edit { background-position: -96px -72px; } -.i-share { +.icon-share { background-position: -120px -72px; } -.i-check { +.icon-check { background-position: -144px -72px; } -.i-move { +.icon-move { background-position: -168px -72px; } -.i-step-backward { +.icon-step-backward { background-position: -192px -72px; } -.i-fast-backward { +.icon-fast-backward { background-position: -216px -72px; } -.i-backward { +.icon-backward { background-position: -240px -72px; } -.i-play { +.icon-play { background-position: -264px -72px; } -.i-pause { +.icon-pause { background-position: -288px -72px; } -.i-stop { +.icon-stop { background-position: -312px -72px; } -.i-forward { +.icon-forward { background-position: -336px -72px; } -.i-fast-forward { +.icon-fast-forward { background-position: -360px -72px; } -.i-step-forward { +.icon-step-forward { background-position: -384px -72px; } -.i-eject { +.icon-eject { background-position: -408px -72px; } -.i-chevron-left { +.icon-chevron-left { background-position: -432px -72px; } -.i-chevron-right { +.icon-chevron-right { background-position: -456px -72px; } -.i-plus-sign { +.icon-plus-sign { background-position: 0 -96px; } -.i-minus-sign { +.icon-minus-sign { background-position: -24px -96px; } -.i-remove-sign { +.icon-remove-sign { background-position: -48px -96px; } -.i-ok-sign { +.icon-ok-sign { background-position: -72px -96px; } -.i-question-sign { +.icon-question-sign { background-position: -96px -96px; } -.i-info-sign { +.icon-info-sign { background-position: -120px -96px; } -.i-screenshot { +.icon-screenshot { background-position: -144px -96px; } -.i-remove-circle { +.icon-remove-circle { background-position: -168px -96px; } -.i-ok-circle { +.icon-ok-circle { background-position: -192px -96px; } -.i-ban-circle { +.icon-ban-circle { background-position: -216px -96px; } -.i-arrow-left { +.icon-arrow-left { background-position: -240px -96px; } -.i-arrow-right { +.icon-arrow-right { background-position: -264px -96px; } -.i-arrow-up { +.icon-arrow-up { background-position: -289px -96px; } -.i-arrow-down { +.icon-arrow-down { background-position: -312px -96px; } -.i-share-alt { +.icon-share-alt { background-position: -336px -96px; } -.i-resize-full { +.icon-resize-full { background-position: -360px -96px; } -.i-resize-small { +.icon-resize-small { background-position: -384px -96px; } -.i-plus { +.icon-plus { background-position: -408px -96px; } -.i-minus { +.icon-minus { background-position: -433px -96px; } -.i-asterisk { +.icon-asterisk { background-position: -456px -96px; } -.i-exclamation-sign { +.icon-exclamation-sign { background-position: 0 -120px; } -.i-gift { +.icon-gift { background-position: -24px -120px; } -.i-leaf { +.icon-leaf { background-position: -48px -120px; } -.i-fire { +.icon-fire { background-position: -72px -120px; } -.i-eye-open { +.icon-eye-open { background-position: -96px -120px; } -.i-eye-close { +.icon-eye-close { background-position: -120px -120px; } -.i-warning-sign { +.icon-warning-sign { background-position: -144px -120px; } -.i-plane { +.icon-plane { background-position: -168px -120px; } -.i-calendar { +.icon-calendar { background-position: -192px -120px; } -.i-random { +.icon-random { background-position: -216px -120px; } -.i-comment { +.icon-comment { background-position: -240px -120px; } -.i-magnet { +.icon-magnet { background-position: -264px -120px; } -.i-chevron-up { +.icon-chevron-up { background-position: -288px -120px; } -.i-chevron-down { +.icon-chevron-down { background-position: -313px -119px; } -.i-retweet { +.icon-retweet { background-position: -336px -120px; } -.i-shopping-cart { +.icon-shopping-cart { background-position: -360px -120px; } -.i-folder-close { +.icon-folder-close { background-position: -384px -120px; } -.i-folder-open { +.icon-folder-open { background-position: -408px -120px; } -.i-resize-vertical { +.icon-resize-vertical { background-position: -432px -119px; } -.i-resize-horizontal { +.icon-resize-horizontal { background-position: -456px -118px; } .dropdown { @@ -2381,7 +2381,7 @@ button.btn.small, input[type="submit"].btn.small { .btn-navbar:active, .btn-navbar.active { background-color: #080808 \9; } -.btn-navbar .i-bar { +.btn-navbar .icon-bar { display: block; width: 18px; height: 2px; @@ -2393,7 +2393,7 @@ button.btn.small, input[type="submit"].btn.small { -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); } -.btn-navbar .i-bar + .i-bar { +.btn-navbar .icon-bar + .icon-bar { margin-top: 3px; } .nav-collapse.collapse { -- cgit v1.2.3