Skip to content
This repository was archived by the owner on Jun 10, 2025. It is now read-only.

Commit cdf804c

Browse files
committed
fix inherit param in styles & include functions in variables
1 parent 0af2cc2 commit cdf804c

File tree

2 files changed

+12
-20
lines changed

2 files changed

+12
-20
lines changed

src/scss/abstracts/variables.scss

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import 'functions';
2+
13
// Global variables
24

35
// 'rem' base value
@@ -57,19 +59,19 @@ $media-expressions: (
5759
--btn-color: var(--color-white);
5860
--btn-background: var(--color-blue);
5961
--btn-padding: 0.4em 0.7em;
60-
--btn-font-size: inherit;
61-
--btn-font-family: inherit;
62+
--btn-font-size: 1.6rem;
63+
--btn-font-family: var(--font-sans-serif);
6264

6365
// Forms base
64-
--form-font-family: inherit;
66+
--form-font-family: var(--font-sans-serif);
6567
--form-element-padding: var(--btn-padding);
6668
--form-element-border-color: var(--color-grey);
6769
--form-element-focus-border-color: var(--color-black);
6870
--placeholder-color: var(--color-grey);
6971

7072
// Headings base
71-
--headings-font-family: inherit;
72-
--headings-color: inherit;
73+
--headings-font-family: var(--font-sans-serif);
74+
--headings-color: var(--base-text-color);
7375

7476
// Base font styles for headings
7577
--headings-sizes-h1: 3rem;

src/scss/base/reset.scss

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
//
33
// Note: If you use a framework that includes base styling then you need to remove this file.
44

5-
html {
6-
box-sizing: border-box;
7-
font-size: 62.5%;
8-
}
95
*,
106
*:before,
117
*:after {
12-
box-sizing: inherit;
8+
box-sizing: border-box;
9+
}
10+
11+
html {
12+
font-size: 62.5%;
1313
}
1414

1515
body {
@@ -30,13 +30,3 @@ img {
3030
.gm-style img {
3131
max-width: none;
3232
}
33-
34-
// hide tel links on desktop
35-
@include media('screen', '>desktop') {
36-
a[href^='tel'],
37-
a[href^='skype'],
38-
a[href^='sms'] {
39-
cursor: default;
40-
pointer-events: none;
41-
}
42-
}

0 commit comments

Comments
 (0)