From e0372d2fc63bb7489db8d039d2f1f984fc371de9 Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@gmail.com>
Date: Thu, 29 Jun 2017 10:57:38 +0300
Subject: Remove global button styling (#9607)

Move remaining button and link related styles from _global to _nativebutton and _link.
---
 .../src/main/themes/VAADIN/themes/valo/components/_link.scss   |  1 +
 .../themes/VAADIN/themes/valo/components/_nativebutton.scss    |  7 +++++++
 themes/src/main/themes/VAADIN/themes/valo/shared/_global.scss  | 10 ----------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/themes/src/main/themes/VAADIN/themes/valo/components/_link.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_link.scss
index 270de1aace..daa697b19f 100644
--- a/themes/src/main/themes/VAADIN/themes/valo/components/_link.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_link.scss
@@ -30,6 +30,7 @@ $v-link-cursor: pointer !default;
     @include valo-link-style;
 
     a {
+      @include valo-link-style;
       cursor: inherit;
       color: inherit;
       text-decoration: inherit;
diff --git a/themes/src/main/themes/VAADIN/themes/valo/components/_nativebutton.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_nativebutton.scss
index 9bfca4f396..8d5fd88ea5 100644
--- a/themes/src/main/themes/VAADIN/themes/valo/components/_nativebutton.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_nativebutton.scss
@@ -6,6 +6,13 @@
  * @group nativebutton
  */
 @mixin valo-nativebutton ($primary-stylename: v-nativebutton) {
+
+  button {
+    font: inherit;
+    font-weight: 400;
+    line-height: $v-line-height;
+  }
+
   .#{$primary-stylename} {
     -webkit-touch-callout: none;
   }
diff --git a/themes/src/main/themes/VAADIN/themes/valo/shared/_global.scss b/themes/src/main/themes/VAADIN/themes/valo/shared/_global.scss
index 441e073dcf..ecd8e1a59b 100644
--- a/themes/src/main/themes/VAADIN/themes/valo/shared/_global.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/shared/_global.scss
@@ -329,16 +329,6 @@ $valo-shared-pathPrefix: null;
     @include valo-nativeselect-select-style;
   }
 
-  button {
-    font: inherit;
-    font-weight: 400;
-    line-height: $v-line-height;
-  }
-
-  a {
-    @include valo-link-style;
-  }
-
   .v-disabled {
     cursor: default !important;
   }
-- 
cgit v1.2.3