From 41983bbe675d1aa293f72dc3d3297f03f100fbaa Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 22 Sep 2011 12:54:57 -0700 Subject: [PATCH] update table to support header and arrows --- bootstrap.css | 14 +++++++------- bootstrap.min.css | 10 +++++----- lib/tables.less | 5 ++--- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 69c53f484d..f1a5cc7d36 100644 --- a/bootstrap.css +++ b/bootstrap.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: Sun Sep 18 14:19:52 PDT 2011 + * Date: Thu Sep 22 12:52:42 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1140,10 +1140,10 @@ table tbody tr:last-child td:last-child { .zebra-striped tbody tr:hover td { background-color: #f5f5f5; } -.zebra-striped .header { +table .header { cursor: pointer; } -.zebra-striped .header:after { +table .header:after { content: ""; float: right; margin-top: 7px; @@ -1152,21 +1152,21 @@ table tbody tr:last-child td:last-child { border-color: #000 transparent; visibility: hidden; } -.zebra-striped .headerSortUp, .zebra-striped .headerSortDown { +table .headerSortUp, table .headerSortDown { background-color: rgba(141, 192, 219, 0.25); text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); } -.zebra-striped .header:hover:after { +table .header:hover:after { visibility: visible; } -.zebra-striped .headerSortDown:after, .zebra-striped .headerSortDown:hover:after { +table .headerSortDown:after, table .headerSortDown:hover:after { visibility: visible; filter: alpha(opacity=60); -khtml-opacity: 0.6; -moz-opacity: 0.6; opacity: 0.6; } -.zebra-striped .headerSortUp:after { +table .headerSortUp:after { border-bottom: none; border-left: 4px solid transparent; border-right: 4px solid transparent; diff --git a/bootstrap.min.css b/bootstrap.min.css index aabdf2428b..b555c6553c 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -191,11 +191,11 @@ table tbody tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-bo table tbody tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .zebra-striped tbody tr:nth-child(odd) td{background-color:#f9f9f9;} .zebra-striped tbody tr:hover td{background-color:#f5f5f5;} -.zebra-striped .header{cursor:pointer;}.zebra-striped .header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000 transparent;visibility:hidden;} -.zebra-striped .headerSortUp,.zebra-striped .headerSortDown{background-color:rgba(141, 192, 219, 0.25);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);} -.zebra-striped .header:hover:after{visibility:visible;} -.zebra-striped .headerSortDown:after,.zebra-striped .headerSortDown:hover:after{visibility:visible;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;} -.zebra-striped .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 .header{cursor:pointer;}table .header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000 transparent;visibility:hidden;} +table .headerSortUp,table .headerSortDown{background-color:rgba(141, 192, 219, 0.25);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);} +table .header:hover:after{visibility:visible;} +table .headerSortDown:after,table .headerSortDown:hover:after{visibility:visible;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;} +table .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 .blue{color:#049cdb;border-bottom-color:#049cdb;} table .headerSortUp.blue,table .headerSortDown.blue{background-color:#ade6fe;} table .green{color:#46a546;border-bottom-color:#46a546;} diff --git a/lib/tables.less b/lib/tables.less index 988483f0ef..dcc72d3ea7 100644 --- a/lib/tables.less +++ b/lib/tables.less @@ -65,7 +65,9 @@ table { background-color: #f5f5f5; } } +} +table { // Tablesorting styles w/ jQuery plugin .header { cursor: pointer; @@ -111,9 +113,6 @@ table { .opacity(60); } } -} - -table { // Blue Table Headings .blue { color: @blue;