summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Park <thomas@thomaspark.me>2012-02-11 20:56:05 -0500
committerThomas Park <thomas@thomaspark.me>2012-02-11 20:56:05 -0500
commit421200908911d029698d4692b00482ecedae5389 (patch)
tree98677b10337699565d976e0984fbe71f60487d07
parentfbff2d4091cc3c7a75c6a322f3c10d778c42d569 (diff)
united navbar search border
-rw-r--r--united/bootstrap.css9
-rw-r--r--united/bootstrap.min.css7
-rwxr-xr-xunited/bootswatch.less4
3 files changed, 14 insertions, 6 deletions
diff --git a/united/bootstrap.css b/united/bootstrap.css
index 53cdc46d..598a0afa 100644
--- a/united/bootstrap.css
+++ b/united/bootstrap.css
@@ -3060,13 +3060,13 @@ a.thumbnail:hover {
background-color: #df382c;
}
.label-warning {
- background-color: #dd4814;
+ background-color: #f18a66;
}
.label-success {
- background-color: #38b44a;
+ background-color: #55ca66;
}
.label-info {
- background-color: #19b6ee;
+ background-color: #60cdf3;
}
@-webkit-keyframes progress-bar-stripes {
from {
@@ -3360,6 +3360,9 @@ a.thumbnail:hover {
background-color: inherit;
border-right: 0px solid #CE4213;
}
+.navbar-search .search-query {
+ border: 1px solid #97310e;
+}
.btn-primary {
background-color: #e86537;
background-image: -moz-linear-gradient(top, #ef784e, #dd4814);
diff --git a/united/bootstrap.min.css b/united/bootstrap.min.css
index 2f7e13c3..fd5db85e 100644
--- a/united/bootstrap.min.css
+++ b/united/bootstrap.min.css
@@ -568,9 +568,9 @@ a.thumbnail:hover{border-color:#dd4814;-webkit-box-shadow:0 1px 4px rgba(0, 105,
.thumbnail .caption{padding:9px;}
.label{padding:1px 3px 2px;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;background-color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
.label-important{background-color:#df382c;}
-.label-warning{background-color:#dd4814;}
-.label-success{background-color:#38b44a;}
-.label-info{background-color:#19b6ee;}
+.label-warning{background-color:#f18a66;}
+.label-success{background-color:#55ca66;}
+.label-info{background-color:#60cdf3;}
@-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@-moz-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress{overflow:hidden;height:18px;margin-bottom:18px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
.progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
.progress-striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;}
@@ -607,6 +607,7 @@ a.thumbnail:hover{border-color:#dd4814;-webkit-box-shadow:0 1px 4px rgba(0, 105,
.navbar .nav>li>a{border-right:1px solid #C03D14;border-left:1px solid #E6633A;}
.navbar .nav .active>a,.navbar .nav .active>a:hover{background-color:rgba(0, 0, 0, 0.2);}
.navbar .divider-vertical{background-color:inherit;border-right:0px solid #CE4213;}
+.navbar-search .search-query{border:1px solid #97310e;}
.btn-primary{background-color:#e86537;background-image:-moz-linear-gradient(top, #ef784e, #dd4814);background-image:-ms-linear-gradient(top, #ef784e, #dd4814);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ef784e), to(#dd4814));background-image:-webkit-linear-gradient(top, #ef784e, #dd4814);background-image:-o-linear-gradient(top, #ef784e, #dd4814);background-image:linear-gradient(top, #ef784e, #dd4814);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ef784e', endColorstr='#dd4814', GradientType=0);border-color:#dd4814 #dd4814 #97310e;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#dd4814;}
.btn-primary:active,.btn-primary.active{background-color:#ae3910 \9;}
.btn-warning{background-color:#f3c768;background-image:-moz-linear-gradient(top, #f5d185, #efb73e);background-image:-ms-linear-gradient(top, #f5d185, #efb73e);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5d185), to(#efb73e));background-image:-webkit-linear-gradient(top, #f5d185, #efb73e);background-image:-o-linear-gradient(top, #f5d185, #efb73e);background-image:linear-gradient(top, #f5d185, #efb73e);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5d185', endColorstr='#efb73e', GradientType=0);border-color:#efb73e #efb73e #cf9311;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#efb73e;}
diff --git a/united/bootswatch.less b/united/bootswatch.less
index 0d14766e..1a56d842 100755
--- a/united/bootswatch.less
+++ b/united/bootswatch.less
@@ -29,6 +29,10 @@
border-right: 0px solid #CE4213;
}
+.navbar-search .search-query {
+ border: 1px solid darken(@navbarBackground, 15%);
+}
+
// BUTTONS
// -----------------------------------------------------