From 799fd6add0d82c203be5484ea92d139f9c2ea35e Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 2 Jul 2011 11:51:05 -0700 Subject: get rid of assets/img in favor of css arrows --- .DS_Store | Bin 6148 -> 6148 bytes assets/img/dropdown-arrow.gif | Bin 49 -> 0 bytes assets/img/grid-20px.png | Bin 324 -> 0 bytes assets/img/tablesorter-indicators.png | Bin 451 -> 0 bytes bootstrap-1.0.0.css | 66 +++++++++++++++++++++++++--------- bootstrap-1.0.0.min.css | 12 +++---- lib/patterns.less | 8 +++-- lib/tables.less | 44 +++++++++++++++++------ 8 files changed, 93 insertions(+), 37 deletions(-) delete mode 100644 assets/img/dropdown-arrow.gif delete mode 100644 assets/img/grid-20px.png delete mode 100644 assets/img/tablesorter-indicators.png diff --git a/.DS_Store b/.DS_Store index d44b41a70f..4372a5b717 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/assets/img/dropdown-arrow.gif b/assets/img/dropdown-arrow.gif deleted file mode 100644 index 2da9c1d54e..0000000000 Binary files a/assets/img/dropdown-arrow.gif and /dev/null differ diff --git a/assets/img/grid-20px.png b/assets/img/grid-20px.png deleted file mode 100644 index 91b8bf38d5..0000000000 Binary files a/assets/img/grid-20px.png and /dev/null differ diff --git a/assets/img/tablesorter-indicators.png b/assets/img/tablesorter-indicators.png deleted file mode 100644 index af3c40522f..0000000000 Binary files a/assets/img/tablesorter-indicators.png and /dev/null differ diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index d5a118fe2d..6500280b62 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sat Jul 2 10:47:32 PDT 2011 + * Date: Sat Jul 2 11:50:18 PDT 2011 */ /* * Reset.less @@ -1013,31 +1013,61 @@ table.zebra-striped tbody tr:hover td { } table.zebra-striped th.header { cursor: pointer; - padding-right: 20px; +} +table.zebra-striped th.header:after { + width: 0px; + height: 0px; + display: inline-block; + float: right; + margin-top: 7px; + content: "↓"; + text-indent: -99999px; + vertical-align: top; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-bottom: 4px solid #000; + visibility: hidden; + -webkit-box-shadow: 0 1px 0 #ffffff; + -moz-box-shadow: 0 1px 0 #ffffff; + box-shadow: 0 1px 0 #ffffff; + filter: alpha(opacity=30); + -khtml-opacity: 0.3; + -moz-opacity: 0.3; + opacity: 0.3; } table.zebra-striped th.headerSortUp, table.zebra-striped th.headerSortDown { - background-image: url(assets/img/tablesorter-indicators.png); - background-position: right -23px; - background-repeat: no-repeat; background-color: rgba(141, 192, 219, 0.25); text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); -webkit-border-radius: 3px 3px 0 0; -moz-border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0; } -table.zebra-striped th.header:hover { - background-image: url(assets/img/tablesorter-indicators.png); - background-position: right 15px; - background-repeat: no-repeat; +table.zebra-striped th.header:hover:after { + visibility: visible; } table.zebra-striped th.actions:hover { background-image: none; } -table.zebra-striped th.headerSortDown, table.zebra-striped th.headerSortDown:hover { - background-position: right -25px; -} -table.zebra-striped th.headerSortUp, table.zebra-striped th.headerSortUp:hover { - background-position: right -65px; +table.zebra-striped th.headerSortDown:after, table.zebra-striped th.headerSortDown:hover:after { + visibility: visible; + filter: alpha(opacity=60); + -khtml-opacity: 0.6; + -moz-opacity: 0.6; + opacity: 0.6; +} +table.zebra-striped th.headerSortUp:after { + border-bottom: none; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid #000; + visibility: visible; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + filter: alpha(opacity=60); + -khtml-opacity: 0.6; + -moz-opacity: 0.6; + opacity: 0.6; } table.zebra-striped th.blue { color: #049cdb; @@ -1225,15 +1255,17 @@ div.topbar ul li.menu { position: relative; } div.topbar ul li.menu a.menu:after { - width: 7px; - height: 7px; + width: 0px; + height: 0px; display: inline-block; - background: transparent url(assets/img/dropdown-arrow.gif) no-repeat top center; content: "↓"; text-indent: -99999px; vertical-align: top; margin-top: 8px; margin-left: 4px; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid #fff; filter: alpha(opacity=50); -khtml-opacity: 0.5; -moz-opacity: 0.5; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 16075968fe..fbc24a8e00 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -131,12 +131,12 @@ table{width:100%;margin-bottom:18px;padding:0;text-align:left;border-collapse:se table th{padding-top:9px;font-weight:bold;border-bottom-width:2px;} table.zebra-striped tbody tr:nth-child(odd) td{background-color:#f9f9f9;} table.zebra-striped tbody tr:hover td{background-color:#f5f5f5;} -table.zebra-striped th.header{cursor:pointer;padding-right:20px;} -table.zebra-striped th.headerSortUp,table.zebra-striped th.headerSortDown{background-image:url(assets/img/tablesorter-indicators.png);background-position:right -23px;background-repeat:no-repeat;background-color:rgba(141, 192, 219, 0.25);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;} -table.zebra-striped th.header:hover{background-image:url(assets/img/tablesorter-indicators.png);background-position:right 15px;background-repeat:no-repeat;} +table.zebra-striped th.header{cursor:pointer;}table.zebra-striped th.header:after{width:0px;height:0px;display:inline-block;float:right;margin-top:7px;content:"↓";text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-bottom:4px solid #000;visibility:hidden;-webkit-box-shadow:0 1px 0 #ffffff;-moz-box-shadow:0 1px 0 #ffffff;box-shadow:0 1px 0 #ffffff;filter:alpha(opacity=30);-khtml-opacity:0.3;-moz-opacity:0.3;opacity:0.3;} +table.zebra-striped th.headerSortUp,table.zebra-striped th.headerSortDown{background-color:rgba(141, 192, 219, 0.25);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;} +table.zebra-striped th.header:hover:after{visibility:visible;} table.zebra-striped th.actions:hover{background-image:none;} -table.zebra-striped th.headerSortDown,table.zebra-striped th.headerSortDown:hover{background-position:right -25px;} -table.zebra-striped th.headerSortUp,table.zebra-striped th.headerSortUp:hover{background-position:right -65px;} +table.zebra-striped th.headerSortDown:after,table.zebra-striped th.headerSortDown:hover:after{visibility:visible;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;} +table.zebra-striped th.headerSortUp:after{border-bottom:none;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000;visibility:visible;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;} table.zebra-striped th.blue{color:#049cdb;border-bottom-color:#049cdb;} table.zebra-striped th.headerSortUp.blue,table.zebra-striped th.headerSortDown.blue{background-color:#ade6fe;} table.zebra-striped th.green{color:#46a546;border-bottom-color:#46a546;} @@ -161,7 +161,7 @@ div.topbar ul li{display:block;float:left;font-size:13px;}div.topbar ul li a{dis div.topbar ul li.active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);} div.topbar ul.primary-nav li ul{left:0;} div.topbar ul.secondary-nav li ul{right:0;} -div.topbar ul li.menu{position:relative;}div.topbar ul li.menu a.menu:after{width:7px;height:7px;display:inline-block;background:transparent url(assets/img/dropdown-arrow.gif) no-repeat top center;content:"↓";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;} +div.topbar ul li.menu{position:relative;}div.topbar ul li.menu a.menu:after{width:0px;height:0px;display:inline-block;content:"↓";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #fff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;} div.topbar ul li.menu.open a.menu,div.topbar ul li.menu.open a:hover{background-color:#00b4eb;background-color:rgba(255, 255, 255, 0.1);color:#fff;} div.topbar ul li.menu.open ul{display:block;}div.topbar ul li.menu.open ul li a{background-color:transparent;font-weight:normal;}div.topbar ul li.menu.open ul li a:hover{background-color:rgba(255, 255, 255, 0.1);color:#fff;} div.topbar ul li.menu.open ul li.active a{background-color:rgba(255, 255, 255, 0.1);font-weight:bold;} diff --git a/lib/patterns.less b/lib/patterns.less index 3ce02ea10d..a3a949244d 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -131,15 +131,17 @@ div.topbar { position: relative; a.menu { &:after { - width: 7px; - height: 7px; + width: 0px; + height: 0px; display: inline-block; - background: transparent url(assets/img/dropdown-arrow.gif) no-repeat top center; content: "↓"; text-indent: -99999px; vertical-align: top; margin-top: 8px; margin-left: 4px; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid #fff; .opacity(50); } } diff --git a/lib/tables.less b/lib/tables.less index 5cde1b5cee..7c315ff35e 100644 --- a/lib/tables.less +++ b/lib/tables.less @@ -44,32 +44,54 @@ table.zebra-striped { // Tablesorting styles w/ jQuery plugin th.header { // For tablesorter tables, make THs have a pointer on hover cursor: pointer; - padding-right: 20px; + &:after { + width: 0px; + height: 0px; + display: inline-block; + float: right; + margin-top:7px; + content: "↓"; + text-indent: -99999px; + vertical-align: top; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-bottom: 4px solid #000; + visibility:hidden; + .box-shadow(0 1px 0 #fff); + .opacity(30); + } } th.headerSortUp, th.headerSortDown { // Style the sorted column headers (THs) - background-image: url(assets/img/tablesorter-indicators.png); - background-position: right -23px; - background-repeat: no-repeat; background-color: rgba(141,192,219,.25); text-shadow: 0 1px 1px rgba(255,255,255,.75); .border-radius(3px 3px 0 0); } th.header:hover { // Style the ascending (reverse alphabetical) column header - background-image: url(assets/img/tablesorter-indicators.png); - background-position: right 15px; - background-repeat: no-repeat; + &:after { + visibility:visible; + } } th.actions:hover { background-image: none; } th.headerSortDown, th.headerSortDown:hover { // Style the descending (alphabetical) column header - background-position: right -25px; + &:after { + visibility:visible; + .opacity(60); + } } - th.headerSortUp, - th.headerSortUp:hover { // Style the ascending (reverse alphabetical) column header - background-position: right -65px; + th.headerSortUp { // Style the ascending (reverse alphabetical) column header + &:after { + border-bottom: none; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid #000; + visibility:visible; + .box-shadow(none); //can't add boxshadow to downward facing arrow :( + .opacity(60); + } } // Blue Table Headings th.blue { -- cgit v1.2.3