use SF UI on El Capitan, minor alpha rounding fix

romannurik · Jun 13, 2016 · eeeb803 · eeeb803
1 parent c0c78bd
commit eeeb803
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/app/app.js b/app/app.js
@@ -421,8 +421,8 @@ class MaterialColors {
 
     if (value.alpha && value.alpha < 1 && largeTile) {
         $('<span>')
-          .addClass(this.CLASS_NAMES.colorTileAlpha)
-            .text(`Alpha ${parseInt(value.alpha * 100)}%`)
+            .addClass(this.CLASS_NAMES.colorTileAlpha)
+            .text(`Alpha ${Math.round(value.alpha * 100)}%`)
             .appendTo($colorTile);
     }
 

diff --git a/app/app.scss b/app/app.scss
@@ -28,6 +28,9 @@ $colorWhiteTextDisabled: rgba(#fff, .5);
 $colorTooltipBackground: #263238;
 $colorTooltipText: #fff;
 
+$fontStackMono: 'Roboto Mono', monospace;
+$fontStackSansSerif: BlinkMacSystemFont, Roboto, sans-serif;
+
 $thinBorderColor: rgba(#000, .12);
 
 $hueIconWidth: 14px;
@@ -52,7 +55,7 @@ body {
   height: 100%;
   margin: 0;
   overflow: hidden;
-  font-family: Roboto, sans-serif;
+  font-family: $fontStackSansSerif;
   font-weight: 400;
   text-rendering: optimizeLegibility;
   -webkit-font-smoothing: antialiased;
@@ -193,7 +196,7 @@ body {
   margin-bottom: 8px;
   outline: none;
   font-size: 10px;
-  font-family: Roboto, sans-serif;
+  font-family: $fontStackSansSerif;
 }
 
 .search-help-text {
@@ -376,7 +379,7 @@ body {
 }
 
 .color-tile-hex {
-  font-family: 'Roboto Mono', monospace;
+  font-family: $fontStackMono;
 }
 
 .update-banner {