fix(styles): fixed using animation from core (#154748)

positive-js · Aug 20, 2018 · b1db7f5 · b1db7f5
1 parent ef0921c
commit b1db7f5
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 22 deletions.
diff --git a/src/lib/button/_button-base.scss b/src/lib/button/_button-base.scss
@@ -31,7 +31,7 @@ $mc-icon-button-padding: 5px 7px;
 $mc-icon-button-text-padding: 15px;
 $mc-icon-button-icon-padding: 7px;
 $mc-icon-button-line-height: 20px;
-$mc-icon-button-font: 14px;
+$mc-icon-button-font: 16px;
 
 
 %mc-button-base {

diff --git a/src/lib/button/_button-theme.scss b/src/lib/button/_button-theme.scss
@@ -1,11 +1,6 @@
 @import '../core/theming/theming';
 @import '../core/styles/typography/typography-utils';
 
-@import '../core/styles/common/animation';
-
-// TODO: Its only for testing colors
-@import '../core/theming/palette';
-
 
 @mixin _mc-button-primary-color($palette) {
     $hover-lighten: 5%;

diff --git a/src/lib/core/_core.scss b/src/lib/core/_core.scss
@@ -1,3 +1,5 @@
+@import 'styles/common/animation';
+
 @import '../../cdk/a11y/a11y';
 
 @import 'styles/typography/all-typography';

diff --git a/src/lib/core/styles/common/_animation.scss b/src/lib/core/styles/common/_animation.scss
@@ -2,6 +2,7 @@
     from {
         background-position: 0 0;
     }
+
     to {
         background-position: 29px 0;
     }

diff --git a/src/lib/core/styles/common/_button.scss b/src/lib/core/styles/common/_button.scss
@@ -8,17 +8,6 @@
     border: none;
 }
 
-@keyframes mc-progress {
-
-    from {
-        background-position: 0 0;
-    }
-
-    to {
-        background-position: 29px 0;
-    }
-}
-
 @mixin border-top-radius($radius) {
     border-top: {
         right-radius: $radius;

diff --git a/src/lib/core/styles/typography/_all-typography.scss b/src/lib/core/styles/typography/_all-typography.scss
@@ -2,6 +2,7 @@
 @import '../badges';
 @import '../../../button/button-theme';
 @import '../../../list/list-theme';
+@import '../../../tree/tree-theme';
 @import '../../../radio/radio-theme';
 @import '../../../checkbox/checkbox-theme';
 @import '../../../navbar/navbar-theme';

diff --git a/src/lib/list/_list-theme.scss b/src/lib/list/_list-theme.scss
@@ -5,7 +5,6 @@
 // TODO: Its only for testing colors
 @import '../core/theming/palette';
 
-@import '../core/styles/common/animation';
 @import '../core/styles/common/list';
 
 

diff --git a/src/lib/list/list.scss b/src/lib/list/list.scss
@@ -1,6 +1,4 @@
-@import '../core/styles/variables';
 @import '../core/styles/common/list';
-@import '../core/styles/common/layout';
 @import '../divider/divider';
 
 @import 'list-base';

diff --git a/src/lib/navbar/_navbar-theme.scss b/src/lib/navbar/_navbar-theme.scss
@@ -1,8 +1,6 @@
 @import '../core/theming/theming';
 @import '../core/styles/typography/typography-utils';
 
-@import '../core/styles/common/animation';
-
 @mixin _mc-navbar-theme-color($theme) {
     $palette: map-get($theme, primary);
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
         from {
             background-position: 0 0;
         }
         to {
             background-position: 29px 0;
         }
@@ Expand Down @@