Skip to content

Commit 02a655b

Browse files
committed
added plotly fonts, added header style mixin, applied heading styles sparsely
1 parent 67cf1da commit 02a655b

File tree

6 files changed

+52
-23
lines changed

6 files changed

+52
-23
lines changed

src/styles/_mixins.scss

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,29 +59,28 @@
5959

6060
@mixin button($variant: default) {
6161
background-color: var(--color-button-#{$variant}-base-fill);
62-
border-color:var(--color-button-#{$variant}-base-border);
62+
border-color: var(--color-button-#{$variant}-base-border);
6363
color: var(--color-button-#{$variant}-base-text);
6464

65-
@if($variant == primary or $variant == upgrade){
65+
@if ($variant == primary or $variant == upgrade) {
6666
text-shadow: $text-shadow--dark-ui;
67-
svg{
67+
svg {
6868
@include drop-shadow--dark-ui;
6969
}
7070
}
7171

7272
&:hover {
7373
background-color: var(--color-button-#{$variant}-hover-fill);
74-
border:1px solid var(--color-button-#{$variant}-hover-border);
74+
border: 1px solid var(--color-button-#{$variant}-hover-border);
7575
color: var(--color-button-#{$variant}-hover-text);
7676
}
7777
&:active {
7878
background-color: var(--color-button-#{$variant}-active-fill);
79-
border:1px solid var(--color-button-#{$variant}-active-border);
79+
border: 1px solid var(--color-button-#{$variant}-active-border);
8080
color: var(--color-button-#{$variant}-active-text);
8181
}
8282
}
8383

84-
8584
@mixin generateVars() {
8685
// Base Color Variables
8786
@each $var, $val in $colors {
@@ -165,3 +164,28 @@
165164
#{--sidebar}-#{$var}: $val;
166165
}
167166
}
167+
168+
@mixin heading($type: 'base') {
169+
@if ($type == 'small') {
170+
color: var(--color-text-header);
171+
font-size: var(--font-size-heading-small);
172+
font-weight: var(--font-weight-normal);
173+
line-height: var(--font-leading-head);
174+
font-family: var(--font-family-headings);
175+
letter-spacing: 0.5px;
176+
} @else if ($type == 'medium') {
177+
color: var(--color-text-header);
178+
font-size: var(--font-size-heading-medium);
179+
font-weight: var(--font-weight-normal);
180+
line-height: var(--font-leading-head);
181+
font-family: var(--font-family-headings);
182+
letter-spacing: 0.5px;
183+
} @else {
184+
color: var(--color-text-header);
185+
font-size: var(--font-size-heading-base);
186+
font-weight: var(--font-weight-normal);
187+
line-height: var(--font-leading-head);
188+
font-family: var(--font-family-headings);
189+
letter-spacing: 0.5px;
190+
}
191+
}

src/styles/components/containers/_info.scss

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
.info {
22
&__title {
3-
color: var(--color-text-header);
4-
font-size: var(--font-size-medium);
5-
font-weight: var(--font-weight-semibold);
6-
line-height: var(--font-leading-head);
3+
@include heading('small');
74
padding: var(--spacing-half-unit) var(--spacing-half-unit)
85
var(--spacing-quarter-unit) var(--spacing-half-unit);
96
}

src/styles/components/containers/_menupanel.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
display: flex;
44
justify-content: flex-end;
55
flex-grow: 1;
6+
67
&--ownline {
78
padding-top: var(--spacing-quarter-unit);
9+
width: 100%;
810
}
911
&__label {
1012
font-weight: var(--font-weight-semibold);

src/styles/components/containers/_panel.scss

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@
4747
}
4848
}
4949
&__heading {
50-
color: var(--color-text-header);
51-
font-size: var(--font-size-large);
52-
font-weight: var(--font-weight-semibold);
50+
@include heading();
5351
}
5452
&__content {
5553
font-size: var(--font-size-base);

src/styles/components/fields/_field.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
min-height: 32px;
1111
padding: var(--spacing-quarter-unit) 0;
1212
width: 100%;
13+
position: relative;
1314
&__no-title {
1415
width: 100%;
1516
padding: 0 var(--spacing-half-unit);

src/styles/variables/_typography.scss

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
1-
$default-font-weight-light: 400;
2-
$default-font-weight-normal: 400;
3-
$default-font-weight-semibold: 600;
4-
$default-font-weight-bold: 700;
5-
$default-font-size: 13px;
6-
$default-font-size-small: 12px;
7-
$default-font-size-medium: 14px;
8-
$default-h5-size: 16px;
1+
@import url('https://fonts.googleapis.com/css?family=Dosis:500,700|Open+Sans:400,400i,600,700');
92

103
$font-weight-light: 400;
114
$font-weight-normal: 400;
@@ -17,7 +10,17 @@ $font-size-medium: 14px;
1710
$h5-size: 16px;
1811

1912
$font: (
20-
size: (base: 13px, small: 11px, medium:14px, large:16px, h5: 16px),
13+
size:
14+
(
15+
base: 13px,
16+
small: 11px,
17+
medium:14px,
18+
large:16px,
19+
heading-base: 24px,
20+
heading-small: 18px,
21+
heading-large: 28px,
22+
h5: 16px
23+
),
2124
weight:
2225
(
2326
light: $font-weight-light,
@@ -26,5 +29,9 @@ $font: (
2629
bold: $font-weight-bold
2730
),
2831
leading: (body: 1.6, head: 1.2),
29-
family: (body: ('Open Sans', --apple-default, sans-serif))
32+
family:
33+
(
34+
body: ('Open Sans', --apple-default, sans-serif),
35+
headings: ('Dosis', sans-serif)
36+
)
3037
);

0 commit comments

Comments
 (0)