From db764d326b939dc6f0266788a7d78ceb6c15fcbc Mon Sep 17 00:00:00 2001 From: Thomas Park Date: Mon, 8 Oct 2012 12:01:14 -0400 Subject: [PATCH] slate: fixes #35, thanks @Airborn --- slate/bootstrap.css | 86 ++++++++++++++++++++++++++--------------- slate/bootstrap.min.css | 16 ++++---- slate/bootswatch.less | 65 ++++++++++++++++++------------- 3 files changed, 100 insertions(+), 67 deletions(-) diff --git a/slate/bootstrap.css b/slate/bootstrap.css index 9ec7c1e..b9e8229 100644 --- a/slate/bootstrap.css +++ b/slate/bootstrap.css @@ -5142,17 +5142,7 @@ div.subnav.subnav-fixed { border: none; } .breadcrumb { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -.breadcrumb, -.pagination > ul a, -.pager a { border: 1px solid transparent; - -webkit-box-shadow: '0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)'; - -moz-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)'; 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); @@ -5161,40 +5151,45 @@ div.subnav.subnav-fixed { background-image: linear-gradient(#52575c, #3a3f44 70%, #3a3f44); background-repeat: no-repeat; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff52575c', endColorstr='#ff3a3f44', GradientType=0); + -webkit-box-shadow: '0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)'; + -moz-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)'; } -.breadcrumb li, -.breadcrumb a, -.pagination > ul a { +.breadcrumb a { color: #bbbfc2; font-weight: bold; - text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3); } -.breadcrumb a { - color: #ffffff; +.breadcrumb li { + color: #757c82; + font-weight: bold; + text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3); } -.pagination > ul { +.pagination ul { -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; } -.pagination li > a, -.pagination li.disabled > a { +.pagination ul > li > a { border-left: 1px solid #52575c; border-right: 1px solid #2e3134; border-top: none; border-bottom: none; -} -.pagination li.disabled > a { - background-color: #52575c; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#757c82), color-stop(70%, #52575c), to(#52575c)); - background-image: -webkit-linear-gradient(#757c82, #52575c 70%, #52575c); - background-image: -moz-linear-gradient(top, #757c82, #52575c 70%, #52575c); - background-image: -o-linear-gradient(#757c82, #52575c 70%, #52575c); - background-image: linear-gradient(#757c82, #52575c 70%, #52575c); + 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='#ff757c82', endColorstr='#ff52575c', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff52575c', endColorstr='#ff3a3f44', GradientType=0); + -webkit-box-shadow: '0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)'; + -moz-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)'; + color: #bbbfc2; + font-weight: bold; + text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3); } -.pagination > ul > li:not(.disabled) a:hover { +.pagination ul > li > a:hover { background-color: #3a3f44; background-repeat: repeat-x; background-image: -moz-linear-gradient(280deg, #272b30, #3a3f44); @@ -5203,8 +5198,8 @@ div.subnav.subnav-fixed { background-image: linear-gradient(280deg, #272b30, #3a3f44); border-left: 1px solid transparent; } -.pagination > ul > li.active > a, -.pagination > ul > li.active > a:hover { +.pagination ul > li.active > a, +.pagination ul > li.active > a:hover { color: #bbbfc2; background-color: #3a3f44; background-color: #43494f; @@ -5215,6 +5210,35 @@ div.subnav.subnav-fixed { background-image: linear-gradient(280deg, #30353b, #43494f); border-left: 1px solid transparent; } +.pagination ul > li.disabled > a, +.pagination ul > li.disabled > a:hover { + border-left: 1px solid #52575c; + border-right: 1px solid #2e3134; + border-top: none; + border-bottom: none; + background-color: #52575c; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#757c82), color-stop(70%, #52575c), to(#52575c)); + background-image: -webkit-linear-gradient(#757c82, #52575c 70%, #52575c); + background-image: -moz-linear-gradient(top, #757c82, #52575c 70%, #52575c); + background-image: -o-linear-gradient(#757c82, #52575c 70%, #52575c); + background-image: linear-gradient(#757c82, #52575c 70%, #52575c); + background-repeat: no-repeat; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff757c82', endColorstr='#ff52575c', GradientType=0); +} +.pager a { + border: 1px solid transparent; + -webkit-box-shadow: '0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)'; + -moz-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)'; + 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); +} .pager a:hover { background-color: #3a3f44; background-repeat: repeat-x; diff --git a/slate/bootstrap.min.css b/slate/bootstrap.min.css index 5b58943..1e8e22c 100644 --- a/slate/bootstrap.min.css +++ b/slate/bootstrap.min.css @@ -857,15 +857,13 @@ div.subnav.subnav-fixed{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow: .tabs-left .nav-tabs{border-right:none;} .tabs-right .nav-tabs{border-left:none;} .nav-tabs.nav-stacked>li>a,.nav-tabs.nav-stacked>li>a:hover{border:none;} -.breadcrumb{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.breadcrumb,.pagination>ul a,.pager a{border:1px solid transparent;-webkit-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';-moz-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)';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);} -.breadcrumb li,.breadcrumb a,.pagination>ul a{color:#bbbfc2;font-weight:bold;text-shadow:1px 1px 1px rgba(0, 0, 0, 0.3);} -.breadcrumb a{color:#ffffff;} -.pagination >ul{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.pagination li>a,.pagination li.disabled>a{border-left:1px solid #52575c;border-right:1px solid #2e3134;border-top:none;border-bottom:none;} -.pagination li.disabled>a{background-color:#52575c;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#757c82), color-stop(70%, #52575c), to(#52575c));background-image:-webkit-linear-gradient(#757c82, #52575c 70%, #52575c);background-image:-moz-linear-gradient(top, #757c82, #52575c 70%, #52575c);background-image:-o-linear-gradient(#757c82, #52575c 70%, #52575c);background-image:linear-gradient(#757c82, #52575c 70%, #52575c);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff757c82', endColorstr='#ff52575c', GradientType=0);} -.pagination >ul>li:not(.disabled) a:hover{background-color:#3a3f44;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #272b30, #3a3f44);background-image:-webkit-linear-gradient(280deg, #272b30, #3a3f44);background-image:-o-linear-gradient(280deg, #272b30, #3a3f44);background-image:linear-gradient(280deg, #272b30, #3a3f44);border-left:1px solid transparent;} -.pagination >ul>li.active>a,.pagination >ul>li.active>a:hover{color:#bbbfc2;background-color:#3a3f44;background-color:#43494f;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #30353b, #43494f);background-image:-webkit-linear-gradient(280deg, #30353b, #43494f);background-image:-o-linear-gradient(280deg, #30353b, #43494f);background-image:linear-gradient(280deg, #30353b, #43494f);border-left:1px solid transparent;} +.breadcrumb{border:1px solid 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);-webkit-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';-moz-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)';}.breadcrumb a{color:#bbbfc2;font-weight:bold;} +.breadcrumb li{color:#757c82;font-weight:bold;text-shadow:1px 1px 1px rgba(0, 0, 0, 0.3);} +.pagination ul{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.pagination ul>li>a{border-left:1px solid #52575c;border-right:1px solid #2e3134;border-top:none;border-bottom:none;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);-webkit-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';-moz-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)';color:#bbbfc2;font-weight:bold;text-shadow:1px 1px 1px rgba(0, 0, 0, 0.3);}.pagination ul>li>a:hover{background-color:#3a3f44;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #272b30, #3a3f44);background-image:-webkit-linear-gradient(280deg, #272b30, #3a3f44);background-image:-o-linear-gradient(280deg, #272b30, #3a3f44);background-image:linear-gradient(280deg, #272b30, #3a3f44);border-left:1px solid transparent;} +.pagination ul>li.active>a,.pagination ul>li.active>a:hover{color:#bbbfc2;background-color:#3a3f44;background-color:#43494f;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #30353b, #43494f);background-image:-webkit-linear-gradient(280deg, #30353b, #43494f);background-image:-o-linear-gradient(280deg, #30353b, #43494f);background-image:linear-gradient(280deg, #30353b, #43494f);border-left:1px solid transparent;} +.pagination ul>li.disabled>a,.pagination ul>li.disabled>a:hover{border-left:1px solid #52575c;border-right:1px solid #2e3134;border-top:none;border-bottom:none;background-color:#52575c;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#757c82), color-stop(70%, #52575c), to(#52575c));background-image:-webkit-linear-gradient(#757c82, #52575c 70%, #52575c);background-image:-moz-linear-gradient(top, #757c82, #52575c 70%, #52575c);background-image:-o-linear-gradient(#757c82, #52575c 70%, #52575c);background-image:linear-gradient(#757c82, #52575c 70%, #52575c);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff757c82', endColorstr='#ff52575c', GradientType=0);} +.pager a{border:1px solid transparent;-webkit-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';-moz-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)';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);} .pager a:hover{background-color:#3a3f44;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #272b30, #3a3f44);background-image:-webkit-linear-gradient(280deg, #272b30, #3a3f44);background-image:-o-linear-gradient(280deg, #272b30, #3a3f44);background-image:linear-gradient(280deg, #272b30, #3a3f44);border:1px solid transparent;} .pager .disabled a,.pager .disabled a:hover{background-color:transparent;} .btn{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#484d51;background-image:-moz-linear-gradient(top, #52575c, #3a3e41);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#52575c), to(#3a3e41));background-image:-webkit-linear-gradient(top, #52575c, #3a3e41);background-image:-o-linear-gradient(top, #52575c, #3a3e41);background-image:linear-gradient(to bottom, #52575c, #3a3e41);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff52575c', endColorstr='#ff3a3e41', GradientType=0);border-color:#3a3e41 #3a3e41 #161719;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#3a3e41;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;border:1px solid #272b30;}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#ffffff;background-color:#3a3e41;*background-color:#2e3134;} diff --git a/slate/bootswatch.less b/slate/bootswatch.less index 64f8f92..0d8f565 100755 --- a/slate/bootswatch.less +++ b/slate/bootswatch.less @@ -261,60 +261,71 @@ div.subnav { } .breadcrumb { - .box-shadow(none); -} - -.breadcrumb, .pagination > ul a, .pager a { 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)'); #gradient > .vertical-three-colors(@gray, @grayDark, 70%, @grayDark); -} + .box-shadow('0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)'); -.breadcrumb li, .breadcrumb a, .pagination > ul a { - color: @grayLighter; - font-weight: bold; - text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3); -} + a { + color: @grayLighter; + font-weight: bold; + } -.breadcrumb a { - color: @white; + li { + color: @grayLight; + font-weight: bold; + text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3); + } } .pagination { - & > ul { + ul { .box-shadow(none); } - & li > a, - & li.disabled > a { + ul > li > a { border-left: 1px solid @gray; border-right: 1px solid darken(@gray, 15%); border-top: none; border-bottom: none; - } - - li.disabled > a { - #gradient > .vertical-three-colors(@grayLight, @gray, 70%, @gray); - } + #gradient > .vertical-three-colors(@gray, @grayDark, 70%, @grayDark); + .box-shadow('0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)'); + color: @grayLighter; + font-weight: bold; + text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3); - & > ul > li:not(.disabled) a:hover, - { - #gradient > .directional(@grayDarker, @grayDark, 280deg); - border-left: 1px solid transparent; + &:hover { + #gradient > .directional(@grayDarker, @grayDark, 280deg); + border-left: 1px solid transparent; + } } - & > ul > li.active > a, - & > ul > li.active > a:hover { + ul > li.active > a, + ul > li.active > a:hover { color: @grayLighter; background-color: @grayDark; #gradient > .directional(lighten(@grayDarker, 4%), lighten(@grayDark, 4%), 280deg); border-left: 1px solid transparent; } + + ul > li.disabled > a, + ul > li.disabled > a:hover { + border-left: 1px solid @gray; + border-right: 1px solid darken(@gray, 15%); + border-top: none; + border-bottom: none; + #gradient > .vertical-three-colors(@grayLight, @gray, 70%, @gray); + } } .pager { + a { + 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)'); + #gradient > .vertical-three-colors(@gray, @grayDark, 70%, @grayDark); + } + a:hover { #gradient > .directional(@grayDarker, @grayDark, 280deg); border: 1px solid transparent; -- 2.39.2