diff options
| author | 2013-02-27 09:13:31 -0300 | |
|---|---|---|
| committer | 2013-02-27 09:13:31 -0300 | |
| commit | cb2680529d9447d94546c8c0960f0c4e299af18c (patch) | |
| tree | 335ce0e66c214a120aa51ac78e25afe6585c1a13 /nikola/data/themes/default/assets/css/bootstrap-responsive.css | |
| parent | 6e0996d54cad4586645fdc59164708e4b4b9dcec (diff) | |
| parent | 878ba1152ebc64a4a2609d23c9e400a6111db642 (diff) | |
Merge tag 'upstream/5.3'
Upstream version 5.3
Diffstat (limited to 'nikola/data/themes/default/assets/css/bootstrap-responsive.css')
| -rw-r--r-- | nikola/data/themes/default/assets/css/bootstrap-responsive.css | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/nikola/data/themes/default/assets/css/bootstrap-responsive.css b/nikola/data/themes/default/assets/css/bootstrap-responsive.css index a3352d7..5215a5d 100644 --- a/nikola/data/themes/default/assets/css/bootstrap-responsive.css +++ b/nikola/data/themes/default/assets/css/bootstrap-responsive.css @@ -1,5 +1,5 @@ /*! - * Bootstrap Responsive v2.2.2 + * Bootstrap Responsive v2.3.0 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 @@ -8,10 +8,6 @@ * Designed and built with all the love in the world @twitter by @mdo and @fat. */ -@-ms-viewport { - width: device-width; -} - .clearfix { *zoom: 1; } @@ -44,6 +40,10 @@ box-sizing: border-box; } +@-ms-viewport { + width: device-width; +} + .hidden { display: none; visibility: hidden; @@ -95,6 +95,19 @@ } } +.visible-print { + display: none !important; +} + +@media print { + .visible-print { + display: inherit !important; + } + .hidden-print { + display: none !important; + } +} + @media (min-width: 1200px) { .row { margin-left: -30px; @@ -1003,7 +1016,9 @@ margin-bottom: 2px; } .nav-collapse .nav > li > a:hover, - .nav-collapse .dropdown-menu a:hover { + .nav-collapse .nav > li > a:focus, + .nav-collapse .dropdown-menu a:hover, + .nav-collapse .dropdown-menu a:focus { background-color: #f2f2f2; } .navbar-inverse .nav-collapse .nav > li > a, @@ -1011,7 +1026,9 @@ color: #999999; } .navbar-inverse .nav-collapse .nav > li > a:hover, - .navbar-inverse .nav-collapse .dropdown-menu a:hover { + .navbar-inverse .nav-collapse .nav > li > a:focus, + .navbar-inverse .nav-collapse .dropdown-menu a:hover, + .navbar-inverse .nav-collapse .dropdown-menu a:focus { background-color: #111111; } .nav-collapse.in .btn-group { |
