fix tooltip contrast color

miguelcobain · Sep 26, 2018 · e82f32d · e82f32d
1 parent 2129b69
commit e82f32d
Show file tree

Hide file tree

Showing 3 changed files with 1,324 additions and 7 deletions.
diff --git a/lib/angular-scss-filter.js b/lib/angular-scss-filter.js
@@ -72,12 +72,10 @@ module.exports = class AngularScssFilter extends Filter {
     let colorFunction = hue === 'contrast' || contrast ? 'paper-contrast-color' : 'paper-color';
     let params = [`$${colorType}`];
 
-    if (hue !== 'contrast' && !contrast) {
-      params.push(`"${hue}"`);
-    }
+    params.push(`"${hue}"`);
 
     if (opacity) {
-      return `rgba(paper-color(${params.join(', ')}), ${opacity})`;
+      return `rgba(${colorFunction}(${params.join(', ')}), ${opacity})`;
     } else {
       return `${colorFunction}(${params.join(', ')})`;
     }
@@ -87,7 +85,7 @@ module.exports = class AngularScssFilter extends Filter {
     // normalize `color` into `default`
     hue = hue === 'color' ? 'default' : hue;
 
-    contrast = hue === 'contrast';
+    contrast = hue === 'contrast' || contrast;
 
     if (LIGHT_DEFAULT_HUES[colorType] && LIGHT_DEFAULT_HUES[colorType][hue]) {
       hue = LIGHT_DEFAULT_HUES[colorType][hue];

diff --git a/tests/dummy/app/templates/demo/button.hbs b/tests/dummy/app/templates/demo/button.hbs
@@ -7,33 +7,39 @@
     {{#paper-button noink=true primary=true}}Primary (noink){{/paper-button}}
     {{#paper-button disabled=true}}disabled{{/paper-button}}
     {{#paper-button warn=true}}warn{{/paper-button}}
+    {{#paper-button accent=true}}accent{{/paper-button}}
     {{#paper-button href="http://emberjs.com/images/tomsters/original.png" target="_blank"}}href link{{/paper-button}}
   </div>
   <p>
     {{#paper-button raised=true onClick=(action "raisedButton")}}Button with action{{/paper-button}}
     {{#paper-button raised=true primary=true}}Primary{{/paper-button}}
     {{#paper-button raised=true disabled=true}}disabled{{/paper-button}}
     {{#paper-button raised=true warn=true}}warn{{/paper-button}}
+    {{#paper-button raised=true accent=true}}accent{{/paper-button}}
   </p>
   {{#custom-button}}
   <p>
     {{#paper-button raised=true onClick=(action "targetButton")}}Button with target{{/paper-button}}
     {{#paper-button raised=true primary=true onClick=(action "targetButton")}}Button with bubble{{/paper-button}}
     {{#paper-button raised=true primary=true onClick=(action "targetButton") bubbles=false}}Button no bubble{{/paper-button}}
   </p>
+  {{/custom-button}}
+
   <p>
     {{#paper-button raised=true fab=true}}Fab{{/paper-button}}
+    {{#paper-button raised=true fab=true accent=true}}Fab{{/paper-button}}
     {{#paper-button raised=true mini=true}}Mini{{/paper-button}}
+    {{#paper-button raised=true mini=true primary=true}}Mini{{/paper-button}}
     {{#paper-button iconButton=true}}{{paper-icon "accessibility"}}{{/paper-button}}
   </p>
-  {{/custom-button}}
+
   <p>
     {{paper-button raised=true label="Blockless version"}}
   </p>
   {{! END-SNIPPET }}
   <h3>Template</h3>
   {{code-snippet name="buttons.example.hbs"}}
-  
+
   <h3>Controller</h3>
   {{code-snippet name="buttons.component.js"}}