Skip to content

Commit abc7395

Browse files
committed
fix(content): prefix utility attributes with ion-app and the mode
this makes the utility attribute take precedence over the individual component classes and makes it work per mode again so the padding/margin presets can be changed based on the mode closes #8765
1 parent b194259 commit abc7395

File tree

6 files changed

+46
-42
lines changed

6 files changed

+46
-42
lines changed

src/components/card/test/advanced/main.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@ <h2>Card With An Inset Picture</h2>
8686
</ion-grid>
8787
</ion-card>
8888

89-
<ion-card>
89+
<ion-card no-margin>
9090

9191
<div>
9292
<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAAAAAAALAAAAAABAAEAAAICTAEAOw==">
9393
</div>
9494

9595
<ion-card-content>
96-
This card was breaking the border radius.
96+
ion-card[no-margin] This card was breaking the border radius.
9797
</ion-card-content>
9898

9999
<ion-grid>

src/components/content/content.ios.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ $content-ios-transition-background: #000 !default;
4646
// iOS Content Padding
4747
// --------------------------------------------------
4848

49-
@include content-padding($content-ios-padding);
49+
@include content-padding('ios', $content-ios-padding);
5050

5151

5252
// iOS Content Margin
5353
// --------------------------------------------------
5454

55-
@include content-margin($content-ios-margin);
55+
@include content-margin('ios', $content-ios-margin);
5656

5757

5858
// iOS Content Scroll

src/components/content/content.md.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
// Material Design Content Padding
1717
// --------------------------------------------------
1818

19-
@include content-padding($content-md-padding);
19+
@include content-padding('md', $content-md-padding);
2020

2121

2222
// Material Design Content Margin
2323
// --------------------------------------------------
2424

25-
@include content-margin($content-md-margin);
25+
@include content-margin('md', $content-md-margin);

src/components/content/content.scss

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -84,45 +84,45 @@ ion-content.js-scroll > .scroll-content {
8484
// Content Padding
8585
// --------------------------------------------------
8686

87-
[no-padding],
88-
[no-padding] .scroll-content {
87+
ion-app [no-padding],
88+
ion-app [no-padding] .scroll-content {
8989
padding: 0;
9090
}
9191

92-
@mixin content-padding($content-padding) {
93-
[padding],
94-
[padding] .scroll-content {
92+
@mixin content-padding($mode, $content-padding) {
93+
ion-app.#{$mode} [padding],
94+
ion-app.#{$mode} [padding] .scroll-content {
9595
padding: $content-padding;
9696
}
9797

98-
[padding-top],
99-
[padding-top] .scroll-content {
98+
ion-app.#{$mode} [padding-top],
99+
ion-app.#{$mode} [padding-top] .scroll-content {
100100
padding-top: $content-padding;
101101
}
102102

103-
[padding-left],
104-
[padding-left] .scroll-content {
103+
ion-app.#{$mode} [padding-left],
104+
ion-app.#{$mode} [padding-left] .scroll-content {
105105
padding-left: $content-padding;
106106
}
107107

108-
[padding-right],
109-
[padding-right] .scroll-content {
108+
ion-app.#{$mode} [padding-right],
109+
ion-app.#{$mode} [padding-right] .scroll-content {
110110
padding-right: $content-padding;
111111
}
112112

113-
[padding-bottom],
114-
[padding-bottom] .scroll-content {
113+
ion-app.#{$mode} [padding-bottom],
114+
ion-app.#{$mode} [padding-bottom] .scroll-content {
115115
padding-bottom: $content-padding;
116116
}
117117

118-
[padding-vertical],
119-
[padding-vertical] .scroll-content {
118+
ion-app.#{$mode} [padding-vertical],
119+
ion-app.#{$mode} [padding-vertical] .scroll-content {
120120
padding-top: $content-padding;
121121
padding-bottom: $content-padding;
122122
}
123123

124-
[padding-horizontal],
125-
[padding-horizontal] .scroll-content {
124+
ion-app.#{$mode} [padding-horizontal],
125+
ion-app.#{$mode} [padding-horizontal] .scroll-content {
126126
padding-right: $content-padding;
127127
padding-left: $content-padding;
128128
}
@@ -132,45 +132,45 @@ ion-content.js-scroll > .scroll-content {
132132
// Content Margin
133133
// --------------------------------------------------
134134

135-
[no-margin],
136-
[no-margin] .scroll-content {
135+
ion-app [no-margin],
136+
ion-app [no-margin] .scroll-content {
137137
margin: 0;
138138
}
139139

140-
@mixin content-margin($content-margin) {
141-
[margin],
142-
[margin] .scroll-content {
140+
@mixin content-margin($mode, $content-margin) {
141+
ion-app.#{$mode} [margin],
142+
ion-app.#{$mode} [margin] .scroll-content {
143143
margin: $content-margin;
144144
}
145145

146-
[margin-top],
147-
[margin-top] .scroll-content {
146+
ion-app.#{$mode} [margin-top],
147+
ion-app.#{$mode} [margin-top] .scroll-content {
148148
margin-top: $content-margin;
149149
}
150150

151-
[margin-left],
152-
[margin-left] .scroll-content {
151+
ion-app.#{$mode} [margin-left],
152+
ion-app.#{$mode} [margin-left] .scroll-content {
153153
margin-left: $content-margin;
154154
}
155155

156-
[margin-right],
157-
[margin-right] .scroll-content {
156+
ion-app.#{$mode} [margin-right],
157+
ion-app.#{$mode} [margin-right] .scroll-content {
158158
margin-right: $content-margin;
159159
}
160160

161-
[margin-bottom],
162-
[margin-bottom] .scroll-content {
161+
ion-app.#{$mode} [margin-bottom],
162+
ion-app.#{$mode} [margin-bottom] .scroll-content {
163163
margin-bottom: $content-margin;
164164
}
165165

166-
[margin-vertical],
167-
[margin-vertical] .scroll-content {
166+
ion-app.#{$mode} [margin-vertical],
167+
ion-app.#{$mode} [margin-vertical] .scroll-content {
168168
margin-top: $content-margin;
169169
margin-bottom: $content-margin;
170170
}
171171

172-
[margin-horizontal],
173-
[margin-horizontal] .scroll-content {
172+
ion-app.#{$mode} [margin-horizontal],
173+
ion-app.#{$mode} [margin-horizontal] .scroll-content {
174174
margin-right: $content-margin;
175175
margin-left: $content-margin;
176176
}

src/components/content/content.wp.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
// Windows Content Padding
1717
// --------------------------------------------------
1818

19-
@include content-padding($content-wp-padding);
19+
@include content-padding('wp', $content-wp-padding);
2020

2121

2222
// Windows Content Margin
2323
// --------------------------------------------------
2424

25-
@include content-margin($content-wp-margin);
25+
@include content-margin('wp', $content-wp-margin);

src/components/toolbar/test/scenarios/main.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11

22
<ion-content>
3+
<ion-toolbar no-padding>
4+
<ion-title>This should have no padding</ion-title>
5+
</ion-toolbar>
6+
37
<ion-toolbar no-border-top>
48
<ion-title>This is the title that never ends. It just goes on and on my friend.</ion-title>
59
</ion-toolbar>

0 commit comments

Comments
 (0)