diff options
Diffstat (limited to 'superhero')
-rw-r--r-- | superhero/bootstrap.css | 21 | ||||
-rw-r--r-- | superhero/bootstrap.min.css | 8 | ||||
-rwxr-xr-x | superhero/bootswatch.less | 23 |
3 files changed, 31 insertions, 21 deletions
diff --git a/superhero/bootstrap.css b/superhero/bootstrap.css index 24ff2873..a73d2501 100644 --- a/superhero/bootstrap.css +++ b/superhero/bootstrap.css @@ -5170,20 +5170,25 @@ div.subnav .nav > .active > a:hover .caret { background-image: none; border-color: transparent; } -.pagination li > a { +.pagination ul > li > a, +.pagination ul > li > span { border: none; color: #ece9d7; } -.pagination li.active > a, -.pagination li.active > a:hover { +.pagination ul > li > a:hover { + background: #5a6a7d; +} +.pagination ul > .active > a, +.pagination ul > .active > a:hover, +.pagination ul > .active > span, +.pagination ul > .active > span:hover { background-color: #e36b23; color: #ffffff; } -.pagination li > a:hover { - background: #5a6a7d; -} -.pagination li.disabled > a, -.pagination li.disabled > a:hover { +.pagination ul > .disabled > a, +.pagination ul > .disabled > a:hover, +.pagination ul > .disabled > span, +.pagination ul > .disabled > span:hover { background: #3a4450; } .pager a { diff --git a/superhero/bootstrap.min.css b/superhero/bootstrap.min.css index 6a6a0bf0..5d467b25 100644 --- a/superhero/bootstrap.min.css +++ b/superhero/bootstrap.min.css @@ -874,10 +874,10 @@ div.subnav .nav>.active>a .caret,div.subnav .nav>.active>a:hover .caret{border-t .breadcrumb{background-color:#45515f;background-image:none;border:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.breadcrumb li{text-shadow:none;} .breadcrumb .divider{color:#ece9d7;} .pagination ul{background-image:none;border-color:transparent;} -.pagination li>a{border:none;color:#ece9d7;} -.pagination li.active>a,.pagination li.active>a:hover{background-color:#e36b23;color:#ffffff;} -.pagination li>a:hover{background:#5a6a7d;} -.pagination li.disabled>a,.pagination li.disabled>a:hover{background:#3a4450;} +.pagination ul>li>a,.pagination ul>li>span{border:none;color:#ece9d7;} +.pagination ul>li>a:hover{background:#5a6a7d;} +.pagination ul>.active>a,.pagination ul>.active>a:hover,.pagination ul>.active>span,.pagination ul>.active>span:hover{background-color:#e36b23;color:#ffffff;} +.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover,.pagination ul>.disabled>span,.pagination ul>.disabled>span:hover{background:#3a4450;} .pager a{color:#ece9d7;background-color:#45515f;border-color:transparent;}.pager a:hover{background:#5a6a7d;} .pager .disabled a,.pager .disabled a:hover{background-color:#45515f;} .btn,.btn:hover{text-shadow:none;background-image:none;-webkit-box-shadow:-2px 2px 0 rgba(0, 0, 0, 0.2);-moz-box-shadow:-2px 2px 0 rgba(0, 0, 0, 0.2);box-shadow:-2px 2px 0 rgba(0, 0, 0, 0.2);border:none;} diff --git a/superhero/bootswatch.less b/superhero/bootswatch.less index eedb71cd..df0fc60c 100755 --- a/superhero/bootswatch.less +++ b/superhero/bootswatch.less @@ -339,23 +339,28 @@ div.subnav { border-color: transparent; } - li > a { + ul > li > a, + ul > li > span { border: none; color: @textColor; } - li.active > a, - li.active > a:hover { - background-color: @orange; - color: @white; + ul > li > a:hover { + background: lighten(@blue, 10%); } - li > a:hover { - background: lighten(@blue, 10%); + ul > .active > a, + ul > .active > a:hover, + ul > .active > span, + ul > .active > span:hover { + background-color: @orange; + color: @white; } - li.disabled > a, - li.disabled > a:hover { + ul > .disabled > a, + ul > .disabled > a:hover, + ul > .disabled > span, + ul > .disabled > span:hover { background: darken(@blue, 5%); } } |