summaryrefslogtreecommitdiff
path: root/united
diff options
context:
space:
mode:
authorThomas Park <thomas@thomaspark.me>2012-02-11 23:25:14 -0500
committerThomas Park <thomas@thomaspark.me>2012-02-11 23:25:14 -0500
commit29edaa06638723d6a8bddd57520ba699a21f566f (patch)
treeecc0b6361799b4fc582ab2c4e3d5080b39657e57 /united
parent4a487b95760d08571a01fab6109ede67fda69937 (diff)
Fixed united nav-collapse form and hover
Diffstat (limited to 'united')
-rw-r--r--united/bootstrap.css15
-rw-r--r--united/bootstrap.min.css3
-rwxr-xr-xunited/bootswatch.less17
3 files changed, 35 insertions, 0 deletions
diff --git a/united/bootstrap.css b/united/bootstrap.css
index 0d6df933..d34a4a74 100644
--- a/united/bootstrap.css
+++ b/united/bootstrap.css
@@ -3363,6 +3363,21 @@ a.thumbnail:hover {
.navbar-search .search-query {
border: 1px solid #97310e;
}
+.navbar .nav-collapse > .nav > li a {
+ color: #ffffff;
+ border-left: 0px solid #dd4814;
+ border-right: 0px solid #dd4814;
+}
+.navbar .nav-collapse > .nav > li a:hover {
+ background-color: #A6350F;
+}
+.navbar .nav-collapse .navbar-form, .navbar .nav-collapse .navbar-search {
+ border-top: 0px solid #dd4814;
+ border-bottom: 0px solid #dd4814;
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
+}
.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 4201b4f5..c524d3ea 100644
--- a/united/bootstrap.min.css
+++ b/united/bootstrap.min.css
@@ -608,6 +608,9 @@ a.thumbnail:hover{border-color:#dd4814;-webkit-box-shadow:0 1px 4px rgba(0, 105,
.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;}
+.navbar .nav-collapse>.nav>li a{color:#ffffff;border-left:0px solid #dd4814;border-right:0px solid #dd4814;}
+.navbar .nav-collapse>.nav>li a:hover{background-color:#A6350F;}
+.navbar .nav-collapse .navbar-form,.navbar .nav-collapse .navbar-search{border-top:0px solid #dd4814;border-bottom:0px solid #dd4814;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
.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 d5251211..46aebeaa 100755
--- a/united/bootswatch.less
+++ b/united/bootswatch.less
@@ -33,6 +33,23 @@
border: 1px solid darken(@navbarBackground, 15%);
}
+.navbar .nav-collapse > .nav > li a {
+ color: @white;
+ border-left: 0px solid @orange;
+ border-right: 0px solid @orange;
+}
+
+.navbar .nav-collapse > .nav > li a:hover {
+ background-color: #A6350F;
+}
+
+.navbar .nav-collapse .navbar-form,
+.navbar .nav-collapse .navbar-search {
+ border-top: 0px solid @orange;
+ border-bottom: 0px solid @orange;
+ .box-shadow(none);
+}
+
// BUTTONS
// -----------------------------------------------------