summaryrefslogtreecommitdiff
path: root/slate/bootstrap.css
diff options
context:
space:
mode:
authorThomas Park <thomas@thomaspark.me>2012-06-14 22:30:04 -0400
committerThomas Park <thomas@thomaspark.me>2012-06-14 22:30:04 -0400
commit6636f09c08c7ac49eafdbba440721bcfee0ff819 (patch)
tree87d4f41afd463d603ce68407d028528a5da6ece2 /slate/bootstrap.css
parentdd8b8d30b7a2bc4f666b6d0671711344979bf909 (diff)
2.0.3 -> 2.0.4 closes #24
Diffstat (limited to 'slate/bootstrap.css')
-rw-r--r--slate/bootstrap.css226
1 files changed, 127 insertions, 99 deletions
diff --git a/slate/bootstrap.css b/slate/bootstrap.css
index 53acc8ba..8856cbcb 100644
--- a/slate/bootstrap.css
+++ b/slate/bootstrap.css
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v2.0.3
+ * Bootstrap v2.0.4
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -62,6 +62,9 @@ img {
border: 0;
-ms-interpolation-mode: bicubic;
}
+#map_canvas img {
+ max-width: none;
+}
button,
input,
select,
@@ -340,9 +343,6 @@ a:hover {
}
p {
margin: 0 0 9px;
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
- font-size: 13px;
- line-height: 18px;
}
p small {
font-size: 11px;
@@ -491,7 +491,7 @@ em {
}
abbr[title] {
cursor: help;
- border-bottom: 1px dotted #ddd;
+ border-bottom: 1px dotted #757c82;
}
abbr.initialism {
font-size: 90%;
@@ -608,7 +608,7 @@ legend {
line-height: 36px;
color: #3a3f44;
border: 0;
- border-bottom: 1px solid #eee;
+ border-bottom: 1px solid #e5e5e5;
}
legend small {
font-size: 13.5px;
@@ -632,72 +632,111 @@ textarea {
label {
display: block;
margin-bottom: 5px;
- color: #3a3f44;
}
-input,
-textarea,
select,
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
.uneditable-input {
display: inline-block;
- width: 210px;
height: 18px;
padding: 4px;
margin-bottom: 9px;
font-size: 13px;
line-height: 18px;
color: #52575c;
+}
+input,
+textarea {
+ width: 210px;
+}
+textarea {
+ height: auto;
+}
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
background-color: #ffffff;
border: 1px solid #cccccc;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
+ -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;
}
-.uneditable-textarea {
- width: auto;
- height: auto;
-}
-label input,
-label textarea,
-label select {
- display: block;
+textarea:focus,
+input[type="text"]:focus,
+input[type="password"]:focus,
+input[type="datetime"]:focus,
+input[type="datetime-local"]:focus,
+input[type="date"]:focus,
+input[type="month"]:focus,
+input[type="time"]:focus,
+input[type="week"]:focus,
+input[type="number"]:focus,
+input[type="email"]:focus,
+input[type="url"]:focus,
+input[type="search"]:focus,
+input[type="tel"]:focus,
+input[type="color"]:focus,
+.uneditable-input:focus {
+ border-color: rgba(82, 168, 236, 0.8);
+ outline: 0;
+ outline: thin dotted \9;
+ /* IE6-9 */
+
+ -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+ -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+ box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
}
-input[type="image"],
-input[type="checkbox"],
-input[type="radio"] {
- width: auto;
- height: auto;
- padding: 0;
+input[type="radio"],
+input[type="checkbox"] {
margin: 3px 0;
*margin-top: 0;
/* IE7 */
line-height: normal;
cursor: pointer;
- background-color: transparent;
- border: 0 \9;
- /* IE9 and down */
-
- -webkit-border-radius: 0;
- -moz-border-radius: 0;
- border-radius: 0;
-}
-input[type="image"] {
- border: 0;
}
-input[type="file"] {
+input[type="submit"],
+input[type="reset"],
+input[type="button"],
+input[type="radio"],
+input[type="checkbox"] {
width: auto;
- padding: initial;
- line-height: initial;
- background-color: #ffffff;
- background-color: initial;
- border: initial;
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
}
-input[type="button"],
-input[type="reset"],
-input[type="submit"] {
+.uneditable-textarea {
width: auto;
height: auto;
}
@@ -711,27 +750,21 @@ input[type="file"] {
line-height: 28px;
}
-input[type="file"] {
- line-height: 18px \9;
-}
select {
width: 220px;
- background-color: #ffffff;
+ border: 1px solid #bbb;
}
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;
+select:focus,
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus {
+ outline: thin dotted #333;
+ outline: 5px auto -webkit-focus-ring-color;
+ outline-offset: -2px;
}
.radio,
.checkbox {
@@ -758,39 +791,6 @@ input[type="hidden"] {
.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);
- outline: 0;
- outline: thin dotted \9;
- /* IE6-9 */
-
- -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
- -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
- box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
-}
-input[type="file"]:focus,
-input[type="radio"]:focus,
-input[type="checkbox"]:focus,
-select:focus {
- outline: thin dotted #333;
- outline: 5px auto -webkit-focus-ring-color;
- outline-offset: -2px;
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
-}
.input-mini {
width: 60px;
}
@@ -820,6 +820,14 @@ textarea[class*="span"],
float: none;
margin-left: 0;
}
+.input-append input[class*="span"],
+.input-append .uneditable-input[class*="span"],
+.input-prepend input[class*="span"],
+.input-prepend .uneditable-input[class*="span"],
+.row-fluid .input-prepend [class*="span"],
+.row-fluid .input-append [class*="span"] {
+ display: inline-block;
+}
input,
textarea,
.uneditable-input {
@@ -882,12 +890,16 @@ input[type="checkbox"][readonly] {
.control-group.warning .help-inline {
color: #c09853;
}
+.control-group.warning .checkbox,
+.control-group.warning .radio,
.control-group.warning input,
.control-group.warning select,
.control-group.warning textarea {
color: #c09853;
border-color: #c09853;
}
+.control-group.warning .checkbox:focus,
+.control-group.warning .radio:focus,
.control-group.warning input:focus,
.control-group.warning select:focus,
.control-group.warning textarea:focus {
@@ -907,12 +919,16 @@ input[type="checkbox"][readonly] {
.control-group.error .help-inline {
color: #b94a48;
}
+.control-group.error .checkbox,
+.control-group.error .radio,
.control-group.error input,
.control-group.error select,
.control-group.error textarea {
color: #b94a48;
border-color: #b94a48;
}
+.control-group.error .checkbox:focus,
+.control-group.error .radio:focus,
.control-group.error input:focus,
.control-group.error select:focus,
.control-group.error textarea:focus {
@@ -932,12 +948,16 @@ input[type="checkbox"][readonly] {
.control-group.success .help-inline {
color: #468847;
}
+.control-group.success .checkbox,
+.control-group.success .radio,
.control-group.success input,
.control-group.success select,
.control-group.success textarea {
color: #468847;
border-color: #468847;
}
+.control-group.success .checkbox:focus,
+.control-group.success .radio:focus,
.control-group.success input:focus,
.control-group.success select:focus,
.control-group.success textarea:focus {
@@ -971,7 +991,7 @@ select:focus:required:invalid:focus {
margin-top: 18px;
margin-bottom: 18px;
background-color: #202328;
- border-top: 1px solid #ddd;
+ border-top: 1px solid #e5e5e5;
*zoom: 1;
}
.form-actions:before,
@@ -995,6 +1015,9 @@ select:focus:required:invalid:focus {
:-moz-placeholder {
color: #757c82;
}
+:-ms-input-placeholder {
+ color: #757c82;
+}
::-webkit-input-placeholder {
color: #757c82;
}
@@ -1960,7 +1983,7 @@ table .span24 {
*margin: -5px 0 5px;
overflow: hidden;
background-color: #e5e5e5;
- border-bottom: 1px solid #ffffff;
+ border-bottom: 1px solid #1c1e22;
}
.dropdown-menu a {
display: block;
@@ -1981,10 +2004,10 @@ table .span24 {
.open {
*z-index: 1000;
}
-.open .dropdown-menu {
+.open > .dropdown-menu {
display: block;
}
-.pull-right .dropdown-menu {
+.pull-right > .dropdown-menu {
right: 0;
left: auto;
}
@@ -2038,7 +2061,6 @@ table .span24 {
}
.fade {
opacity: 0;
- filter: alpha(opacity=0);
-webkit-transition: opacity 0.15s linear;
-moz-transition: opacity 0.15s linear;
-ms-transition: opacity 0.15s linear;
@@ -2047,7 +2069,6 @@ table .span24 {
}
.fade.in {
opacity: 1;
- filter: alpha(opacity=100);
}
.collapse {
position: relative;
@@ -3081,6 +3102,9 @@ input[type="submit"].btn.btn-mini {
.navbar-search .search-query:-moz-placeholder {
color: #cccccc;
}
+.navbar-search .search-query:-ms-input-placeholder {
+ color: #cccccc;
+}
.navbar-search .search-query::-webkit-input-placeholder {
color: #cccccc;
}
@@ -4201,6 +4225,10 @@ label {
text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
border-right: 1px solid #2e3134;
}
+.navbar .navbar-text {
+ padding: 0 10px;
+ line-height: 38px;
+}
.navbar .nav > li > a {
text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
border-right: 1px solid #2e3134;