vendor/assets/stylesheets/bootstrap/bootstrap.css in jombo-0.0.1.beta23 vs vendor/assets/stylesheets/bootstrap/bootstrap.css in jombo-0.0.1.beta24

- old
+ new

@@ -1,14 +1,14 @@ /*! * Bootstrap v2.0.0 * - * Copyright 2011 Twitter, Inc + * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Fri Jan 13 10:05:29 PST 2012 + * Date: Thu 19 Jan 2012 22:27:04 GMT */ html, body { margin: 0; padding: 0; } @@ -161,11 +161,11 @@ -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-decoration, input[type="search"]::-webkit-search-cancel-button { -webkit-appearance: none; } textarea { overflow: auto; vertical-align: top; @@ -180,33 +180,29 @@ } .container { width: 940px; margin-left: auto; margin-right: auto; - zoom: 1; + *zoom: 1; } .container:before, .container:after { display: table; - *display: inline; content: ""; - zoom: 1; } .container:after { clear: both; } .fluid-container { position: relative; min-width: 940px; padding-left: 20px; padding-right: 20px; - zoom: 1; + *zoom: 1; } .fluid-container:before, .fluid-container:after { display: table; - *display: inline; content: ""; - zoom: 1; } .fluid-container:after { clear: both; } .fluid-sidebar { @@ -241,17 +237,15 @@ color: #005580; text-decoration: underline; } .row { margin-left: -20px; - zoom: 1; + *zoom: 1; } .row:before, .row:after { display: table; - *display: inline; content: ""; - zoom: 1; } .row:after { clear: both; } [class*="span"] { @@ -408,26 +402,25 @@ ol { list-style: decimal; } li { line-height: 18px; - color: #555555; } ul.unstyled { margin-left: 0; list-style: none; } dl { margin-bottom: 18px; } -dl dt, dl dd { +dt, dd { line-height: 18px; } -dl dt { +dt { font-weight: bold; } -dl dd { +dd { margin-left: 9px; } hr { margin: 18px 0; border: 0; @@ -841,14 +834,14 @@ -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; } -input:-moz-placeholder { +:-moz-placeholder { color: #999999; } -input::-webkit-input-placeholder { +::-webkit-input-placeholder { color: #999999; } .help-block { margin-top: 5px; margin-bottom: 0; @@ -864,20 +857,18 @@ display: inline; padding-left: 5px; } .input-prepend, .input-append { margin-bottom: 5px; - zoom: 1; + *zoom: 1; } .input-prepend:before, .input-append:before, .input-prepend:after, .input-append:after { display: table; - *display: inline; content: ""; - zoom: 1; } .input-prepend:after, .input-append:after { clear: both; } .input-prepend input, @@ -941,106 +932,106 @@ margin-bottom: 0; -webkit-border-radius: 14px; -moz-border-radius: 14px; border-radius: 14px; } -.search-form input, -.inline-form input, -.horizontal-form input, -.search-form textarea, -.inline-form textarea, -.horizontal-form textarea, -.search-form select, -.inline-form select, -.horizontal-form select, -.search-form .uneditable-input, -.inline-form .uneditable-input, -.horizontal-form .uneditable-input { +.form-search input, +.form-inline input, +.form-horizontal input, +.form-search textarea, +.form-inline textarea, +.form-horizontal textarea, +.form-search select, +.form-inline select, +.form-horizontal select, +.form-search .uneditable-input, +.form-inline .uneditable-input, +.form-horizontal .uneditable-input { display: inline-block; margin-bottom: 0; } +.form-search label, .form-inline label { + display: inline-block; +} .control-group { margin-bottom: 18px; } -.control-group > label { - font-weight: bold; -} -.horizontal-form .control-group > label { +.form-horizontal .control-group > label { float: left; - width: 130px; + width: 140px; padding-top: 5px; text-align: right; } -.horizontal-form .controls { - margin-left: 150px; +.form-horizontal .controls { + margin-left: 160px; } -.horizontal-form .form-actions { - padding-left: 150px; +.form-horizontal .form-actions { + padding-left: 160px; } -table { +.table { width: 100%; margin-bottom: 18px; } -th, td { +.table th, .table td { padding: 8px; line-height: 18px; text-align: left; border-top: 1px solid #ddd; } -th { +.table th { font-weight: bold; vertical-align: bottom; } -td { +.table td { vertical-align: top; } -thead:first-child tr th, thead:first-child tr td { +.table thead:first-child tr th, .table thead:first-child tr td { border-top: 0; } -tbody + tbody { +.table tbody + tbody { border-top: 2px solid #ddd; } -.condensed-table th, .condensed-table td { +.table-condensed th, .table-condensed td { padding: 4px 5px; } -.bordered-table { +.table-bordered { border: 1px solid #ddd; border-collapse: separate; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; } -.bordered-table th + th, -.bordered-table td + td, -.bordered-table th + td, -.bordered-table td + th { +.table-bordered th + th, +.table-bordered td + td, +.table-bordered th + td, +.table-bordered td + th { border-left: 1px solid #ddd; } -.bordered-table thead:first-child tr:first-child th, .bordered-table tbody:first-child tr:first-child td { +.table-bordered thead:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child td { border-top: 0; } -.bordered-table thead:first-child tr:first-child th:first-child, .bordered-table tbody:first-child tr:first-child td:first-child { +.table-bordered thead:first-child tr:first-child th:first-child, .table-bordered tbody:first-child tr:first-child td:first-child { -webkit-border-radius: 4px 0 0 0; -moz-border-radius: 4px 0 0 0; border-radius: 4px 0 0 0; } -.bordered-table thead:first-child tr:first-child th:last-child, .bordered-table tbody:first-child tr:first-child td:last-child { +.table-bordered thead:first-child tr:first-child th:last-child, .table-bordered tbody:first-child tr:first-child td:last-child { -webkit-border-radius: 0 4px 0 0; -moz-border-radius: 0 4px 0 0; border-radius: 0 4px 0 0; } -.bordered-table thead:last-child tr:last-child th:first-child, .bordered-table tbody:last-child tr:last-child td:first-child { +.table-bordered thead:last-child tr:last-child th:first-child, .table-bordered tbody:last-child tr:last-child td:first-child { -webkit-border-radius: 0 0 0 4px; -moz-border-radius: 0 0 0 4px; border-radius: 0 0 0 4px; } -.bordered-table thead:last-child tr:last-child th:last-child, .bordered-table tbody:last-child tr:last-child td:last-child { +.table-bordered thead:last-child tr:last-child th:last-child, .table-bordered tbody:last-child tr:last-child td:last-child { -webkit-border-radius: 0 0 4px 0; -moz-border-radius: 0 0 4px 0; border-radius: 0 0 4px 0; } -.striped-table tbody tr:nth-child(odd) td, .striped-table tbody tr:nth-child(odd) th { +.table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th { background-color: #f9f9f9; } table .span1 { float: none; width: 44px; @@ -1112,11 +1103,11 @@ border-style: solid; border-color: #000 transparent; visibility: hidden; } table .headerSortUp, table .headerSortDown { - background-color: rgba(141, 192, 219, 0.25); + background-color: #f7f7f9; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); } table .header:hover:after { visibility: visible; } @@ -1179,11 +1170,11 @@ background-position: -216px 0; } .th { background-position: -240px 0; } -.th-lines { +.th-list { background-position: -264px 0; } .ok { background-position: -288px 0; } @@ -1436,10 +1427,11 @@ content: "\2193"; } .dropdown .caret { margin-top: 8px; margin-left: 2px; + *margin-top: 7px; } .dropdown:hover .caret, .open.dropdown .caret { filter: alpha(opacity=100); -moz-opacity: 1; opacity: 1; @@ -1455,11 +1447,11 @@ _width: 160px; padding: 4px 0; margin: 0; list-style: none; background-color: #ffffff; - border-color: #999; + border-color: #ccc; border-color: rgba(0, 0, 0, 0.2); border-style: solid; border-width: 1px; -webkit-border-radius: 0 0 5px 5px; -moz-border-radius: 0 0 5px 5px; @@ -1469,10 +1461,12 @@ 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 .divider { height: 1px; margin: 5px 1px; overflow: hidden; @@ -1551,11 +1545,11 @@ } .close { float: right; font-size: 20px; font-weight: bold; - line-height: 13.5px; + line-height: 12px; color: #000000; text-shadow: 0 1px 0 #ffffff; filter: alpha(opacity=20); -moz-opacity: 0.2; opacity: 0.2; @@ -1566,223 +1560,10 @@ filter: alpha(opacity=40); -moz-opacity: 0.4; opacity: 0.4; cursor: pointer; } -.navbar { - overflow: visible; -} -.navbar-inner { - background-color: #222222; - background-color: #222222; - background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222)); - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); -} -.navbar .brand:hover { - color: #ffffff; - text-decoration: none; -} -.navbar .brand { - float: left; - display: block; - padding: 8px 20px 12px; - margin-left: -20px; - font-size: 20px; - font-weight: 200; - line-height: 1; - color: #ffffff; -} -.navbar p { - margin: 0; - line-height: 40px; -} -.navbar p a:hover { - color: #ffffff; - background-color: transparent; -} -.navbar .btn { - margin-top: 5px; -} -.navbar-form { - margin-bottom: 0; -} -.navbar-form input, .navbar-form select { - display: inline-block; - margin-bottom: 0; -} -.navbar-search { - position: relative; - float: left; - margin-top: 6px; - margin-bottom: 0; -} -.navbar-search .search-query { - padding: 4px 9px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: normal; - line-height: 1; - color: #ffffff; - color: rgba(255, 255, 255, 0.75); - background-color: #444; - background-color: rgba(255, 255, 255, 0.3); - border: 1px solid #111; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); - -webkit-transition: none; - -moz-transition: none; - -ms-transition: none; - -o-transition: none; - transition: none; -} -.navbar-search .search-query:-moz-placeholder { - color: #eeeeee; -} -.navbar-search .search-query::-webkit-input-placeholder { - color: #eeeeee; -} -.navbar-search .search-query:hover { - color: #ffffff; - background-color: #999999; - background-color: rgba(255, 255, 255, 0.5); -} -.navbar-search .search-query:focus, .navbar-search .search-query.focused { - padding: 5px 10px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - outline: 0; -} -.navbar-static { - margin-bottom: 18px; -} -.navbar-static .navbar-inner { - padding-left: 20px; - padding-right: 20px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.navbar-fixed { - position: fixed; - top: 0; - right: 0; - left: 0; - z-index: 1030; -} -.navbar .nav { - position: relative; - left: 0; - display: block; - float: left; - margin: 0 10px 0 0; -} -.navbar .nav.pull-right { - float: right; -} -.navbar .nav > li { - display: block; - float: left; -} -.navbar .nav > li > a { - float: none; - padding: 10px 10px 11px; - line-height: 19px; - color: #999999; - text-decoration: none; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.navbar .nav > li > a:hover { - background-color: transparent; - color: #ffffff; - text-decoration: none; -} -.navbar .nav .active > a { - color: #ffffff; - text-decoration: none; - background-color: #222; - background-color: rgba(0, 0, 0, 0.5); -} -.navbar .vertical-divider { - height: 40px; - width: 1px; - margin: 0 5px; - overflow: hidden; - background-color: #222; - border-right: 1px solid #444; -} -.navbar .nav.pull-right { - margin-left: 10px; - margin-right: 0; -} -.navbar .dropdown-menu { - top: 41px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.navbar .dropdown-menu:before { - content: ''; - display: inline-block; - border-left: 7px solid transparent; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-bottom-color: rgba(0, 0, 0, 0.2); - position: absolute; - top: -7px; - left: 9px; -} -.navbar .dropdown-menu:after { - content: ''; - display: inline-block; - border-left: 6px solid transparent; - border-right: 6px solid transparent; - border-bottom: 6px solid #fff; - position: absolute; - top: -6px; - left: 10px; -} -.navbar .dropdown-toggle .caret, .navbar .open.dropdown .caret { - border-top-color: #fff; -} -.navbar .nav .active .caret { - filter: alpha(opacity=100); - -moz-opacity: 1; - opacity: 1; -} -.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle { - background-color: transparent; -} -.navbar .nav .active > .dropdown-toggle:hover { - color: #fff; -} -.navbar .nav.pull-right .dropdown-menu { - right: 0; -} -.navbar .nav.pull-right .dropdown-menu:before { - left: auto; - right: 12px; -} -.navbar .nav.pull-right .dropdown-menu:after { - left: auto; - right: 13px; -} .nav { margin-left: 0; margin-bottom: 18px; list-style: none; } @@ -1819,20 +1600,18 @@ color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); background-color: #0088cc; } .tabs, .pills { - zoom: 1; + *zoom: 1; } .tabs:before, .pills:before, .tabs:after, .pills:after { display: table; - *display: inline; content: ""; - zoom: 1; } .tabs:after, .pills:after { clear: both; } .tabs > li, .pills > li { @@ -1952,17 +1731,15 @@ } .tabs.stacked .open > a:hover { border-color: #999; } .tabbable { - zoom: 1; + *zoom: 1; } .tabbable:before, .tabbable:after { display: table; - *display: inline; content: ""; - zoom: 1; } .tabbable:after { clear: both; } .tabs-below .tabs, .tabs-right .tabs, .tabs-left .tabs { @@ -2033,10 +1810,226 @@ border-color: #eee #eee #eee #ddd; } .tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover { border-color: #ddd #ddd #ddd transparent; } +.navbar { + overflow: visible; +} +.navbar-inner { + background-color: #222222; + background-color: #222222; + background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222)); + background-image: -moz-linear-gradient(top, #333333, #222222); + background-image: -ms-linear-gradient(top, #333333, #222222); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222)); + background-image: -webkit-linear-gradient(top, #333333, #222222); + background-image: -o-linear-gradient(top, #333333, #222222); + background-image: linear-gradient(top, #333333, #222222); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); +} +.navbar .brand:hover { + color: #ffffff; + text-decoration: none; +} +.navbar .brand { + float: left; + display: block; + padding: 8px 20px 12px; + margin-left: -20px; + font-size: 20px; + font-weight: 200; + line-height: 1; + color: #ffffff; +} +.navbar p { + margin: 0; + line-height: 40px; +} +.navbar p a:hover { + color: #ffffff; + background-color: transparent; +} +.navbar .btn, .navbar .btn-group { + margin-top: 5px; +} +.navbar .btn-group .btn { + margin-top: 0; +} +.navbar-form { + margin-bottom: 0; +} +.navbar-form input, .navbar-form select { + display: inline-block; + margin-bottom: 0; +} +.navbar-search { + position: relative; + float: left; + margin-top: 6px; + margin-bottom: 0; +} +.navbar-search .search-query { + padding: 4px 9px; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 13px; + font-weight: normal; + line-height: 1; + color: #ffffff; + color: rgba(255, 255, 255, 0.75); + background: #444; + background: rgba(255, 255, 255, 0.3); + border: 1px solid #111; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); + -webkit-transition: none; + -moz-transition: none; + -ms-transition: none; + -o-transition: none; + transition: none; +} +.navbar-search .search-query :-moz-placeholder { + color: #eeeeee; +} +.navbar-search .search-query::-webkit-input-placeholder { + color: #eeeeee; +} +.navbar-search .search-query:hover { + color: #ffffff; + background-color: #999999; + background-color: rgba(255, 255, 255, 0.5); +} +.navbar-search .search-query:focus, .navbar-search .search-query.focused { + padding: 5px 10px; + color: #333333; + text-shadow: 0 1px 0 #ffffff; + background-color: #ffffff; + border: 0; + -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + outline: 0; +} +.navbar-static { + margin-bottom: 18px; +} +.navbar-static .navbar-inner { + padding-left: 20px; + padding-right: 20px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.navbar-fixed { + position: fixed; + top: 0; + right: 0; + left: 0; + z-index: 1030; +} +.navbar .nav { + position: relative; + left: 0; + display: block; + float: left; + margin: 0 10px 0 0; +} +.navbar .nav.pull-right { + float: right; +} +.navbar .nav > li { + display: block; + float: left; +} +.navbar .nav > li > a { + float: none; + padding: 10px 10px 11px; + line-height: 19px; + color: #999999; + text-decoration: none; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +} +.navbar .nav > li > a:hover { + background-color: transparent; + color: #ffffff; + text-decoration: none; +} +.navbar .nav .active > a { + color: #ffffff; + text-decoration: none; + background-color: #222; + background-color: rgba(0, 0, 0, 0.5); +} +.navbar .vertical-divider { + height: 40px; + width: 1px; + margin: 0 5px; + overflow: hidden; + background-color: #222; + border-right: 1px solid #444; +} +.navbar .nav.pull-right { + margin-left: 10px; + margin-right: 0; +} +.navbar .dropdown-menu { + top: 41px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.navbar .dropdown-menu:before { + content: ''; + display: inline-block; + border-left: 7px solid transparent; + border-right: 7px solid transparent; + border-bottom: 7px solid #ccc; + border-bottom-color: rgba(0, 0, 0, 0.2); + position: absolute; + top: -7px; + left: 9px; +} +.navbar .dropdown-menu:after { + content: ''; + display: inline-block; + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-bottom: 6px solid #fff; + position: absolute; + top: -6px; + left: 10px; +} +.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret { + border-top-color: #fff; +} +.navbar .nav .active .caret { + filter: alpha(opacity=100); + -moz-opacity: 1; + opacity: 1; +} +.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle { + background-color: transparent; +} +.navbar .nav .active > .dropdown-toggle:hover { + color: #fff; +} +.navbar .nav.pull-right .dropdown-menu { + right: 0; +} +.navbar .nav.pull-right .dropdown-menu:before { + left: auto; + right: 12px; +} +.navbar .nav.pull-right .dropdown-menu:after { + left: auto; + right: 13px; +} .breadcrumb { padding: 7px 14px; margin: 0 0 18px; background-color: #f5f5f5; background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5)); @@ -2075,13 +2068,12 @@ display: inline-block; *display: inline; /* IE7 inline-block hack */ *zoom: 1; - margin: 0; - border: 1px solid #ddd; - border: 1px solid rgba(0, 0, 0, 0.15); + 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); @@ -2093,31 +2085,72 @@ .pagination a { float: left; padding: 0 14px; line-height: 34px; text-decoration: none; - border-right: 1px solid; - border-right-color: #ddd; - border-right-color: rgba(0, 0, 0, 0.15); - *border-right-color: #ddd; - /* IE6-7 */ - + border: 1px solid #ddd; + border-left-width: 0; } .pagination a:hover, .pagination .active a { - background-color: #c7eefe; + background-color: #f5f5f5; } +.pagination .active a { + color: #999999; +} .pagination .disabled a, .pagination .disabled a:hover { color: #999999; background-color: transparent; cursor: default; } -.pagination .next a { - border: 0; +.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.centered { +.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; @@ -2139,11 +2172,11 @@ left: 50%; z-index: 1050; max-height: 500px; overflow: auto; width: 560px; - margin: -250px 0 0 -250px; + margin: -250px 0 0 -280px; background-color: #ffffff; border: 1px solid #999; border: 1px solid rgba(0, 0, 0, 0.3); *border: 1px solid #999; /* IE6-7 */ @@ -2188,17 +2221,15 @@ -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; + *zoom: 1; } .modal-footer:before, .modal-footer:after { display: table; - *display: inline; content: ""; - zoom: 1; } .modal-footer:after { clear: both; } .modal-footer .btn { @@ -2340,12 +2371,12 @@ } .popover .inner { padding: 3px; width: 280px; overflow: hidden; - background-color: #000000; - background-color: rgba(0, 0, 0, 0.8); + background: #000000; + background: rgba(0, 0, 0, 0.8); -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); @@ -2372,32 +2403,19 @@ } .popover .content p, .popover .content ul, .popover .content ol { margin-bottom: 0; } .btn.danger, -.alert-message.danger, .btn.danger:hover, -.alert-message.danger:hover, -.btn.error, -.alert-message.error, -.btn.error:hover, -.alert-message.error:hover, .btn.success, -.alert-message.success, .btn.success:hover, -.alert-message.success:hover, .btn.info, -.alert-message.info, -.btn.info:hover, -.alert-message.info:hover { +.btn.info:hover { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); color: #ffffff; } -.btn.danger, -.alert-message.danger, -.btn.error, -.alert-message.error { +.btn.danger { background-color: #c43c35; background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35)); background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35)); @@ -2407,11 +2425,11 @@ background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); border-color: #c43c35 #c43c35 #882a25; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } -.btn.success, .alert-message.success { +.btn.success { background-color: #57a957; background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); background-image: -moz-linear-gradient(top, #62c462, #57a957); background-image: -ms-linear-gradient(top, #62c462, #57a957); background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); @@ -2421,11 +2439,11 @@ background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); border-color: #57a957 #57a957 #3d773d; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } -.btn.info, .alert-message.info { +.btn.info { background-color: #339bb9; background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9)); @@ -2491,13 +2509,14 @@ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0); border-color: #0064cd #0064cd #003f81; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } .btn.active, .btn:active { - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); + background-image: none; + -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn.disabled { cursor: default; background-image: none; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2538,17 +2557,15 @@ padding: 0; border: 0; } .btn-group { position: relative; - zoom: 1; + *zoom: 1; } .btn-group:before, .btn-group:after { display: table; - *display: inline; content: ""; - zoom: 1; } .btn-group:after { clear: both; } .btn-group + .btn-group { @@ -2636,110 +2653,72 @@ border-top-color: #fff; filter: alpha(opacity=75); -moz-opacity: 0.75; opacity: 0.75; } -.alert-message { - position: relative; - padding: 7px 15px; +.alert { + padding: 8px 35px 8px 14px; margin-bottom: 18px; - color: #333333; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - background-color: #eedc94; - background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94)); - background-image: -moz-linear-gradient(top, #fceec1, #eedc94); - background-image: -ms-linear-gradient(top, #fceec1, #eedc94); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94)); - background-image: -webkit-linear-gradient(top, #fceec1, #eedc94); - background-image: -o-linear-gradient(top, #fceec1, #eedc94); - background-image: linear-gradient(top, #fceec1, #eedc94); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0); - border-color: #eedc94 #eedc94 #e4c652; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - border-width: 1px; - border-style: solid; + background-color: #fcf8e3; + border: 1px solid #f3edd2; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); } -.alert-message .close { +.alert, .alert-heading { + color: #c09853; +} +.alert .close { *margin-top: 3px; /* IE7 spacing */ + position: relative; + right: -21px; } -.alert-message h5 { - line-height: 18px; +.alert-success { + background-color: #dff0d8; + border-color: #cfe8c4; } -.alert-message p { - margin-bottom: 0; +.alert-success, .alert-success .alert-heading { + color: #468847; } -.alert-message div { - margin-top: 5px; - margin-bottom: 2px; - line-height: 28px; +.alert-danger, .alert-error { + background-color: #f2dede; + border-color: #e9c7c7; } -.alert-message .btn { - -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); - -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); - box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); +.alert-danger, +.alert-error, +.alert-danger .alert-heading, +.alert-error .alert-heading { + color: #B94A48; } -.alert-message.error, .alert-message.success, .alert-message.info { - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +.alert-info { + background-color: #d9edf7; + border-color: #bfe1f2; } -.alert-message.block-message { - padding: 14px; - background-image: none; - background-color: #fdf5d9; - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - border-color: #fceec1; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; +.alert-info, .alert-info .alert-heading { + color: #3a87ad; } -.alert-message.block-message ul, .alert-message.block-message p { - margin-right: 30px; +.alert-block { + padding-top: 14px; + padding-bottom: 14px; } -.alert-message.block-message ul { +.alert-block > p, .alert-block > ul { margin-bottom: 0; } -.alert-message.block-message li { - color: #333333; -} -.alert-message.block-message .alert-actions { +.alert-block p + p { margin-top: 5px; } -.alert-message.block-message.error, .alert-message.block-message.success, .alert-message.block-message.info { - color: #333333; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -} -.alert-message.block-message.error { - background-color: #fddfde; - border-color: #fbc7c6; -} -.alert-message.block-message.success { - background-color: #d1eed1; - border-color: #bfe7bf; -} -.alert-message.block-message.info { - background-color: #ddf4fb; - border-color: #c6edf9; -} .thumbnails { margin-left: -20px; - margin-bottom: 0; list-style: none; - zoom: 1; + *zoom: 1; } .thumbnails:before, .thumbnails:after { display: table; - *display: inline; content: ""; - zoom: 1; } .thumbnails:after { clear: both; } .thumbnails > li { @@ -2769,78 +2748,10 @@ max-width: 100%; } .thumbnail .caption { padding: 9px; } -.carousel { - position: relative; -} -.carousel .carousel-inner { - overflow: hidden; - width: 100%; - position: relative; -} -.carousel .item { - display: none; - position: relative; - -webkit-transition: 0.6s ease-in-out left; - -moz-transition: 0.6s ease-in-out left; - -ms-transition: 0.6s ease-in-out left; - -o-transition: 0.6s ease-in-out left; - transition: 0.6s ease-in-out left; -} -.carousel .active, .carousel .next, .carousel .prev { - display: block; -} -.carousel .active { - left: 0; -} -.carousel .next, .carousel .prev { - position: absolute; - top: 0; - width: 100%; -} -.carousel .next { - left: 100%; -} -.carousel .prev { - left: -100%; -} -.carousel .next.left, .carousel .prev.right { - left: 0%; -} -.carousel .active.left { - left: -100%; -} -.carousel .active.right { - left: 100%; -} -.carousel .nav { - width: auto; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - height: 50px; - position: absolute; - top: 50%; - margin: -25px 0 0; - cursor: pointer; - background: rgba(0, 0, 0, 0.7); - color: white; - font-size: 42px; - left: 5px; - font-weight: 100; - padding: 0 15px; -} -.carousel .nav.right { - right: 5px; - left: auto; -} -.carousel .nav:hover { - text-decoration: none; - background: rgba(0, 0, 0, 0.8); -} .label { padding: 1px 3px 2px; font-size: 9.75px; font-weight: bold; color: #ffffff; @@ -3004,10 +2915,114 @@ 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 { + padding: 8px 15px; + border-bottom: 0; +} +.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 .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: #ccc; + text-align: center; + background: #999; + background: rgba(0, 0, 0, 0.5); + -webkit-border-radius: 20px; + -moz-border-radius: 20px; + border-radius: 20px; +} +.carousel-control.right { + left: auto; + right: 15px; +} +.carousel-control:hover { + color: #fff; + text-decoration: none; + background: #333; + background: rgba(0, 0, 0, 0.75); +} +.carousel-caption { + position: absolute; + left: 0; + right: 0; + bottom: 0; + padding: 10px 15px 5px; + background: #333; + background: rgba(0, 0, 0, 0.75); +} +.carousel-caption h4, .carousel-caption p { + color: #fff; +} .pull-right { float: right; } .pull-left { float: left; @@ -3079,22 +3094,22 @@ display: block; } .navbar .nav:hover > li > a:hover { background-color: #333; } - .horizontal-form .control-group > label { + .form-horizontal .control-group > label { float: none; width: auto; padding-top: 0; text-align: left; } - .horizontal-form .controls { + .form-horizontal .controls { margin-left: 0; } - .horizontal-form .control-list { + .form-horizontal .control-list { padding-top: 0; } - .horizontal-form .form-actions { + .form-horizontal .form-actions { padding-left: 0; } .modal { position: fixed; top: 20px; \ No newline at end of file