From 592fe420839c8f6fd8964210fb7b504c1f7bc161 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Tue, 24 Nov 2015 14:24:51 -0500 Subject: [PATCH] refactor(card): removed actions attribute since this is no longer needed with the item refactor Buttons in this item still need the item-left or item-right attribute to size correctly. Closes #552 --- ionic/components/card/modes/ios.scss | 16 ---------------- ionic/components/card/modes/md.scss | 10 ---------- ionic/components/card/test/advanced/main.html | 10 +++++----- ionic/components/item/modes/md.scss | 4 ---- 4 files changed, 5 insertions(+), 35 deletions(-) diff --git a/ionic/components/card/modes/ios.scss b/ionic/components/card/modes/ios.scss index 76fa080f7c..6d8241d5fd 100644 --- a/ionic/components/card/modes/ios.scss +++ b/ionic/components/card/modes/ios.scss @@ -79,22 +79,6 @@ ion-card { padding-top: 0; } - [actions] { - padding-right: ($card-ios-padding-right / 2); - - ion-item-content { - padding: 0; - } - - button, - [button] { - margin: 0 ($item-ios-padding-right / 2); - padding: 2px 6px; - min-height: 26px; - font-size: 1.3rem; - } - } - ion-note[item-left], ion-note[item-right], { font-size: 1.3rem; diff --git a/ionic/components/card/modes/md.scss b/ionic/components/card/modes/md.scss index 788610ce17..97e0311e6a 100644 --- a/ionic/components/card/modes/md.scss +++ b/ionic/components/card/modes/md.scss @@ -81,16 +81,6 @@ ion-card { padding-top: 0; } - [actions] { - button, - [button] { - margin: 0 ($card-md-padding-right / 4) 0 ($card-md-padding-left / 4); - min-height: 26px; - font-size: 1.3rem; - border-color: transparent; - } - } - ion-note[item-left], ion-note[item-right], { font-size: 1.3rem; diff --git a/ionic/components/card/test/advanced/main.html b/ionic/components/card/test/advanced/main.html index 2f03a72d9b..7c56a7dae6 100644 --- a/ionic/components/card/test/advanced/main.html +++ b/ionic/components/card/test/advanced/main.html @@ -19,7 +19,7 @@

- + - @@ -76,12 +76,12 @@ This card was breaking the border radius. - + - diff --git a/ionic/components/item/modes/md.scss b/ionic/components/item/modes/md.scss index 34e75f3920..425f278248 100644 --- a/ionic/components/item/modes/md.scss +++ b/ionic/components/item/modes/md.scss @@ -146,10 +146,6 @@ button[item-right], line-height: $item-md-body-text-line-height; } -.item[actions] ion-item-content { - margin: 4px; -} - icon[item-left] + .item-inner, icon[item-left] + [text-input] { margin-left: $item-md-padding-left + ($item-md-padding-left / 2);