diff options
author | Thomas Park <thomas@thomaspark.me> | 2014-11-12 15:37:01 -0500 |
---|---|---|
committer | Thomas Park <thomas@thomaspark.me> | 2014-11-12 15:37:01 -0500 |
commit | a240cb46dbc25e584ece827d8e7b4980c93957e0 (patch) | |
tree | d4ae9809dc2d7a3bad998fa7500552ff96fa1d4c /superhero/bootstrap.css | |
parent | 4e5b5fd0ee3d3e1856f32d5956cb7c8cc1029254 (diff) |
3.3.0 -> 3.3.1
Diffstat (limited to 'superhero/bootstrap.css')
-rw-r--r-- | superhero/bootstrap.css | 112 |
1 files changed, 43 insertions, 69 deletions
diff --git a/superhero/bootstrap.css b/superhero/bootstrap.css index 6010ba9f..445d2277 100644 --- a/superhero/bootstrap.css +++ b/superhero/bootstrap.css @@ -1,6 +1,6 @@ @import url("//fonts.googleapis.com/css?family=Lato:300,400,700"); /*! - * bootswatch v3.3.0 + * bootswatch v3.3.1 * Homepage: http://bootswatch.com * Copyright 2012-2014 Thomas Park * Licensed under MIT @@ -2392,56 +2392,25 @@ textarea.form-control { input[type="search"] { -webkit-appearance: none; } -input[type="date"], -input[type="time"], -input[type="datetime-local"], -input[type="month"] { - line-height: 39px; - line-height: 1.42857143 \0; -} -input[type="date"].input-sm, -input[type="time"].input-sm, -input[type="datetime-local"].input-sm, -input[type="month"].input-sm { - line-height: 31px; - line-height: 1.5 \0; -} -input[type="date"].input-lg, -input[type="time"].input-lg, -input[type="datetime-local"].input-lg, -input[type="month"].input-lg { - line-height: 52px; - line-height: 1.33 \0; -} -_:-ms-fullscreen, -:root input[type="date"], -_:-ms-fullscreen, -:root input[type="time"], -_:-ms-fullscreen, -:root input[type="datetime-local"], -_:-ms-fullscreen, -:root input[type="month"] { - line-height: 1.42857143; -} -_:-ms-fullscreen.input-sm, -:root input[type="date"].input-sm, -_:-ms-fullscreen.input-sm, -:root input[type="time"].input-sm, -_:-ms-fullscreen.input-sm, -:root input[type="datetime-local"].input-sm, -_:-ms-fullscreen.input-sm, -:root input[type="month"].input-sm { - line-height: 1.5; -} -_:-ms-fullscreen.input-lg, -:root input[type="date"].input-lg, -_:-ms-fullscreen.input-lg, -:root input[type="time"].input-lg, -_:-ms-fullscreen.input-lg, -:root input[type="datetime-local"].input-lg, -_:-ms-fullscreen.input-lg, -:root input[type="month"].input-lg { - line-height: 1.33; +@media screen and (-webkit-min-device-pixel-ratio: 0) { + input[type="date"], + input[type="time"], + input[type="datetime-local"], + input[type="month"] { + line-height: 39px; + } + input[type="date"].input-sm, + input[type="time"].input-sm, + input[type="datetime-local"].input-sm, + input[type="month"].input-sm { + line-height: 31px; + } + input[type="date"].input-lg, + input[type="time"].input-lg, + input[type="datetime-local"].input-lg, + input[type="month"].input-lg { + line-height: 52px; + } } .form-group { margin-bottom: 15px; @@ -3353,10 +3322,6 @@ tbody.collapse.in { .btn-group-vertical > .btn.active { z-index: 2; } -.btn-group > .btn:focus, -.btn-group-vertical > .btn:focus { - outline: 0; -} .btn-group .btn + .btn, .btn-group .btn + .btn-group, .btn-group .btn-group + .btn, @@ -4138,6 +4103,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { border-top-left-radius: 0; } .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { + border-top-right-radius: 0; + border-top-left-radius: 0; border-bottom-right-radius: 0; border-bottom-left-radius: 0; } @@ -4621,11 +4588,17 @@ a.badge:focus { text-decoration: none; cursor: pointer; } -a.list-group-item.active > .badge, +.list-group-item.active > .badge, .nav-pills > .active > a > .badge { color: #df691a; background-color: #ffffff; } +.list-group-item > .badge { + float: right; +} +.list-group-item > .badge + .badge { + margin-right: 5px; +} .nav-pills > li > a > .badge { margin-left: 3px; } @@ -4658,7 +4631,8 @@ a.list-group-item.active > .badge, .jumbotron { padding: 48px 0; } - .container .jumbotron { + .container .jumbotron, + .container-fluid .jumbotron { padding-left: 60px; padding-right: 60px; } @@ -4908,12 +4882,6 @@ a.thumbnail.active { border-bottom-right-radius: 0; border-bottom-left-radius: 0; } -.list-group-item > .badge { - float: right; -} -.list-group-item > .badge + .badge { - margin-right: 5px; -} a.list-group-item { color: #ebebeb; } @@ -5522,10 +5490,9 @@ button.close { outline: 0; } .modal-backdrop { - position: fixed; + position: absolute; top: 0; right: 0; - bottom: 0; left: 0; background-color: #000000; } @@ -5598,7 +5565,9 @@ button.close { z-index: 1070; display: block; visibility: visible; + font-family: "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; + font-weight: normal; line-height: 1.4; opacity: 0; filter: alpha(opacity=0); @@ -5648,13 +5617,15 @@ button.close { } .tooltip.top-left .tooltip-arrow { bottom: 0; - left: 5px; + right: 5px; + margin-bottom: -5px; border-width: 5px 5px 0; border-top-color: #000000; } .tooltip.top-right .tooltip-arrow { bottom: 0; - right: 5px; + left: 5px; + margin-bottom: -5px; border-width: 5px 5px 0; border-top-color: #000000; } @@ -5681,13 +5652,15 @@ button.close { } .tooltip.bottom-left .tooltip-arrow { top: 0; - left: 5px; + right: 5px; + margin-top: -5px; border-width: 0 5px 5px; border-bottom-color: #000000; } .tooltip.bottom-right .tooltip-arrow { top: 0; - right: 5px; + left: 5px; + margin-top: -5px; border-width: 0 5px 5px; border-bottom-color: #000000; } @@ -5699,6 +5672,7 @@ button.close { display: none; max-width: 276px; padding: 1px; + font-family: "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 15px; font-weight: normal; line-height: 1.42857143; |