diff options
| author | Thomas Park <thomas@thomaspark.me> | 2012-10-24 10:14:32 -0400 |
|---|---|---|
| committer | Thomas Park <thomas@thomaspark.me> | 2012-10-24 10:14:32 -0400 |
| commit | 127e1f57e4799c52613d7c30d3d79467aa59ba32 (patch) | |
| tree | d20276a6e8128406cc56daa3fc7b5b9bb9cd5770 /simplex | |
| parent | 5ed00c920330ea41f8c79bd2c7461d1f7890eafd (diff) | |
all: fixes pagination issues, closes #37
Diffstat (limited to 'simplex')
| -rw-r--r-- | simplex/bootstrap.css | 26 | ||||
| -rw-r--r-- | simplex/bootstrap.min.css | 8 | ||||
| -rwxr-xr-x | simplex/bootswatch.less | 25 |
3 files changed, 45 insertions, 14 deletions
diff --git a/simplex/bootstrap.css b/simplex/bootstrap.css index b833e56a..522d9e78 100644 --- a/simplex/bootstrap.css +++ b/simplex/bootstrap.css @@ -5102,33 +5102,47 @@ div.subnav .nav > li.active > a:hover { color: #d9230f; } .breadcrumb { + background-color: #ffffff; + border: 0px solid transparent; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1); - border: 0px solid transparent; } .breadcrumb li { - padding-top: 5px; + padding-top: 2px; text-shadow: none; } +.breadcrumb .active { + color: #555555; +} .breadcrumb a { text-shadow: none; } .breadcrumb a:hover { text-decoration: none; } -.pagination li > a { - padding: 4px 14px 0; +.pagination ul > li > a, +.pagination ul > li > span { + padding: 2px 14px 0; color: #555555; } -.pagination li > a:hover { +.pagination ul > li > a:hover, +.pagination ul > li > span:hover { background-color: #fbebe9; color: #d9230f; } -.pagination li.active > a { +.pagination ul > .active > a, +.pagination ul > .active > span { background-color: #fbebe9; color: #d9230f; } +.pagination ul > .disabled > a, +.pagination ul > .disabled > a:hover, +.pagination ul > .disabled > span, +.pagination ul > .disabled > span:hover { + background-color: transparent; + color: #555555; +} .btn { padding-top: .6em; font-family: "Josefin Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; diff --git a/simplex/bootstrap.min.css b/simplex/bootstrap.min.css index 7a016f78..a1164823 100644 --- a/simplex/bootstrap.min.css +++ b/simplex/bootstrap.min.css @@ -856,11 +856,13 @@ div.subnav .nav>li.active>a,div.subnav .nav>li.active>a:hover{border-left-color: .nav-pills .dropdown.open .dropdown-toggle,.nav-pills .dropdown.open:hover .dropdown-toggle{background-color:#fbebe9;color:#d9230f;}.nav-pills .dropdown.open .dropdown-toggle .caret,.nav-pills .dropdown.open:hover .dropdown-toggle .caret{border-top-color:#d9230f;border-bottom-color:#d9230f;} .nav-list li>a{color:#555555;}.nav-list li>a:hover{background-color:#fbebe9;color:#d9230f;} .nav-list li.active>a,.nav-list li.active>a:hover{background-color:#fbebe9;color:#d9230f;} -.breadcrumb{-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);border:0px solid transparent;}.breadcrumb li{padding-top:5px;text-shadow:none;} +.breadcrumb{background-color:#ffffff;border:0px solid transparent;-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);}.breadcrumb li{padding-top:2px;text-shadow:none;} +.breadcrumb .active{color:#555555;} .breadcrumb a{text-shadow:none;} .breadcrumb a:hover{text-decoration:none;} -.pagination li>a{padding:4px 14px 0;color:#555555;}.pagination li>a:hover{background-color:#fbebe9;color:#d9230f;} -.pagination li.active>a{background-color:#fbebe9;color:#d9230f;} +.pagination ul>li>a,.pagination ul>li>span{padding:2px 14px 0;color:#555555;}.pagination ul>li>a:hover,.pagination ul>li>span:hover{background-color:#fbebe9;color:#d9230f;} +.pagination ul>.active>a,.pagination ul>.active>span{background-color:#fbebe9;color:#d9230f;} +.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover,.pagination ul>.disabled>span,.pagination ul>.disabled>span:hover{background-color:transparent;color:#555555;} .btn{padding-top:.6em;font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:bold;} legend{border-bottom:1px solid #ddd;font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;} .navbar-search .search-query{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-color:#f7f7f7;color:#555555;} diff --git a/simplex/bootswatch.less b/simplex/bootswatch.less index 816829b5..59868f9e 100755 --- a/simplex/bootswatch.less +++ b/simplex/bootswatch.less @@ -306,14 +306,19 @@ div.subnav { } .breadcrumb { - .box-shadow(@boxShadow~", "-1px -1px 0 rgba(0, 0, 0, 0.1)); + background-color: @white; border: 0px solid transparent; + .box-shadow(@boxShadow~", "-1px -1px 0 rgba(0, 0, 0, 0.1)); li { - padding-top: 5px; + padding-top: 2px; text-shadow: none; } + .active { + color: @textColor; + } + a { text-shadow: none; } @@ -325,8 +330,9 @@ div.subnav { .pagination { - li > a { - padding: 4px 14px 0; + ul > li > a, + ul > li > span { + padding: 2px 14px 0; color: @textColor; &:hover { @@ -335,10 +341,19 @@ div.subnav { } } - li.active > a { + ul > .active > a, + ul > .active > span { background-color: @dropdownLinkBackgroundHover; color: @linkColor; } + + ul > .disabled > a, + ul > .disabled > a:hover, + ul > .disabled > span, + ul > .disabled > span:hover { + background-color: transparent; + color: @textColor; + } } |