From 12da6d52461e3478c21c716380e7a9a1abcf8628 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Fri, 21 Jul 2017 16:50:33 -0400 Subject: [PATCH] fix(padding): add padding to correct element --- .../core/src/components/content/content.scss | 64 +++++++++---------- .../components/item-sliding/test/basic.html | 4 -- .../src/components/searchbar/test/basic.html | 14 ---- .../src/components/segment/test/basic.html | 14 ---- 4 files changed, 32 insertions(+), 64 deletions(-) diff --git a/packages/core/src/components/content/content.scss b/packages/core/src/components/content/content.scss index 3a6d59833c..336a77f1d5 100644 --- a/packages/core/src/components/content/content.scss +++ b/packages/core/src/components/content/content.scss @@ -72,38 +72,38 @@ ion-app [no-padding] ion-scroll { } @mixin content-padding($mode, $content-padding) { - ion-app.#{$mode} [padding], - ion-app.#{$mode} [padding] ion-scroll { + .app-#{$mode} [padding], + .app-#{$mode} [padding] ion-scroll { @include padding($content-padding); } - ion-app.#{$mode} [padding-top], - ion-app.#{$mode} [padding-top] ion-scroll { + .app-#{$mode} [padding-top], + .app-#{$mode} [padding-top] ion-scroll { @include padding($content-padding, null, null, null); } - ion-app.#{$mode} [padding-left], - ion-app.#{$mode} [padding-left] ion-scroll { + .app-#{$mode} [padding-left], + .app-#{$mode} [padding-left] ion-scroll { @include padding-horizontal($content-padding, null); } - ion-app.#{$mode} [padding-right], - ion-app.#{$mode} [padding-right] ion-scroll { + .app-#{$mode} [padding-right], + .app-#{$mode} [padding-right] ion-scroll { @include padding-horizontal(null, $content-padding); } - ion-app.#{$mode} [padding-bottom], - ion-app.#{$mode} [padding-bottom] ion-scroll { + .app-#{$mode} [padding-bottom], + .app-#{$mode} [padding-bottom] ion-scroll { @include padding(null, null, $content-padding, null); } - ion-app.#{$mode} [padding-vertical], - ion-app.#{$mode} [padding-vertical] ion-scroll { + .app-#{$mode} [padding-vertical], + .app-#{$mode} [padding-vertical] ion-scroll { @include padding($content-padding, null, $content-padding, null); } - ion-app.#{$mode} [padding-horizontal], - ion-app.#{$mode} [padding-horizontal] ion-scroll { + .app-#{$mode} [padding-horizontal], + .app-#{$mode} [padding-horizontal] ion-scroll { @include padding-horizontal($content-padding); } } @@ -118,50 +118,50 @@ ion-app [no-margin] ion-scroll { } @mixin content-margin($mode, $content-margin) { - ion-app.#{$mode} [margin], - ion-app.#{$mode} [margin] ion-scroll { + .app-#{$mode} [margin], + .app-#{$mode} [margin] ion-scroll { @include margin($content-margin); } - ion-app.#{$mode} [margin-top], - ion-app.#{$mode} [margin-top] ion-scroll { + .app-#{$mode} [margin-top], + .app-#{$mode} [margin-top] ion-scroll { @include margin($content-margin, null, null, null); } - ion-app.#{$mode} [margin-left], - ion-app.#{$mode} [margin-left] ion-scroll { + .app-#{$mode} [margin-left], + .app-#{$mode} [margin-left] ion-scroll { // scss-lint:disable PropertySpelling margin-left: $content-margin; } - ion-app.#{$mode} [margin-start], - ion-app.#{$mode} [margin-start] ion-scroll { + .app-#{$mode} [margin-start], + .app-#{$mode} [margin-start] ion-scroll { @include margin-horizontal($content-margin, null); } - ion-app.#{$mode} [margin-right], - ion-app.#{$mode} [margin-right] ion-scroll { + .app-#{$mode} [margin-right], + .app-#{$mode} [margin-right] ion-scroll { // scss-lint:disable PropertySpelling margin-right: $content-margin; } - ion-app.#{$mode} [margin-end], - ion-app.#{$mode} [margin-end] ion-scroll { + .app-#{$mode} [margin-end], + .app-#{$mode} [margin-end] ion-scroll { @include margin-horizontal(null, $content-margin); } - ion-app.#{$mode} [margin-bottom], - ion-app.#{$mode} [margin-bottom] ion-scroll { + .app-#{$mode} [margin-bottom], + .app-#{$mode} [margin-bottom] ion-scroll { @include margin(null, null, $content-margin, null); } - ion-app.#{$mode} [margin-vertical], - ion-app.#{$mode} [margin-vertical] ion-scroll { + .app-#{$mode} [margin-vertical], + .app-#{$mode} [margin-vertical] ion-scroll { @include margin($content-margin, null, $content-margin, null); } - ion-app.#{$mode} [margin-horizontal], - ion-app.#{$mode} [margin-horizontal] ion-scroll { + .app-#{$mode} [margin-horizontal], + .app-#{$mode} [margin-horizontal] ion-scroll { @include margin-horizontal($content-margin); } } \ No newline at end of file diff --git a/packages/core/src/components/item-sliding/test/basic.html b/packages/core/src/components/item-sliding/test/basic.html index b036c905b8..2a7c6da4f5 100644 --- a/packages/core/src/components/item-sliding/test/basic.html +++ b/packages/core/src/components/item-sliding/test/basic.html @@ -399,10 +399,6 @@ .downloading .download-hide { display: none; } - - [padding] { - padding: 16px; - } diff --git a/packages/core/src/components/searchbar/test/basic.html b/packages/core/src/components/searchbar/test/basic.html index cabb9f5446..c74f32b979 100644 --- a/packages/core/src/components/searchbar/test/basic.html +++ b/packages/core/src/components/searchbar/test/basic.html @@ -138,20 +138,6 @@ dynamicProp.spellcheck = propIsSpellcheck; } - - diff --git a/packages/core/src/components/segment/test/basic.html b/packages/core/src/components/segment/test/basic.html index e13bd18e0f..26dbd4eb1b 100644 --- a/packages/core/src/components/segment/test/basic.html +++ b/packages/core/src/components/segment/test/basic.html @@ -103,20 +103,6 @@ } } - -