summaryrefslogtreecommitdiff
path: root/amelia
diff options
context:
space:
mode:
Diffstat (limited to 'amelia')
-rw-r--r--amelia/bootstrap.css235
-rw-r--r--amelia/bootstrap.min.css53
-rwxr-xr-xamelia/bootswatch.less58
-rwxr-xr-xamelia/variables.less5
4 files changed, 197 insertions, 154 deletions
diff --git a/amelia/bootstrap.css b/amelia/bootstrap.css
index 9d0d49ee..57eb9384 100644
--- a/amelia/bootstrap.css
+++ b/amelia/bootstrap.css
@@ -2,7 +2,7 @@
@import url('https://fonts.googleapis.com/css?family=Cabin:400,700');
/*!
- * Bootstrap v2.0.3
+ * Bootstrap v2.0.4
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -65,6 +65,9 @@ img {
border: 0;
-ms-interpolation-mode: bicubic;
}
+#map_canvas img {
+ max-width: none;
+}
button,
input,
select,
@@ -343,9 +346,6 @@ a:hover {
}
p {
margin: 0 0 10px;
- font-family: 'Cabin', Verdana, sans-serif;
- font-size: 14px;
- line-height: 20px;
}
p small {
font-size: 12px;
@@ -494,7 +494,7 @@ em {
}
abbr[title] {
cursor: help;
- border-bottom: 1px dotted #ddd;
+ border-bottom: 1px dotted #aaaaaa;
}
abbr.initialism {
font-size: 90%;
@@ -611,7 +611,7 @@ legend {
line-height: 40px;
color: #333333;
border: 0;
- border-bottom: 1px solid #eee;
+ border-bottom: 1px solid #e5e5e5;
}
legend small {
font-size: 15px;
@@ -635,72 +635,111 @@ textarea {
label {
display: block;
margin-bottom: 5px;
- color: #333333;
}
-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: 20px;
padding: 4px;
margin-bottom: 9px;
font-size: 14px;
line-height: 20px;
color: #555555;
+}
+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 transparent;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
+ -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;
}
@@ -714,27 +753,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 {
@@ -761,39 +794,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;
}
@@ -823,6 +823,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 {
@@ -885,12 +893,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 {
@@ -910,12 +922,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 {
@@ -935,12 +951,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 {
@@ -974,7 +994,7 @@ select:focus:required:invalid:focus {
margin-top: 20px;
margin-bottom: 20px;
background-color: transparent;
- border-top: 1px solid #ddd;
+ border-top: 1px solid #e5e5e5;
*zoom: 1;
}
.form-actions:before,
@@ -998,6 +1018,9 @@ select:focus:required:invalid:focus {
:-moz-placeholder {
color: #aaaaaa;
}
+:-ms-input-placeholder {
+ color: #aaaaaa;
+}
::-webkit-input-placeholder {
color: #aaaaaa;
}
@@ -1984,10 +2007,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;
}
@@ -2041,7 +2064,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;
@@ -2050,7 +2072,6 @@ table .span24 {
}
.fade.in {
opacity: 1;
- filter: alpha(opacity=100);
}
.collapse {
position: relative;
@@ -3084,6 +3105,9 @@ input[type="submit"].btn.btn-mini {
.navbar-search .search-query:-moz-placeholder {
color: rgba(255, 255, 255, 0.9);
}
+.navbar-search .search-query:-ms-input-placeholder {
+ color: rgba(255, 255, 255, 0.9);
+}
.navbar-search .search-query::-webkit-input-placeholder {
color: rgba(255, 255, 255, 0.9);
}
@@ -4876,3 +4900,18 @@ blockquote.pull-right {
blockquote small {
color: rgba(255, 255, 255, 0.6);
}
+.pull-right {
+ float: right;
+}
+.pull-left {
+ float: left;
+}
+.hide {
+ display: none;
+}
+.show {
+ display: block;
+}
+.invisible {
+ visibility: hidden;
+}
diff --git a/amelia/bootstrap.min.css b/amelia/bootstrap.min.css
index f5bcc82c..a45fa727 100644
--- a/amelia/bootstrap.min.css
+++ b/amelia/bootstrap.min.css
@@ -10,6 +10,7 @@ sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;}
sup{top:-0.5em;}
sub{bottom:-0.25em;}
img{max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic;}
+#map_canvas img{max-width:none;}
button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;}
button,input{*overflow:visible;line-height:normal;}
button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;}
@@ -72,7 +73,7 @@ a:hover{color:#e8d069;text-decoration:underline;}
.container:after{clear:both;}
.container-fluid{padding-right:20px;padding-left:20px;*zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";}
.container-fluid:after{clear:both;}
-p{margin:0 0 10px;font-family:'Cabin',Verdana,sans-serif;font-size:14px;line-height:20px;}p small{font-size:12px;color:#aaaaaa;}
+p{margin:0 0 10px;}p small{font-size:12px;color:#aaaaaa;}
.lead{margin-bottom:20px;font-size:20px;font-weight:200;line-height:30px;}
h1,h2,h3,h4,h5,h6{margin:0;font-family:'Lobster',cursive;font-weight:normal;color:inherit;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#aaaaaa;}
h1{font-size:30px;line-height:40px;}h1 small{font-size:18px;}
@@ -100,7 +101,7 @@ hr{margin:20px 0;border:0;border-top:1px solid transparent;border-bottom:1px sol
strong{font-weight:bold;}
em{font-style:italic;}
.muted{color:#aaaaaa;}
-abbr[title]{cursor:help;border-bottom:1px dotted #ddd;}
+abbr[title]{cursor:help;border-bottom:1px dotted #aaaaaa;}
abbr.initialism{font-size:90%;text-transform:uppercase;}
blockquote{padding:0 0 0 15px;margin:0 0 20px;border-left:5px solid #dddddd;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:25px;}
blockquote small{display:block;line-height:20px;color:#aaaaaa;}blockquote small:before{content:'\2014 \00A0';}
@@ -116,32 +117,26 @@ pre code{padding:0;color:inherit;background-color:transparent;border:0;}
.pre-scrollable{max-height:340px;overflow-y:scroll;}
form{margin:0 0 20px;}
fieldset{padding:0;margin:0;border:0;}
-legend{display:block;width:100%;padding:0;margin-bottom:30px;font-size:21px;line-height:40px;color:#333333;border:0;border-bottom:1px solid #eee;}legend small{font-size:15px;color:#aaaaaa;}
+legend{display:block;width:100%;padding:0;margin-bottom:30px;font-size:21px;line-height:40px;color:#333333;border:0;border-bottom:1px solid #e5e5e5;}legend small{font-size:15px;color:#aaaaaa;}
label,input,button,select,textarea{font-size:14px;font-weight:normal;line-height:20px;}
input,button,select,textarea{font-family:'Cabin',Verdana,sans-serif;}
-label{display:block;margin-bottom:5px;color:#333333;}
-input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:20px;padding:4px;margin-bottom:9px;font-size:14px;line-height:20px;color:#555555;background-color:#ffffff;border:1px solid transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+label{display:block;margin-bottom:5px;}
+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;height:20px;padding:4px;margin-bottom:9px;font-size:14px;line-height:20px;color:#555555;}
+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 transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-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;}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;-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="radio"],input[type="checkbox"]{margin:3px 0;*margin-top:0;line-height:normal;cursor:pointer;}
+input[type="submit"],input[type="reset"],input[type="button"],input[type="radio"],input[type="checkbox"]{width:auto;}
.uneditable-textarea{width:auto;height:auto;}
-label input,label textarea,label select{display:block;}
-input[type="image"],input[type="checkbox"],input[type="radio"]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;cursor:pointer;background-color:transparent;border:0 \9;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
-input[type="image"]{border:0;}
-input[type="file"]{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"]{width:auto;height:auto;}
select,input[type="file"]{height:28px;*margin-top:4px;line-height:28px;}
-input[type="file"]{line-height:18px \9;}
-select{width:220px;background-color:#ffffff;}
+select{width:220px;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{min-height:18px;padding-left:18px;}
.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-18px;}
.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px;}
.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle;}
.radio.inline+.radio.inline,.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;-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;}
.input-small{width:90px;}
.input-medium{width:150px;}
@@ -149,6 +144,7 @@ input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus,
.input-xlarge{width:270px;}
.input-xxlarge{width:530px;}
input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[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{margin-left:0;}
input.span12, textarea.span12, .uneditable-input.span12{width:930px;}
input.span11, textarea.span11, .uneditable-input.span11{width:850px;}
@@ -165,19 +161,20 @@ input.span1, textarea.span1, .uneditable-input.span1{width:50px;}
input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#dddddd;border-color:#ddd;}
input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent;}
.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;}
-.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;}
+.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{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;}
.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;}
.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;}
-.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;}
+.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{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;}
.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48;}
.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;}
-.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;}
+.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{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;}
.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;}
input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;}
-.form-actions{padding:19px 20px 20px;margin-top:20px;margin-bottom:20px;background-color:transparent;border-top:1px solid #ddd;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";}
+.form-actions{padding:19px 20px 20px;margin-top:20px;margin-bottom:20px;background-color:transparent;border-top:1px solid #e5e5e5;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";}
.form-actions:after{clear:both;}
.uneditable-input{overflow:hidden;white-space:nowrap;cursor:not-allowed;background-color:#ffffff;border-color:#eee;-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);}
:-moz-placeholder{color:#aaaaaa;}
+:-ms-input-placeholder{color:#aaaaaa;}
::-webkit-input-placeholder{color:#aaaaaa;}
.help-block,.help-inline{color:#555555;}
.help-block{display:block;margin-bottom:10px;}
@@ -401,15 +398,15 @@ table .span24{float:none;width:1884px;margin-left:0;}
.dropdown-menu .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;}
.dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:20px;color:#003f4d;white-space:nowrap;}
.dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;background-color:rgba(0, 57, 59, 0.9);}
-.open{*z-index:1000;}.open .dropdown-menu{display:block;}
-.pull-right .dropdown-menu{right:0;left:auto;}
+.open{*z-index:1000;}.open >.dropdown-menu{display:block;}
+.pull-right>.dropdown-menu{right:0;left:auto;}
.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000000;content:"\2191";}
.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px;}
.typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);}
.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
-.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;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;}.fade.in{opacity:1;filter:alpha(opacity=100);}
+.fade{opacity:0;-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;}.fade.in{opacity:1;}
.collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;}.collapse.in{height:auto;}
.close{float:right;font-size:20px;font-weight:bold;line-height:20px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;cursor:pointer;opacity:0.4;filter:alpha(opacity=40);}
button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none;}
@@ -561,6 +558,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-
.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px;}
.navbar-form .input-append,.navbar-form .input-prepend{margin-top:6px;white-space:nowrap;}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0;}
.navbar-search{position:relative;float:left;margin-top:11px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:'Cabin',Verdana,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;background-color:rgba(0, 0, 0, 0);border:1px solid rgba(0, 0, 0, 0);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:rgba(255, 255, 255, 0.9);}
+.navbar-search .search-query:-ms-input-placeholder{color:rgba(255, 255, 255, 0.9);}
.navbar-search .search-query::-webkit-input-placeholder{color:rgba(255, 255, 255, 0.9);}
.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#e5646e;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-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0;}
@@ -824,3 +822,8 @@ code,pre{background-color:rgba(255, 255, 255, 0.3);padding:2px;}
.thumbnail{border:0px solid transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
blockquote{border-left-color:#1cafbd;}blockquote.pull-right{border-right-color:#1cafbd;}
blockquote small{color:rgba(255, 255, 255, 0.6);}
+.pull-right{float:right;}
+.pull-left{float:left;}
+.hide{display:none;}
+.show{display:block;}
+.invisible{visibility:hidden;}
diff --git a/amelia/bootswatch.less b/amelia/bootswatch.less
index b7aaca3e..16eeaa66 100755
--- a/amelia/bootswatch.less
+++ b/amelia/bootswatch.less
@@ -1,6 +1,6 @@
// Bootswatch.less
// Swatch: Amelia
-// Version: 2.0.3
+// Version: 2.0.4
// -----------------------------------------------------
// TYPOGRAPHY
@@ -43,9 +43,9 @@ hr {
footer.footer {
border-top: 1px solid rgba(255, 255, 255, 0.3);
-
+
p {
- color: @textColor;
+ color: @textColor;
}
}
@@ -56,7 +56,7 @@ footer.footer {
.navbar-inner {
.border-radius(0);
}
-
+
.brand {
padding: 12px 20px 14px;
font-size: 24px;
@@ -68,16 +68,16 @@ footer.footer {
padding-bottom: 14px;
text-shadow: none;
}
-
+
.navbar-search {
margin-top: 10px;
- }
-
+ }
+
.navbar-search .search-query {
border: 2px solid lighten(@navbarBackground, 10%);
.border-radius(0);
.box-shadow(none);
-
+
&:focus, &.focus {
background-color: @grayLighter;
border-color: @grayLighter;
@@ -94,17 +94,17 @@ div.subnav {
border: 0px solid transparent;
.border-radius(0);
.box-shadow(none);
-
+
.nav > li.open > a {
border-color: transparent;
background-color: rgba(255, 255, 255, 0.4);
}
-
+
.nav > li > a {
color: @textColor;
border-color: transparent;
}
-
+
.nav > li:first-child > a,
.nav > li:first-child > a:hover {
.border-radius(0);
@@ -116,7 +116,7 @@ div.subnav {
color: @textColor;
.box-shadow(none);
}
-
+
.nav > .active > a:hover,
.nav > li > a:hover,
.nav > li.active > a:hover, {
@@ -124,7 +124,7 @@ div.subnav {
background-color: rgba(255, 255, 255, 0.4);
color: @textColor;
}
-
+
.nav > li:first-child > a:hover {
border-left-color: rgba(255, 255, 255, 0.4);
border-left-width: 1px;
@@ -136,21 +136,21 @@ div.subnav-fixed {
}
.navbar .nav-collapse.in {
-
+
.nav li > a {
color: @textColor;
.border-radius(0);
}
-
+
li > a:hover {
background-color: lighten(@navbarBackground, 10%);
}
-
+
.navbar-form, .navbar-search {
.box-shadow(none);
border-color: lighten(@navbarBackground, 10%);
}
-
+
.navbar-search .search-query {
border: 2px solid @textColor;
}
@@ -168,7 +168,7 @@ div.subnav-fixed {
background-color: darken(@color, 5%);
text-shadow: none;
}
-
+
&:active, &.active {
background-color: darken(@color, 15%);
.box-shadow(none);
@@ -343,11 +343,11 @@ input, textarea, .search-query, .uneditable-input,
.breadcrumb {
background-color: #3CB9C6;
background-image: none;
-
+
li {
text-shadow: none;
}
-
+
.divider {
color: @linkColor;
}
@@ -362,7 +362,7 @@ input, textarea, .search-query, .uneditable-input,
}
.pagination {
-
+
ul {
background-color: #3CB9C6;
background-image: none;
@@ -375,12 +375,12 @@ input, textarea, .search-query, .uneditable-input,
.disabled a, .disabled a:hover {
color: @textColor;
}
-
+
li a:hover {
background-color: rgba(255, 255, 255, 0.4);
color: @linkColor;
}
-
+
.active a, .active a:hover {
background-color: rgba(255, 255, 255, 0.4);
color: @textColor;
@@ -403,20 +403,20 @@ input, textarea, .search-query, .uneditable-input,
.nav-tabs, .nav-pills {
border-color: transparent;
-
+
li > a {
border-color: transparent;
.border-radius(0);
.box-shadow(0);
}
-
+
li.active > a,
li:active > a,
li.active > a:hover,
li:active > a:hover {
color: @textColor;
}
-
+
li.active > a,
li:active > a,
li > a:hover,
@@ -442,7 +442,7 @@ input, textarea, .search-query, .uneditable-input,
li > a:last-child {
.border-radius(0);
}
-
+
li > a,
li > a:hover,
li.active > a,
@@ -458,7 +458,7 @@ input, textarea, .search-query, .uneditable-input,
text-shadow: none;
color: @textColor;
}
-
+
li > a {
text-shadow: none;
}
@@ -545,7 +545,7 @@ code, pre {
.progress {
background-image: none;
background-color: #27666D;
-
+
.bar {
.box-shadow(none);
background-image: none;
diff --git a/amelia/variables.less b/amelia/variables.less
index a8383e02..fde6fdb1 100755
--- a/amelia/variables.less
+++ b/amelia/variables.less
@@ -1,7 +1,7 @@
// Variables.less
// Variables to customize the look and feel of Bootstrap
// Swatch: Amelia
-// Version: 2.0.3
+// Version: 2.0.4
// -----------------------------------------------------
// GLOBAL VALUES
@@ -107,7 +107,8 @@
@dropdownLinkColor: @bodyBackground;
@dropdownLinkColorHover: @white;
@dropdownLinkBackgroundHover: rgba(0, 57, 59, 0.9);
-
+@dropdownDividerTop: #e5e5e5;
+@dropdownDividerBottom: @white;
generated by cgit v1.2.3 (git 2.46.0) at 2025-02-17 11:04:40 +0000