Commit 596fedd5 authored by Thomas Park's avatar Thomas Park
Browse files

fixes #93, remove hover effects on disabled nav

parent 2a062f7a
...@@ -6363,20 +6363,13 @@ div.subnav-fixed { ...@@ -6363,20 +6363,13 @@ div.subnav-fixed {
} }
} }
.nav-tabs li.open > .dropdown-toggle,
.nav-pills li.open > .dropdown-toggle {
color: #e8d069;
background-color: #8AD5DC;
border-color: transparent;
}
.nav-tabs, .nav-tabs,
.nav-pills { .nav-pills {
border-color: transparent; border-color: transparent;
} }
.nav-tabs li > a, .nav-tabs > li > a,
.nav-pills li > a { .nav-pills > li > a {
border-color: transparent; border-color: transparent;
-webkit-border-radius: 0; -webkit-border-radius: 0;
-moz-border-radius: 0; -moz-border-radius: 0;
...@@ -6386,26 +6379,41 @@ div.subnav-fixed { ...@@ -6386,26 +6379,41 @@ div.subnav-fixed {
box-shadow: 0; box-shadow: 0;
} }
.nav-tabs li.active > a, .nav-tabs > li > a:hover,
.nav-pills li.active > a, .nav-pills > li > a:hover {
.nav-tabs li.active > a:hover, text-shadow: none;
.nav-pills li.active > a:hover { background-color: #8AD5DC;
color: #e1f0f0; border-color: transparent;
} }
.nav-tabs li.active > a, .nav-tabs > .active > a,
.nav-pills li.active > a, .nav-pills > .active > a,
.nav-tabs li > a:hover, .nav-tabs > .active > a:hover,
.nav-pills li > a:hover, .nav-pills > .active > a:hover {
.nav-tabs li.active > a:hover, color: #e1f0f0;
.nav-pills li.active > a:hover {
text-shadow: none; text-shadow: none;
background-color: #8AD5DC; background-color: #8AD5DC;
border-color: transparent; border-color: transparent;
} }
.nav-tabs, .nav-tabs > .disabled > a,
.nav-tabs > li > a { .nav-pills > .disabled > a,
.nav-tabs > .disabled > a:hover,
.nav-pills > .disabled > a:hover {
color: #dddddd;
background: none;
}
.nav-tabs > .open > .dropdown-toggle,
.nav-pills > .open > .dropdown-toggle,
.nav-tabs > .open > .dropdown-toggle,
.nav-pills > .open > .dropdown-toggle {
color: #e8d069;
background-color: #8AD5DC;
border-color: transparent;
}
.nav-tabs {
border-bottom: 1px solid rgba(255, 255, 255, 0.5); border-bottom: 1px solid rgba(255, 255, 255, 0.5);
} }
...@@ -6473,8 +6481,9 @@ div.subnav-fixed { ...@@ -6473,8 +6481,9 @@ div.subnav-fixed {
color: #ffffff; color: #ffffff;
} }
.breadcrumb .divider { .breadcrumb > li > a.divider,
color: #e8d069; .breadcrumb > li > span.divider {
color: #dddddd;
} }
.pagination ul { .pagination ul {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -216,45 +216,57 @@ div.subnav { ...@@ -216,45 +216,57 @@ div.subnav {
// NAV // NAV
// ----------------------------------------------------- // -----------------------------------------------------
.nav-tabs li.open > .dropdown-toggle, .nav-tabs,
.nav-pills li.open > .dropdown-toggle { .nav-pills {
background-color: #8AD5DC;
color: @linkColor;
border-color: transparent;
}
.nav-tabs, .nav-pills {
border-color: transparent; border-color: transparent;
li > a {
& > li > a {
border-color: transparent; border-color: transparent;
.border-radius(0); .border-radius(0);
.box-shadow(0); .box-shadow(0);
} }
li.active > a, & > li > a:hover {
li.active > a:hover { background-color: #8AD5DC;
color: @textColor; border-color: transparent;
text-shadow: none;
} }
li.active > a, & > .active > a,
li > a:hover, & > .active > a:hover {
li.active > a:hover {
background-color: #8AD5DC; background-color: #8AD5DC;
border-color: transparent; border-color: transparent;
color: @textColor;
text-shadow: none; text-shadow: none;
} }
& > .disabled > a,
& > .disabled > a:hover {
background: none;
color: @grayLighter;
}
& > .open > .dropdown-toggle,
& > .open > .dropdown-toggle {
background-color: #8AD5DC;
color: @linkColor;
border-color: transparent;
}
} }
.nav-tabs, .nav-tabs > li > a { .nav-tabs {
border-bottom: 1px solid rgba(255, 255, 255, 0.5); border-bottom: 1px solid rgba(255, 255, 255, 0.5);
}
.nav-tabs > li > a { & > li > a {
background-color: #3CB9C6; background-color: #3CB9C6;
} }
.nav-tabs.nav-stacked { &.nav-stacked {
li > a:first-child, li > a:first-child,
li > a:last-child { li > a:last-child {
...@@ -267,6 +279,7 @@ div.subnav { ...@@ -267,6 +279,7 @@ div.subnav {
li.active > a:hover { li.active > a:hover {
border-color: transparent; border-color: transparent;
} }
}
} }
.nav-list { .nav-list {
...@@ -301,6 +314,7 @@ div.subnav { ...@@ -301,6 +314,7 @@ div.subnav {
} }
.breadcrumb { .breadcrumb {
background-color: #3CB9C6; background-color: #3CB9C6;
background-image: none; background-image: none;
...@@ -312,8 +326,9 @@ div.subnav { ...@@ -312,8 +326,9 @@ div.subnav {
color: @white; color: @white;
} }
.divider { & > li > a.divider,
color: @linkColor; & > li > span.divider {
color: @grayLighter;
} }
} }
......
...@@ -6373,6 +6373,10 @@ div.subnav-fixed { ...@@ -6373,6 +6373,10 @@ div.subnav-fixed {
border-color: transparent; border-color: transparent;
} }
.nav-tabs li.disabled > a {
color: #999999;
}
.nav-tabs .open .dropdown-toggle { .nav-tabs .open .dropdown-toggle {
background-color: #060606; background-color: #060606;
border-color: transparent; border-color: transparent;
...@@ -6383,6 +6387,10 @@ div.subnav-fixed { ...@@ -6383,6 +6387,10 @@ div.subnav-fixed {
background-color: #33b5e5; background-color: #33b5e5;
} }
.nav-pills li.disabled > a {
color: #999999;
}
.nav-pills .open .dropdown-toggle { .nav-pills .open .dropdown-toggle {
background-color: #060606; background-color: #060606;
} }
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -220,6 +220,10 @@ div.subnav { ...@@ -220,6 +220,10 @@ div.subnav {
color: @white; color: @white;
} }
li.disabled > a {
color: @textColor;
}
.open .dropdown-toggle { .open .dropdown-toggle {
background-color: #060606; background-color: #060606;
border-color: transparent; border-color: transparent;
...@@ -233,6 +237,10 @@ div.subnav { ...@@ -233,6 +237,10 @@ div.subnav {
color: @white; color: @white;
} }
li.disabled > a {
color: @textColor;
}
.open .dropdown-toggle { .open .dropdown-toggle {
background-color: #060606; background-color: #060606;
} }
......
...@@ -6322,6 +6322,11 @@ div.subnav .nav > li.active > a:hover { ...@@ -6322,6 +6322,11 @@ div.subnav .nav > li.active > a:hover {
background-color: #f7f7f7; background-color: #f7f7f7;
} }
.nav-tabs > li.disabled > a:hover {
color: #999999;
background-color: #efefef;
}
.nav-tabs .dropdown .dropdown-toggle .caret { .nav-tabs .dropdown .dropdown-toggle .caret {
border-top-color: #555555; border-top-color: #555555;
border-bottom-color: #555555; border-bottom-color: #555555;
...@@ -6386,6 +6391,10 @@ div.subnav .nav > li.active > a:hover { ...@@ -6386,6 +6391,10 @@ div.subnav .nav > li.active > a:hover {
background-color: #fbebe9; background-color: #fbebe9;
} }
.nav-pills > li.disabled > a:hover {
color: #999999;
}
.nav-pills .dropdown .dropdown-toggle .caret { .nav-pills .dropdown .dropdown-toggle .caret {
border-top-color: #555555; border-top-color: #555555;
border-bottom-color: #555555; border-bottom-color: #555555;
...@@ -6506,11 +6515,9 @@ legend { ...@@ -6506,11 +6515,9 @@ legend {
} }
.label { .label {
padding: 4px 4px 3px; padding: 6px 12px;
margin-right: 1px; margin-right: 1px;
margin-left: 1px; margin-left: 1px;
font-weight: normal;
line-height: 26px;
} }
i[class^="icon-"] { i[class^="icon-"] {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -192,6 +192,11 @@ div.subnav { ...@@ -192,6 +192,11 @@ div.subnav {
background-color: @bodyBackground; background-color: @bodyBackground;
} }
& > li.disabled > a:hover {
background-color: darken(@bodyBackground, 3%);
color: @grayLight;
}
.dropdown { .dropdown {
.dropdown-toggle .caret { .dropdown-toggle .caret {
...@@ -265,6 +270,10 @@ div.subnav { ...@@ -265,6 +270,10 @@ div.subnav {
color: @linkColor; color: @linkColor;
} }
& > li.disabled > a:hover {
color: @grayLight;
}
.dropdown .dropdown-toggle .caret { .dropdown .dropdown-toggle .caret {
border-top-color: @textColor; border-top-color: @textColor;
border-bottom-color: @textColor; border-bottom-color: @textColor;
...@@ -401,11 +410,9 @@ legend { ...@@ -401,11 +410,9 @@ legend {
// ----------------------------------------------------- // -----------------------------------------------------
.label { .label {
padding: 4px 4px 3px; padding: 6px 12px;
margin-left: 1px; margin-left: 1px;
margin-right: 1px; margin-right: 1px;
line-height: 26px;
font-weight: normal;
} }
// MISCELLANEOUS // MISCELLANEOUS
......
...@@ -6417,6 +6417,11 @@ div.subnav.subnav-fixed .nav > li:first-child > a:hover { ...@@ -6417,6 +6417,11 @@ div.subnav.subnav-fixed .nav > li:first-child > a:hover {
border: none; border: none;
} }
.nav > li.disabled > a,
.nav > li.disabled > a:hover {
color: #52575c;
}
.nav li > a:hover { .nav li > a:hover {
color: #bbbfc2; color: #bbbfc2;
background-color: transparent; background-color: transparent;
...@@ -6601,6 +6606,14 @@ div.subnav.subnav-fixed .nav > li:first-child > a:hover { ...@@ -6601,6 +6606,14 @@ div.subnav.subnav-fixed .nav > li:first-child > a:hover {
.pager .disabled a, .pager .disabled a,
.pager .disabled a:hover { .pager .disabled a:hover {
background-color: transparent; background-color: transparent;
background-color: #3a3f44;
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#52575c), color-stop(70%, #3a3f44), to(#3a3f44));
background-image: -webkit-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);
background-image: -moz-linear-gradient(top, #52575c, #3a3f44 70%, #3a3f44);
background-image: -o-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);
background-image: linear-gradient(#52575c, #3a3f44 70%, #3a3f44);
background-repeat: no-repeat;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff52575c', endColorstr='#ff3a3f44', GradientType=0);
} }
.btn { .btn {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -226,6 +226,11 @@ div.subnav { ...@@ -226,6 +226,11 @@ div.subnav {
color: @white; color: @white;
} }
& > li.disabled > a,
& > li.disabled > a:hover {
color: @gray;
}
li > a:hover { li > a:hover {
background-color: transparent; background-color: transparent;
color: @grayLighter; color: @grayLighter;
...@@ -352,6 +357,7 @@ div.subnav { ...@@ -352,6 +357,7 @@ div.subnav {
li > a, li > a,
li > span { li > span {
border: 1px solid transparent; border: 1px solid transparent;
.box-shadow('0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)'); .box-shadow('0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)');
#gradient > .vertical-three-colors(@gray, @grayDark, 70%, @grayDark); #gradient > .vertical-three-colors(@gray, @grayDark, 70%, @grayDark);
...@@ -365,6 +371,7 @@ div.subnav { ...@@ -365,6 +371,7 @@ div.subnav {
.disabled a, .disabled a,
.disabled a:hover { .disabled a:hover {
background-color: transparent; background-color: transparent;
#gradient > .vertical-three-colors(@gray, @grayDark, 70%, @grayDark);
} }
} }
......
...@@ -6427,6 +6427,10 @@ div.subnav .nav > .active > a:hover .caret { ...@@ -6427,6 +6427,10 @@ div.subnav .nav > .active > a:hover .caret {
border-color: transparent; border-color: transparent;
} }
.nav-tabs li.disabled > a:hover {
background-color: #45515f;
}
.nav-pills > li > a { .nav-pills > li > a {
color: #ece9d7; color: #ece9d7;
background-color: #45515f; background-color: #45515f;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -272,6 +272,10 @@ div.subnav { ...@@ -272,6 +272,10 @@ div.subnav {
background-color: lighten(@blue, 10%); background-color: lighten(@blue, 10%);
border-color: transparent; border-color: transparent;
} }
li.disabled > a:hover {
background-color: @blue;
}
} }
.nav-pills { .nav-pills {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment