diff options
| -rw-r--r-- | amelia/bootstrap.css | 22 | ||||
| -rw-r--r-- | amelia/bootstrap.min.css | 5 | ||||
| -rwxr-xr-x | amelia/bootswatch.less | 13 |
3 files changed, 34 insertions, 6 deletions
diff --git a/amelia/bootstrap.css b/amelia/bootstrap.css index ecaf584d..27da523a 100644 --- a/amelia/bootstrap.css +++ b/amelia/bootstrap.css @@ -3608,10 +3608,24 @@ div.subnav .nav > li > a { color: rgba(256, 256, 256, 0.9); border-color: transparent; } -div.subnav .nav > .active > a, -div.subnav .nav > .active > a:hover, -div.subnav .nav > li > a:hover, -div.subnav .nav > li.active > a:hover { +div.subnav .nav > li:first-child > a, div.subnav .nav > li:first-child > a:hover { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +div.subnav .nav > li:first-child > a:hover { + border-left-color: rgba(256, 256, 256, 0.4); + border-left-width: 1px; +} +div.subnav .nav > .active > a { + background-color: transparent; + border-color: transparent; + color: rgba(256, 256, 256, 0.9); + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} +div.subnav .nav > .active > a:hover, div.subnav .nav > li > a:hover, div.subnav .nav > li.active > a:hover { border-right-color: transparent; background-color: rgba(256, 256, 256, 0.4); color: rgba(256, 256, 256, 0.9); diff --git a/amelia/bootstrap.min.css b/amelia/bootstrap.min.css index 8171d075..f15b3f05 100644 --- a/amelia/bootstrap.min.css +++ b/amelia/bootstrap.min.css @@ -648,7 +648,10 @@ footer.footer{border-top:1px solid rgba(256, 256, 256, 0.3);} .navbar .nav>li.dropdown.open>.dropdown-menu a:hover,div.subnav .nav>li.dropdown.open>.dropdown-menu a:hover,.dropdown-menu>li>a:hover,.nav .dropdown.open>.dropdown-menu>li>a:hover{background-color:rgba(0, 57, 59, 0.9);} div.subnav{background-color:rgba(42, 99, 105, 0.9);background-image:none;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;}div.subnav .nav>li.dropdown.open>a{border-color:transparent;background-color:rgba(256, 256, 256, 0.4);} div.subnav .nav>li>a{color:rgba(256, 256, 256, 0.9);border-color:transparent;} -div.subnav .nav>.active>a,div.subnav .nav>.active>a:hover,div.subnav .nav>li>a:hover,div.subnav .nav>li.active>a:hover{border-right-color:transparent;background-color:rgba(256, 256, 256, 0.4);color:rgba(256, 256, 256, 0.9);} +div.subnav .nav>li:first-child>a,div.subnav .nav>li:first-child>a:hover{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +div.subnav .nav>li:first-child>a:hover{border-left-color:rgba(256, 256, 256, 0.4);border-left-width:1px;} +div.subnav .nav>.active>a{background-color:transparent;border-color:transparent;color:rgba(256, 256, 256, 0.9);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +div.subnav .nav>.active>a:hover,div.subnav .nav>li>a:hover,div.subnav .nav>li.active>a:hover{border-right-color:transparent;background-color:rgba(256, 256, 256, 0.4);color:rgba(256, 256, 256, 0.9);} div.subnav-fixed{top:50px;} .navbar .nav-collapse.collapse li>a{color:rgba(256, 256, 256, 0.9);-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} .navbar .nav-collapse.collapse li>a:hover{background-color:#d92432;} diff --git a/amelia/bootswatch.less b/amelia/bootswatch.less index 7592d4e0..90505cee 100755 --- a/amelia/bootswatch.less +++ b/amelia/bootswatch.less @@ -119,7 +119,18 @@ div.subnav { border-color: transparent; } - .nav > .active > a, + .nav > li:first-child > a, + .nav > li:first-child > a:hover { + .border-radius(0); + } + + .nav > .active > a { + background-color: transparent; + border-color: transparent; + color: @textColor; + .box-shadow(none); + } + .nav > .active > a:hover, .nav > li > a:hover, .nav > li.active > a:hover, { |