Merge branch 'master' of http://git.local.twitter.com/bootstrap

3 files changed, 43 insertions, 19 deletions

diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index 834d95080..ead0c8f83 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -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: {{ date }}
+ * Date: @DATE
  */
 
 // CSS Reset
diff --git a/lib/patterns.less b/lib/patterns.less
index b264cb3c7..db3080228 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -50,8 +50,8 @@ div.topbar {
   form {
     float: left;
     margin: 5px 0 0 0;
-    opacity: 1;
     position: relative;
+    .opacity(100);
     input {
       background-color: @grayLight;
       background-color: rgba(255,255,255,.3);
@@ -131,16 +131,18 @@ 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;
-          opacity: .5;
+          border-left: 4px solid transparent;
+          border-right: 4px solid transparent;
+          border-top: 4px solid #fff;
+          .opacity(50);
         }
       }
       &.open {
@@ -276,15 +278,15 @@ div.alert-message {
   a.close {
     float: right;
     margin-top: -2px;
-    opacity: .5;
     color: #fff;
     font-size: 20px;
     font-weight: bold;
     text-shadow: 0 1px 0 rgba(0,0,0,.5);
+    .opacity(50);
     .border-radius(3px);
     &:hover {
-      opacity: 1;
       text-decoration: none;
+      .opacity(50);
     }
   }
 }
diff --git a/lib/tables.less b/lib/tables.less
index 5cde1b5ce..7c315ff35 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 {