Adding $base-button-gradient and nixing unused images.

benji87 · Jan 16, 2012 · db3e635 · db3e635
1 parent afa4097
commit db3e635
Show file tree

Hide file tree

Showing 37 changed files with 148 additions and 141 deletions.
diff --git a/themes/css/apple.css b/themes/css/apple.css
diff --git a/themes/css/jqtouch.css b/themes/css/jqtouch.css
diff --git a/themes/img/apple/activeButton.png b/themes/img/apple/activeButton.png
diff --git a/themes/img/apple/backButton.png b/themes/img/apple/backButton.png
diff --git a/themes/img/apple/cancel.png b/themes/img/apple/cancel.png
diff --git a/themes/img/apple/chevron.png b/themes/img/apple/chevron.png
diff --git a/themes/img/apple/grayButton.png b/themes/img/apple/grayButton.png
diff --git a/themes/img/apple/greenButton.png b/themes/img/apple/greenButton.png
diff --git a/themes/img/apple/listArrowSel.png b/themes/img/apple/listArrowSel.png
diff --git a/themes/img/apple/listGroup.png b/themes/img/apple/listGroup.png
diff --git a/themes/img/apple/pinstripes.png b/themes/img/apple/pinstripes.png
diff --git a/themes/img/apple/redButton.png b/themes/img/apple/redButton.png
diff --git a/themes/img/apple/selection.png b/themes/img/apple/selection.png
diff --git a/themes/img/apple/thumb.png b/themes/img/apple/thumb.png
diff --git a/themes/img/apple/toggle.png b/themes/img/apple/toggle.png
diff --git a/themes/img/apple/toggleOn.png b/themes/img/apple/toggleOn.png
diff --git a/themes/img/apple/toolButton.png b/themes/img/apple/toolButton.png
diff --git a/themes/img/apple/toolbar.png b/themes/img/apple/toolbar.png
diff --git a/themes/img/apple/whiteButton.png b/themes/img/apple/whiteButton.png
diff --git a/themes/img/jqt/activeButton.png b/themes/img/jqt/activeButton.png
diff --git a/themes/img/jqt/back_button.png b/themes/img/jqt/back_button.png
diff --git a/themes/img/jqt/back_button_clicked.png b/themes/img/jqt/back_button_clicked.png
diff --git a/themes/img/jqt/blueButton.png b/themes/img/jqt/blueButton.png
diff --git a/themes/img/jqt/button.png b/themes/img/jqt/button.png
diff --git a/themes/img/jqt/button_clicked.png b/themes/img/jqt/button_clicked.png
diff --git a/themes/img/jqt/chevron.png b/themes/img/jqt/chevron.png
diff --git a/themes/img/jqt/chevron_circle.png b/themes/img/jqt/chevron_circle.png
diff --git a/themes/img/jqt/grayButton.png b/themes/img/jqt/grayButton.png
diff --git a/themes/img/jqt/greenButton.png b/themes/img/jqt/greenButton.png
diff --git a/themes/img/jqt/redButton.png b/themes/img/jqt/redButton.png
diff --git a/themes/img/jqt/rowhead.png b/themes/img/jqt/rowhead.png
diff --git a/themes/img/jqt/toggle.png b/themes/img/jqt/toggle.png
diff --git a/themes/img/jqt/toggleOn.png b/themes/img/jqt/toggleOn.png
diff --git a/themes/img/jqt/toolbar.png b/themes/img/jqt/toolbar.png
diff --git a/themes/img/jqt/whiteButton.png b/themes/img/jqt/whiteButton.png
diff --git a/themes/scss/include/_core.scss b/themes/scss/include/_core.scss
@@ -19,6 +19,8 @@ $toolbar-button-color: darken($toolbar-background-color, 15%) !default;
 $toolbar-button-active-color: darken($toolbar-button-color, 5%) !default;
 $base-font-family: "Helvetica Neue", Helvetica;
 
+$base-button-gradient: glossy !default;
+
 // Optimization variables
 $include-metal-lists: true !default;
 $include-plastic-lists: true !default;

diff --git a/themes/scss/include/_skeleton.scss b/themes/scss/include/_skeleton.scss
@@ -102,11 +102,11 @@ body {
         border: 1px solid darken($toolbar-button-color, 20);
         @include border-radius(5px);
 
-        @include background-gradient($toolbar-button-color, glossy);
+        @include background-gradient($toolbar-button-color, $base-button-gradient);
 
         &.active {
             border-color: darken($toolbar-button-active-color, 20);
-            @include background-gradient($toolbar-button-active-color, glossy);
+            @include background-gradient($toolbar-button-active-color, $base-button-gradient);
             @include color-by-background($toolbar-button-active-color);
         }
     }
@@ -130,9 +130,8 @@ body {
             // combining the mask and rotate properties.
             @include transform(rotate(45deg) translate3d(.2px,0,0)); // Just be glad you didn't have to find it.
             @include transform-origin(0,0);
-            @include background-image(
-                glossy-gradient($toolbar-button-color, top left)
-            );
+            @include background-gradient($toolbar-button-color, $base-button-gradient, top left);
+
             background-size: 100% 98%;
             @include border-radius(0 0 0 2px);
 
@@ -156,9 +155,7 @@ body {
         }
         &.active {
             &:after {
-                @include background-image(
-                    glossy-gradient($toolbar-button-active-color, left top)
-                );
+                @include background-gradient($toolbar-button-active-color, $base-button-gradient, left top);
             }
             &:before {
                 background-color: darken($toolbar-button-active-color, 20);
@@ -167,7 +164,7 @@ body {
     }
 
     .blueButton {
-        @include background-image(#2F7CE3, glossy);
+        @include background-image(#2F7CE3, $base-button-gradient);
         @include color-by-background(#2F7CE3);
     }
     .whiteButton, .grayButton, .redButton, .blueButton, .greenButton {
@@ -187,32 +184,32 @@ body {
 
         &.active, &:active {
             $active-color: darken($highlight-color, 10);
-            @include background-gradient($active-color, glossy);
+            @include background-gradient($active-color, $base-button-gradient);
             @include color-by-background($active-color);
         }
     }
     .whiteButton {
-        @include background-gradient(#eee, glossy);
+        @include background-gradient(#eee, $base-button-gradient);
         @include color-by-background(#eee);
     }
     .grayButton {
-        @include background-gradient(#444, glossy);
+        @include background-gradient(#444, $base-button-gradient);
         @include color-by-background(#444);
     }
 
     .redButton {
-        @include background-gradient(#D83B38, glossy);
+        @include background-gradient(#D83B38, $base-button-gradient);
         @include color-by-background(#D83B38);
 
         &.active, &:active {
             $active-color: darken(#D83B38, 8);
-            @include background-gradient($active-color, glossy);
+            @include background-gradient($active-color, $base-button-gradient);
             @include color-by-background($active-color);
         }
     }
 
     .greenButton {
-        @include background-gradient($highlight-color, glossy);        
+        @include background-gradient($highlight-color, $base-button-gradient);        
         @include color-by-background($highlight-color);
     }
 
@@ -386,7 +383,7 @@ body {
                     right: 6px;
                     margin-top: -$chevron-size/2;
                     @include circle($chevron-size);
-                    @include background-gradient($highlight-color, glossy);
+                    @include background-gradient($highlight-color, $base-button-gradient);
                     border: 2px solid #fff;
                     @include box-shadow(0 1px 2px rgba(#000, .3));
                     -webkit-box-sizing: border-box;