Skip to content

Commit 9184318

Browse files
authored
Merge pull request #812 from ember-learn/jw-cm-sass-format
Update SCSS division syntax
2 parents 241bd84 + ecdd69c commit 9184318

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

app/styles/base/_forms.scss

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use "sass:math";
2+
13
fieldset {
24
background-color: lighten($base-border-color, 10%);
35
border: $base-border;
@@ -28,7 +30,7 @@ select {
2830

2931
label {
3032
font-weight: 600;
31-
margin-bottom: $small-spacing / 2;
33+
margin-bottom: math.div($small-spacing, 2);
3234

3335
&.required::after {
3436
content: "*";
@@ -48,8 +50,8 @@ textarea {
4850
box-sizing: border-box;
4951
font-family: $base-font-family;
5052
font-size: $base-font-size;
51-
margin-bottom: $base-spacing / 2;
52-
padding: $base-spacing / 3;
53+
margin-bottom: math.div($base-spacing, 2);
54+
padding: math.div($base-spacing, 3);
5355
transition: border-color;
5456
width: 100%;
5557

@@ -72,7 +74,7 @@ textarea {
7274
input[type="checkbox"],
7375
input[type="radio"] {
7476
display: inline;
75-
margin-right: $small-spacing / 2;
77+
margin-right: math.div($small-spacing, 2);
7678
}
7779

7880
input[type="file"] {

app/styles/base/_variables.scss

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use "sass:math";
2+
13
// Typography
24
$base-font-family: 'Source Sans Pro', sans-serif;
35
$heading-font-family: $base-font-family;
@@ -15,7 +17,7 @@ $heading-line-height: 1.2;
1517

1618
// Spacing
1719
$base-spacing: $base-line-height * 1em;
18-
$small-spacing: $base-spacing / 2;
20+
$small-spacing: math.div($base-spacing, 2);
1921
$large-spacing: $base-spacing * 2;
2022
$top-spacing: $base-spacing * 3.333; // 80px
2123

0 commit comments

Comments
 (0)