From d1b9880a08f1a7a1d5de22b013151f99bee17d70 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Mon, 7 Dec 2015 14:34:56 -0500 Subject: [PATCH] refactor(button): changed border from short-hand syntax to make it easier to override references #689 --- ionic/components/button/modes/ios.scss | 4 +++- ionic/components/button/modes/md.scss | 8 +++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ionic/components/button/modes/ios.scss b/ionic/components/button/modes/ios.scss index 55c2ab35ce..f1c20f44ae 100644 --- a/ionic/components/button/modes/ios.scss +++ b/ionic/components/button/modes/ios.scss @@ -115,7 +115,9 @@ $button-ios-small-icon-font-size: 1.3em !default; // -------------------------------------------------- .button-outline { - border: 1px solid $button-ios-color; + border-width: 1px; + border-style: solid; + border-color: $button-ios-color; background-color: transparent; color: $button-ios-color; diff --git a/ionic/components/button/modes/md.scss b/ionic/components/button/modes/md.scss index 98b84155ec..1c69af9b15 100644 --- a/ionic/components/button/modes/md.scss +++ b/ionic/components/button/modes/md.scss @@ -41,11 +41,7 @@ $button-md-small-icon-font-size: 1.4em !default; .button { margin: $button-md-margin; padding: $button-md-padding; - min-height: $button-md-height; - font-size: $button-md-font-size; - - border: 0; border-radius: $button-md-border-radius; font-weight: 500; @@ -129,7 +125,9 @@ $button-md-small-icon-font-size: 1.4em !default; // -------------------------------------------------- .button-outline { - border: 1px solid $button-md-color; + border-width: 1px; + border-style: solid; + border-color: $button-md-color; background-color: transparent; color: $button-md-color; box-shadow: none;