Merge branch 'master' into open639

platform/commonUI/themes/espresso/res/config.rb

@@ -1,26 +0,0 @@
-# Require any additional compass plugins here.
-# require "compass-growl"
-
-# Set this to the root of your project when deployed:
-http_path = "/"
-css_dir = "css"
-sass_dir = "sass"
-images_dir = "images"
-javascripts_dir = "js"
-
-# You can select your preferred output style here (can be overridden via the command line):
-# :expanded, :compressed, :nested
-output_style = :nested
-
-# To enable relative paths to assets via compass helper functions. Uncomment:
-relative_assets = true
-
-# To disable debugging comments that display the original location of your selectors. Uncomment:
-# line_comments = false
-
-
-# If you prefer the indented syntax, you might want to regenerate this
-# project again passing --syntax sass, or you can uncomment this:
-# preferred_syntax = :sass
-# and then run:
-# sass-convert -R --from scss --to sass vfn_platform/static/sass scss && rm -rf sass && mv scss sass

platform/commonUI/themes/espresso/res/sass/_constants.scss

@@ -12,12 +12,14 @@ $colorInteriorBorder: rgba($colorBodyFg, 0.1);
 $colorA: #ccc;
 $colorAHov: #fff;
 $contrastRatioPercent: 7%;
+$hoverRatioPercent: 10%;
 $basicCr: 3px;
 $controlCr: 3px;
 $smallCr: 2px;
 
 // Buttons and Controls
-$colorBtnBg: pullForward($colorBodyBg, $contrastRatioPercent); //
+$colorBtnBg: pullForward($colorBodyBg, $contrastRatioPercent);
+$colorBtnBgHov: pullForward($colorBtnBg, $hoverRatioPercent);
 $colorBtnFg: $colorBodyFg;
 $colorBtnMajorBg: $colorKey;
 $colorBtnMajorFg: $colorKeyFg;
@@ -54,7 +56,7 @@ $colorTick: rgba(white, 0.2);
 $colorMenuBg: pullForward($colorBodyBg, 23%);
 $colorMenuFg: pullForward($colorMenuBg, 70%);
 $colorMenuIc: pullForward($colorKey, 17%);
-$colorMenuHovBg: pullForward($colorMenuBg, 10%);
+$colorMenuHovBg: pullForward($colorMenuBg, $hoverRatioPercent);
 $colorMenuHovFg: #fff;
 $colorMenuHovIc: $colorMenuHovFg;
 $shdwMenu: none;
@@ -89,6 +91,8 @@ $colorStatusDefault: #ccc;
 $colorStatusInfo: #62ba72;
 $colorStatusAlert: #ffa66d;
 $colorStatusError: #d4585c;
+$colorStatusAvailable: $colorKey;
+$colorStatusBtnBg: $colorBtnBg;
 $colorProgressBarOuter: rgba(#000, 0.1);
 $colorProgressBarAmt: $colorKey;
 $progressBarHOverlay: 15px;
@@ -123,7 +127,7 @@ $colorOvrBtnFg: #fff;
 
 // Items
 $colorItemBg: lighten($colorBodyBg, 5%);
-$colorItemBgHov: pullForward($colorItemBg, 15%);
+$colorItemBgHov: pullForward($colorItemBg, $hoverRatioPercent);
 $colorItemFg: lighten($colorItemBg, 50%);
 $colorItemFgDetails: lighten($colorItemBg, 30%);
 $colorItemIc: $colorKey;
@@ -149,8 +153,8 @@ $colorPlotAreaBorder: $colorInteriorBorder;
 $colorPlotLabelFg: pushBack($colorPlotFg, 20%);
 
 // Tree
-$colorItemTreeHoverBg: rgba($colorBodyFg, 0.1);
-$colorItemTreeHoverFg: pullForward($colorBodyFg, 20%);
+$colorItemTreeHoverBg: pullForward($colorBodyBg, $hoverRatioPercent);
+$colorItemTreeHoverFg: pullForward($colorBodyFg, $hoverRatioPercent);
 $colorItemTreeIcon: $colorKey;
 $colorItemTreeIconHover: lighten($colorItemTreeIcon, 20%);
 $colorItemTreeFg: $colorBodyFg;
@@ -165,10 +169,10 @@ $shdwItemTreeIcon: 0.6;
 
 // Scrollbar
 $scrollbarTrackSize: 10px;
+$scrollbarTrackShdw: rgba(#000, 0.7) 0 1px 5px;
 $scrollbarTrackColorBg: rgba(#000, 0.4);
 $scrollbarThumbColor: lighten($colorBodyBg, 10%);
 $scrollbarThumbColorHov: lighten($scrollbarThumbColor, 2%);
-$scrollbarTrackShdw: rgba(#000, 0.7) 0 1px 5px;
 
 // Splitter
 $splitterD: 25px; // splitterD and HandleD should both be odd, or even

platform/commonUI/themes/espresso/res/sass/_mixins.scss

@@ -4,10 +4,10 @@
 	@include boxShdw($shdwBtns);
 }
 
-@mixin btnSubtle($bg: $colorBodyBg, $bgHov: none, $fg: $colorBodyFg, $ic: $colorBtnIcon) {
+@mixin btnSubtle($bg: $colorBodyBg, $bgHovColor: none, $fg: $colorBodyFg, $ic: $colorBtnIcon) {
 	@include containerSubtle($bg, $fg);
-	@include btnBase($bg, linear-gradient(lighten($bg, 15%), lighten($bg, 10%)), $fg, $ic);
-	@include text-shadow($shdwItemText);
+	@include btnBase($bg, $bgHovColor, $fg, $ic);
+	text-shadow: $shdwItemText;
 }
 
 @function pullForward($c: $colorBodyBg, $p: 20%) {

platform/commonUI/themes/espresso/res/sass/theme-espresso.scss

@@ -20,10 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-@import "compass";
-@import "compass/reset";
-@import "compass/css3";
-@import "compass/utilities";
+@import "bourbon";
 
 @import "../../../../general/res/sass/_mixins";
 @import "../../../../general/res/sass/mobile/mixins";
@@ -33,4 +30,4 @@
 @import "../../../../general/res/sass/mobile/constants";
 @import "constants";
 
-@import "../../../../general/res/sass/main";
+@import "../../../../general/res/sass/main";