From a8ee0874125226227bce5b8f8b0a630bcd2acda3 Mon Sep 17 00:00:00 2001
From: myakovleva <myakovleva@ptsecurity.com>
Date: Mon, 23 Sep 2019 19:03:05 +0300
Subject: [PATCH 1/4] fix(button): moving transparent modificator to theme scss
 file

---
 packages/mosaic/button/_button-theme.scss | 20 ++++++++++++++++++++
 packages/mosaic/button/button.scss        | 20 --------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/packages/mosaic/button/_button-theme.scss b/packages/mosaic/button/_button-theme.scss
index 547f242f3..c634ea803 100644
--- a/packages/mosaic/button/_button-theme.scss
+++ b/packages/mosaic/button/_button-theme.scss
@@ -135,6 +135,26 @@
             box-shadow: 0 0 0 1px $focus-color;
         }
     }
+
+    &_transparent {
+        &.mc-primary,
+        &.mc-second {
+            border-color: transparent;
+            background-color: transparent;
+
+            &.mc-disabled,
+            &[disabled] {
+                border-color: transparent;
+            }
+
+            &:active,
+            &.mc-active {
+                border-color: transparent;
+                background-color: transparent;
+                box-shadow: none;
+            }
+        }
+    }
 }
 
 @mixin mc-button-theme($theme) {
diff --git a/packages/mosaic/button/button.scss b/packages/mosaic/button/button.scss
index 2388f8176..25e926edf 100644
--- a/packages/mosaic/button/button.scss
+++ b/packages/mosaic/button/button.scss
@@ -7,26 +7,6 @@
     @extend %mc-button-base;
 
     @include mc-button-size($mc-button-padding, $mc-button-line-height, $mc-button-font);
-
-    &_transparent {
-        &.mc-primary,
-        &.mc-second {
-            border-color: transparent;
-            background-color: transparent;
-
-            &.mc-disabled,
-            &[disabled] {
-                border-color: transparent;
-            }
-
-            &:active,
-            &.mc-active {
-                border-color: transparent;
-                background-color: transparent;
-                box-shadow: none;
-            }
-        }
-    }
 }
 
 .mc-light-button {

From b92a146db5e2a6e7da581a95a8adc2c5834d2acb Mon Sep 17 00:00:00 2001
From: lkramarov <lkramarov@ptsecurity.com>
Date: Thu, 26 Sep 2019 10:31:18 +0300
Subject: [PATCH 2/4] improved selector and example

---
 packages/mosaic-dev/button/template.html  | 45 ++++++++++++-----------
 packages/mosaic/button/_button-theme.scss | 17 ++++-----
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/packages/mosaic-dev/button/template.html b/packages/mosaic-dev/button/template.html
index 409765f7d..b09c94fb2 100644
--- a/packages/mosaic-dev/button/template.html
+++ b/packages/mosaic-dev/button/template.html
@@ -59,27 +59,6 @@
 
     <br><br>
 
-    <button mc-button color="second" class="mc-button mc-button_transparent" disabled><i mc-icon="mc-play_16"></i>disabled</button>&nbsp;
-    <button mc-button color="second" class="mc-button mc-button_transparent"><i mc-icon="mc-play_16"></i>normal</button>&nbsp;
-    <button class="mc-hover mc-button mc-button_transparent" mc-button color="second"><i mc-icon="mc-play_16"></i>hover</button>&nbsp;
-    <button class="mc-active mc-button mc-button_transparent" mc-button color="second"><i mc-icon="mc-play_16"></i>pressed</button>&nbsp;
-    <button class="cdk-keyboard-focused mc-button mc-button_transparent" mc-button color="second"><i mc-icon="mc-play_16"></i>focus</button>&nbsp;
-
-
-    <br><br>
-
-    <button mc-button color="second" class="mc-progress mc-button mc-button_transparent" disabled><i mc-icon="mc-play_16"></i>disabled</button>&nbsp;
-    <button mc-button color="second" class="mc-progress mc-button mc-button_transparent"><i mc-icon="mc-play_16"></i>normal</button>&nbsp;
-    <button class="mc-progress mc-hover mc-button mc-button_transparent" mc-button color="second"><i mc-icon="mc-play_16"></i>hover</button>&nbsp;
-    <button class="mc-progress mc-active mc-button mc-button_transparent" mc-button color="second"><i mc-icon="mc-play_16"></i>pressed</button>&nbsp;
-    <button class="mc-progress cdk-keyboard-focused mc-button mc-button_transparent" mc-button color="second"><i mc-icon="mc-play_16"></i>focus</button>&nbsp;
-
-    <br>
-    <br>
-
-
-
-
     <button mc-button color="primary" disabled><i mc-icon="mc-play_16"></i>disabled</button>&nbsp;
     <button mc-button color="primary"><i mc-icon="mc-play_16"></i>normal</button>&nbsp;
     <button class="mc-hover" mc-button color="primary"><i mc-icon="mc-play_16"></i>hover</button>&nbsp;
@@ -96,6 +75,14 @@
 
     <br><br>
 
+    <button mc-button color="primary" class="mc-button_transparent" disabled><i mc-icon="mc-play_16"></i>disabled</button>&nbsp;
+    <button mc-button color="primary" class="mc-button_transparent"><i mc-icon="mc-play_16"></i>normal</button>&nbsp;
+    <button class="mc-button_transparent mc-hover" mc-button color="primary"><i mc-icon="mc-play_16"></i>hover</button>&nbsp;
+    <button class="mc-button_transparent mc-active" mc-button color="primary"><i mc-icon="mc-play_16"></i>pressed</button>&nbsp;
+    <button class="mc-button_transparent cdk-keyboard-focused" mc-button color="primary"><i mc-icon="mc-play_16"></i>focus</button>&nbsp;
+
+    <br><br>
+
     <button mc-button color="second" disabled><i mc-icon="mc-play_16"></i>disabled</button>&nbsp;
     <button mc-button color="second"><i mc-icon="mc-play_16"></i>normal</button>&nbsp;
     <button class="mc-hover" mc-button color="second"><i mc-icon="mc-play_16"></i>hover</button>&nbsp;
@@ -112,6 +99,14 @@
 
     <br><br>
 
+    <button mc-button color="second" class="mc-button_transparent" disabled><i mc-icon="mc-play_16"></i>disabled</button>&nbsp;
+    <button mc-button color="second" class="mc-button_transparent"><i mc-icon="mc-play_16"></i>normal</button>&nbsp;
+    <button class="mc-button_transparent mc-hover" mc-button color="second"><i mc-icon="mc-play_16"></i>hover</button>&nbsp;
+    <button class="mc-button_transparent mc-active" mc-button color="second"><i mc-icon="mc-play_16"></i>pressed</button>&nbsp;
+    <button class="mc-button_transparent cdk-keyboard-focused" mc-button color="second"><i mc-icon="mc-play_16"></i>focus</button>&nbsp;
+
+    <br><br>
+
     <button mc-button color="error" disabled><i mc-icon="mc-play_16"></i>disabled</button>&nbsp;
     <button mc-button color="error"><i mc-icon="mc-play_16"></i>normal</button>&nbsp;
     <button class="mc-hover" mc-button color="error"><i mc-icon="mc-play_16"></i>hover</button>&nbsp;
@@ -125,4 +120,12 @@
     <button class="mc-hover mc-progress" mc-button color="error"><i mc-icon="mc-play_16"></i>hover</button>&nbsp;
     <button class="mc-active mc-progress" mc-button color="error"><i mc-icon="mc-play_16"></i>pressed</button>&nbsp;
     <button class="cdk-keyboard-focused mc-progress" mc-button color="error"><i mc-icon="mc-play_16"></i>focus</button>&nbsp;
+
+    <br><br>
+
+    <button mc-button color="error" class="mc-button_transparent" disabled><i mc-icon="mc-play_16"></i>disabled</button>&nbsp;
+    <button mc-button color="error" class="mc-button_transparent"><i mc-icon="mc-play_16"></i>normal</button>&nbsp;
+    <button class="mc-button_transparent mc-hover" mc-button color="error"><i mc-icon="mc-play_16"></i>hover</button>&nbsp;
+    <button class="mc-button_transparent mc-active" mc-button color="error"><i mc-icon="mc-play_16"></i>pressed</button>&nbsp;
+    <button class="mc-button_transparent cdk-keyboard-focused" mc-button color="error"><i mc-icon="mc-play_16"></i>focus</button>&nbsp;
 </div>
diff --git a/packages/mosaic/button/_button-theme.scss b/packages/mosaic/button/_button-theme.scss
index c634ea803..fda4d8f1c 100644
--- a/packages/mosaic/button/_button-theme.scss
+++ b/packages/mosaic/button/_button-theme.scss
@@ -135,10 +135,14 @@
             box-shadow: 0 0 0 1px $focus-color;
         }
     }
+}
 
-    &_transparent {
-        &.mc-primary,
-        &.mc-second {
+@mixin mc-button-theme($theme) {
+    .mc-button,
+    .mc-icon-button {
+        @include _mc-button-theme-color($theme);
+
+        &.mc-button_transparent {
             border-color: transparent;
             background-color: transparent;
 
@@ -157,13 +161,6 @@
     }
 }
 
-@mixin mc-button-theme($theme) {
-    .mc-button,
-    .mc-icon-button {
-        @include _mc-button-theme-color($theme);
-    }
-}
-
 @mixin mc-button-typography($config) {
     .mc-button,
     .mc-icon-button {

From 3a54ebfc45fe85e52fa5f427c9026b3121a78e09 Mon Sep 17 00:00:00 2001
From: myakovleva <myakovleva@ptsecurity.com>
Date: Thu, 26 Sep 2019 13:35:41 +0300
Subject: [PATCH 3/4] fix(button): resolve conflict

---
 packages/mosaic/button/button.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mosaic/button/button.scss b/packages/mosaic/button/button.scss
index 3846a4baf..5706863e6 100644
--- a/packages/mosaic/button/button.scss
+++ b/packages/mosaic/button/button.scss
@@ -6,7 +6,7 @@
 .mc-button {
     @extend %mc-button-base;
 
-    @include mc-button-size($mc-button-padding, $mc-button-line-height, $mc-button-font);
+    padding: $mc-button-padding;
 
     &_transparent {
         &.mc-primary,

From 0b555e178f4f79a0cc3ec187c763dd19663d6481 Mon Sep 17 00:00:00 2001
From: myakovleva <myakovleva@ptsecurity.com>
Date: Thu, 26 Sep 2019 13:38:22 +0300
Subject: [PATCH 4/4] fix(button): moving transparent modificator

---
 packages/mosaic/button/button.scss | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/packages/mosaic/button/button.scss b/packages/mosaic/button/button.scss
index 5706863e6..c3b238f36 100644
--- a/packages/mosaic/button/button.scss
+++ b/packages/mosaic/button/button.scss
@@ -7,26 +7,6 @@
     @extend %mc-button-base;
 
     padding: $mc-button-padding;
-
-    &_transparent {
-        &.mc-primary,
-        &.mc-second {
-            border-color: transparent;
-            background-color: transparent;
-
-            &.mc-disabled,
-            &[disabled] {
-                border-color: transparent;
-            }
-
-            &:active,
-            &.mc-active {
-                border-color: transparent;
-                background-color: transparent;
-                box-shadow: none;
-            }
-        }
-    }
 }
 
 .mc-light-button {