aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/sass/include
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/sass/include')
-rw-r--r--client/src/sass/include/_fonts.scss34
-rw-r--r--client/src/sass/include/_mixins.scss6
-rw-r--r--client/src/sass/include/_variables.scss1
3 files changed, 19 insertions, 22 deletions
diff --git a/client/src/sass/include/_fonts.scss b/client/src/sass/include/_fonts.scss
index dd1cbadb3..be1132160 100644
--- a/client/src/sass/include/_fonts.scss
+++ b/client/src/sass/include/_fonts.scss
@@ -1,23 +1,15 @@
1$FontPathSourceSansPro: '~npm-font-source-sans-pro/fonts'; 1@font-face{
2$basePath: '#{$FontPathSourceSansPro}/WOFF2/TTF/SourceSansPro'; 2 font-family: 'Source Sans Pro';
3 3 font-weight: 200 900;
4@mixin fontface($name, $path, $weight: null, $style: null, $exts: woff2) { 4 font-style: normal;
5 $src: null; 5 font-stretch: normal;
6 @each $ext in $exts { 6 src: url('../fonts/source-sans/WOFF2/VAR/SourceSans3VF-Roman.ttf.woff2') format('woff2');
7 $src: append($src, url(quote($path + "." + $ext)) format(quote($ext)), comma);
8 }
9 @font-face {
10 font-family: quote($name);
11 font-weight: $weight;
12 font-style: $style;
13 font-stretch: normal;
14 font-display: swap;
15 src: $src;
16 }
17} 7}
18 8
19@include fontface('Source Sans Pro', '#{$basePath}-Regular.ttf', 400, normal); 9@font-face{
20@include fontface('Source Sans Pro', '#{$basePath}-It.ttf', 400, italic); 10 font-family: 'Source Sans Pro';
21@include fontface('Source Sans Pro', '#{$basePath}-Semibold.ttf', 600, normal); 11 font-weight: 200 900;
22@include fontface('Source Sans Pro', '#{$basePath}-SemiboldIt.ttf', 600, italic); 12 font-style: italic;
23@include fontface('Source Sans Pro', '#{$basePath}-Bold.ttf', 700, normal); \ No newline at end of file 13 font-stretch: normal;
14 src: url('../fonts/source-sans/WOFF2/VAR/SourceSans3VF-Italic.ttf.woff2') format('woff2');
15}
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 10ab44f57..0ce22354e 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -180,6 +180,7 @@
180 180
181@mixin grey-button { 181@mixin grey-button {
182 @include button-focus($grey-button-outline-color); 182 @include button-focus($grey-button-outline-color);
183
183 background-color: $grey-background-color; 184 background-color: $grey-background-color;
184 color: pvar(--greyForegroundColor); 185 color: pvar(--greyForegroundColor);
185 186
@@ -247,6 +248,10 @@
247} 248}
248 249
249@mixin button-with-icon($width: 20px, $margin-right: 3px, $top: -1px) { 250@mixin button-with-icon($width: 20px, $margin-right: 3px, $top: -1px) {
251 display: inline-flex;
252 align-items: center;
253 line-height: normal !important;
254
250 my-global-icon { 255 my-global-icon {
251 position: relative; 256 position: relative;
252 width: $width; 257 width: $width;
@@ -807,7 +812,6 @@
807 .dashboard-num, .dashboard-text { 812 .dashboard-num, .dashboard-text {
808 text-align: center; 813 text-align: center;
809 font-size: 130%; 814 font-size: 130%;
810 line-height: 21px;
811 color: pvar(--mainForegroundColor); 815 color: pvar(--mainForegroundColor);
812 line-height: 30px; 816 line-height: 30px;
813 margin-bottom: 20px; 817 margin-bottom: 20px;
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss
index b1e0431bb..acdc8d05f 100644
--- a/client/src/sass/include/_variables.scss
+++ b/client/src/sass/include/_variables.scss
@@ -7,6 +7,7 @@ $main-fonts: 'Source Sans Pro', sans-serif;
7$font-regular: 400; 7$font-regular: 400;
8$font-semibold: 600; 8$font-semibold: 600;
9$font-bold: 700; 9$font-bold: 700;
10$line-height-normal: 1.2;
10 11
11$grey-background-color: #E5E5E5; 12$grey-background-color: #E5E5E5;
12$grey-background-hover-color: #EFEFEF; 13$grey-background-hover-color: #EFEFEF;