Skip to content

Commit 0e9ea07

Browse files
committed
various changes
1 parent c1e7df8 commit 0e9ea07

File tree

7 files changed

+95
-24
lines changed

7 files changed

+95
-24
lines changed
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
.a-cbm {
2-
@import "buttons.scss";
3-
}
2+
@import "buttons.scss";
3+
@import "heading.scss";
4+
@import "font.scss";
5+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
@import "settings/colors.scss";
2+
@import "settings/font.scss";

sass/styles/applications/coding-blocks/buttons.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
&.disabled,
2929
&:disabled {
30-
background: $lighter-grey;
30+
background: $grey-light-2;
3131
cursor: auto;
3232
}
3333
}
@@ -54,7 +54,7 @@
5454
&:disabled,
5555
&.disabled {
5656
border: 1px solid $light-grey;
57-
color: $light-grey;
57+
color: $grey-light-1;
5858
cursor: auto;
5959

6060
&:hover {
@@ -64,7 +64,7 @@
6464
}
6565

6666
.button-tertiary {
67-
color: $dark-orange;
67+
color: $orange-dark-1;
6868
font-size: $font-sm;
6969
transition: color 0.25s;
7070

@@ -78,7 +78,7 @@
7878

7979
&:disabled,
8080
&.disabled {
81-
color: $light-grey;
81+
color: $grey-light-1;
8282
cursor: auto;
8383
}
8484
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
@each $type, $size in $text-size-list {
2+
.#{$type} {
3+
font-size: $size !important;
4+
}
5+
}
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// @each $number in (1, 2, 3, 4, 5, 6) {
2+
// h#{$number} {
3+
// font-size: $heading-#{$number} !important;
4+
// }
5+
// }
6+
7+
h1 {
8+
font-size: $heading-1;
9+
}
10+
11+
h2 {
12+
font-size: $heading-2;
13+
}
14+
15+
h3 {
16+
font-size: $heading-3;
17+
}
18+
19+
h4 {
20+
font-size: $heading-4;
21+
}
22+
23+
h5 {
24+
font-size: $heading-5;
25+
}
26+
27+
h6 {
28+
font-size: $heading-6;
29+
}

sass/styles/applications/coding-blocks/settings/colors.scss

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,42 @@
22

33
// Neutral colors
44
$black: #08090C;
5-
$dark-grey: #191D24;
6-
$med-grey: #2A2F3C;
5+
$grey-dark-2: #191D24;
6+
$grey-dark-1: #2A2F3C;
77
$grey: #3B4254;
8-
$light-grey: #CCCCCC;
9-
$lighter-grey: #E0E0E0;
10-
$lightest-grey: #F5F5F5;
8+
$grey-light-1: #CCCCCC;
9+
$grey-light-2: #E0E0E0;
10+
$grey-light-3: #F5F5F5;
1111

1212
// Greens
13-
$dark-green: #26A87C;
14-
$med-green: #55C25C;
13+
$green-dark-2: #26A87C;
14+
$green-dark-1: #55C25C;
1515
$green: #6CCE4B;
16-
$light-green: #83DB3B;
16+
$green-light-1: #83DB3B;
1717

1818
// Blues
19-
$dark-blue: #1C40DE;
20-
$med-blue: #2167E3;
19+
$blue-dark-2: #1C40DE;
20+
$blue-dark-1: #2167E3;
2121
$blue: #258EE8;
22-
$light-blue: #2AB5ED;
22+
$blue-light-1: #2AB5ED;
2323

2424
// Reds
2525
$red: #E74E4B;
26-
$dark-orange: #F26A3E;
26+
$orange-dark-1: #F26A3E;
2727
$orange: #FB8133;
2828
$yellow: #FFBA08;
2929

3030
// Purples
31-
$dark-purple: #3A30D6;
32-
$med-purple: #4F33DA;
31+
$purple-dark-2: #3A30D6;
32+
$purple-dark-1: #4F33DA;
3333
$purple: #6536DE;
34-
$light-purple: #8F3CE5;
34+
$purple-light-1: #8F3CE5;
3535

3636
// Pinks
37-
$dark-pink: #A6076C;
38-
$med-pink: #BF1F68;
37+
$pink-dark-2: #A6076C;
38+
$pink-dark-1: #BF1F68;
3939
$pink: #D93764;
40-
$light-pink: #F24F60;
40+
$pink-light-1: #F24F60;
4141

4242

4343
// PALETTE GRADIENTS
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
// Font Sizes
2+
3+
$font-1: 0.75rem; // 10px
4+
$font-2: 0.875rem; // 12px
5+
$font-3: 1rem; // Standard font size - 14px
6+
$font-4: 1.143rem; // 16px
7+
$font-5: 1.286rem; // 18px
8+
9+
$heading-6: 1.428rem; // 20px
10+
$heading-5: 1.713rem; // 24px
11+
$heading-4: 2rem; // 28px
12+
$heading-3: 2.286rem; // 32px
13+
$heading-2: 2.571rem; // 36px
14+
$heading-1: 2.857rem; // 40px
15+
16+
17+
// Font Weights
18+
19+
$extra-bold: 900;
20+
21+
22+
$text-size-list: (
23+
"font-1": $font-1,
24+
"font-2": $font-2,
25+
"font-3": $font-3,
26+
"font-4": $font-4,
27+
"font-5": $font-5,
28+
"heading-6": $heading-6,
29+
"heading-5": $heading-5,
30+
"heading-4": $heading-4,
31+
"heading-3": $heading-3,
32+
"heading-2": $heading-2,
33+
"heading-1": $heading-1,
34+
)

0 commit comments

Comments
 (0)