diff options
Diffstat (limited to 'bootstrap.css')
| -rw-r--r-- | bootstrap.css | 133 |
1 files changed, 78 insertions, 55 deletions
diff --git a/bootstrap.css b/bootstrap.css index 5eb8a4a7c..a9a104ccc 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Jan 8 01:50:02 PST 2012 + * Date: Sun Jan 8 02:58:37 PST 2012 */ html, body { margin: 0; @@ -485,6 +485,10 @@ blockquote small:before { } blockquote.pull-right { float: right; + padding-left: 0; + padding-right: 15px; + border-left: 0; + border-right: 5px solid #eee; } blockquote.pull-right p, blockquote.pull-right small { text-align: right; @@ -1600,7 +1604,7 @@ i { -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); } -.navbar .brand:hover, .navbar ul .active > a { +.navbar .brand:hover, .navbar .nav .active > a { color: #ffffff; text-decoration: none; background-color: #333333; @@ -1921,7 +1925,7 @@ i { .pills.stacked > li:last-child > a { margin-bottom: 1px; } -.tabs .dropdown-menu, .pills .dropdown-menu { +.nav .dropdown-menu { top: 33px; border-width: 1px; } @@ -1930,19 +1934,26 @@ i { -moz-border-radius: 4px; border-radius: 4px; } -.tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret { +.nav .dropdown-toggle .caret { + border-top-color: #0088cc; margin-top: 6px; } -.tabs .open .dropdown-toggle, .pills .open .dropdown-toggle { +.nav .dropdown-toggle:hover .caret { + border-top-color: #005580; +} +.nav .open .dropdown-toggle { background-color: #999; border-color: #999; } -.tabs .open .caret, .pills .open .caret { +.nav .open .caret, .nav .open a:hover .caret { border-top-color: #fff; filter: alpha(opacity=100); -moz-opacity: 1; opacity: 1; } +.tabs.stacked .open > a:hover { + border-color: #999; +} .tabbable { zoom: 1; } @@ -2996,6 +3007,61 @@ a.thumbnail:hover { visibility: hidden; } @media (max-width: 480px) { + .navbar .nav { + position: absolute; + top: 0; + left: 0; + width: 180px; + padding-top: 40px; + list-style: none; + } + .navbar .nav, .navbar .nav > li:last-child a { + -webkit-border-radius: 0 0 4px 0; + -moz-border-radius: 0 0 4px 0; + border-radius: 0 0 4px 0; + } + .navbar .nav > li { + float: none; + display: none; + } + .navbar .nav > li > a { + float: none; + background-color: #222; + } + .navbar .nav > .active { + display: block; + position: absolute; + top: 0; + left: 0; + } + .navbar .nav > .active > a { + background-color: transparent; + } + .navbar .nav > .active > a:hover { + background-color: #333; + } + .navbar .nav > .active > a:after { + display: inline-block; + width: 0; + height: 0; + margin-top: 8px; + margin-left: 6px; + text-indent: -99999px; + vertical-align: top; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid #ffffff; + filter: alpha(opacity=100); + -moz-opacity: 1; + opacity: 1; + content: "↓"; + } + .navbar .nav:hover > li { + display: block; + } + .navbar .nav:hover > li > a:hover { + background-color: #333; + } .modal { width: auto; margin: 0; @@ -3030,6 +3096,12 @@ a.thumbnail:hover { } } @media (max-width: 768px) { + .navbar-fixed { + position: absolute; + } + .navbar-fixed .nav { + float: none; + } .container { width: auto; padding: 0 20px; @@ -3043,55 +3115,6 @@ a.thumbnail:hover { width: auto; margin: 0; } - .nav { - position: absolute; - top: 0; - left: 0; - width: 180px; - padding-top: 40px; - list-style: none; - } - .nav, .nav > li:last-child a { - -webkit-border-radius: 0 0 4px 0; - -moz-border-radius: 0 0 4px 0; - border-radius: 0 0 4px 0; - } - .nav > li { - float: none; - display: none; - } - .nav > li > a { - float: none; - background-color: #222; - } - .nav > .active { - display: block; - position: absolute; - top: 0; - left: 0; - } - .navbar ul .active > a { - background-color: transparent; - } - .nav > .active a:after { - display: inline-block; - width: 0; - height: 0; - margin-top: 8px; - margin-left: 6px; - text-indent: -99999px; - vertical-align: top; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid #ffffff; - filter: alpha(opacity=100); - -moz-opacity: 1; - opacity: 1; - content: "↓"; - } - .nav > .active a:hover { - background-color: rgba(255, 255, 255, 0.05); - } } @media (min-width: 768px) and (max-width: 940px) { .container { |
