fixing bad merge

microsoft · May 9, 2019 · d84e865 · d84e865
1 parent d3f3a1b
commit d84e865
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 27 deletions.
diff --git a/packages/fast-components-styles-msft/src/action-trigger/index.ts b/packages/fast-components-styles-msft/src/action-trigger/index.ts
@@ -1,14 +1,10 @@
-import { ComponentStyles, ComponentStyleSheet } from "@microsoft/fast-jss-manager";
+import { ComponentStyles } from "@microsoft/fast-jss-manager";
 import {
     ActionTriggerClassNameContract,
     ButtonClassNameContract,
 } from "@microsoft/fast-components-class-name-contracts-msft";
-import {
-    applyLocalizedProperty,
-    Direction,
-    directionSwitch,
-} from "@microsoft/fast-jss-utilities";
-import { DesignSystem, withDesignSystemDefaults } from "../design-system/index";
+import { directionSwitch } from "@microsoft/fast-jss-utilities";
+import { DesignSystem } from "../design-system/index";
 import {
     accentForegroundActive,
     accentForegroundCut,
@@ -85,16 +81,27 @@ const styles: ComponentStyles<ActionTriggerClassNameContract, DesignSystem> = {
                 fill: accentForegroundActive,
             },
         },
-        actionTrigger__stealth: {
-            "& $actionTrigger_glyph": {
-                fill: neutralForegroundRest,
-            },
-            "&$actionTrigger__disabled $actionTrigger_glyph": {
-                fill: neutralForegroundRest,
-            },
+        "&$actionTrigger__disabled $actionTrigger_glyph": {
+            fill: accentForegroundRest,
+        },
+    },
+    actionTrigger__outline: {
+        "& $actionTrigger_glyph": {
+            fill: neutralForegroundRest,
+        },
+        "&$actionTrigger__disabled $actionTrigger_glyph": {
+            fill: neutralForegroundRest,
+        },
+    },
+    actionTrigger__stealth: {
+        "& $actionTrigger_glyph": {
+            fill: neutralForegroundRest,
+        },
+        "&$actionTrigger__disabled $actionTrigger_glyph": {
+            fill: neutralForegroundRest,
         },
-        actionTrigger__disabled: {},
     },
+    actionTrigger__disabled: {},
 };
 
 export default styles;
diff --git a/packages/fast-components-styles-msft/src/text-action/index.ts b/packages/fast-components-styles-msft/src/text-action/index.ts
@@ -1,3 +1,9 @@
+import { TextFieldClassNameContract } from "@microsoft/fast-components-class-name-contracts-base";
+import { TextActionClassNameContract } from "@microsoft/fast-components-class-name-contracts-msft";
+import { ComponentStyles, CSSRules } from "@microsoft/fast-jss-manager";
+import { directionSwitch, format, subtract, toPx } from "@microsoft/fast-jss-utilities";
+import { DesignSystem } from "../design-system";
+import { applyCornerRadius } from "../utilities/border";
 import {
     neutralFillInputActive,
     neutralFillInputHover,
@@ -8,20 +14,9 @@ import {
     neutralOutlineHover,
     neutralOutlineRest,
 } from "../utilities/color";
-import { DesignSystem, withDesignSystemDefaults } from "../design-system";
-import { TextActionClassNameContract } from "@microsoft/fast-components-class-name-contracts-msft";
-import { TextFieldClassNameContract } from "@microsoft/fast-components-class-name-contracts-base";
-import { directionSwitch, format, subtract, toPx } from "@microsoft/fast-jss-utilities";
-import {
-    ComponentStyles,
-    ComponentStyleSheet,
-    CSSRules,
-} from "@microsoft/fast-jss-manager";
-import { applyCornerRadius } from "../utilities/border";
 import { glyphSize, height, horizontalSpacing } from "../utilities/density";
-import { applyDisabledState } from "../utilities/disabled";
 import { focusOutlineWidth, outlineWidth } from "../utilities/design-system";
-import {} from "lodash-es";
+import { applyDisabledState } from "../utilities/disabled";
 
 // Since MSFT button is already styled, we need to override in this way to alter button classes
 export const textFieldOverrides: ComponentStyles<