VSinerva/freesewing
1
0
Fork 0
Code Activity

feat: Include fonts in CSS theme

Browse source
This commit is contained in:
Joost De Cock 2021-01-10 10:27:39 +01:00
parent 4a61ef922a
commit db77cf8df0
7 changed files with 19 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

10
packages/css-theme/src/_fonts.scss Normal file
View file

@ -0,0 +1,10 @@
@import "~@fontsource/ubuntu/400.css";
@import "~@fontsource/ubuntu/500.css";
@import "~@fontsource/ubuntu/700.css";
@import "~@fontsource/ubuntu/400-italic.css";
@import "~@fontsource/ubuntu/500-italic.css";
@import "~@fontsource/roboto-mono/400.css";
@import "~@fontsource/roboto-mono/600.css";
@import "~@fontsource/roboto-mono/400-italic.css";
@import "~@fontsource/permanent-marker/index.css";

2
packages/css-theme/src/_reset.scss
View file

@ -4,7 +4,7 @@ body {
line-height: 1.5; line-height: 1.5;
scroll-behavior: smooth; scroll-behavior: smooth;
font-family: Ubuntu; font-family: Ubuntu;
font-weight: 300; font-weight: 400;
} }
img { img {
max-width: 100%; max-width: 100%;

18
packages/css-theme/src/_utility.scss
View file

@ -48,33 +48,15 @@
font-family: 'Permanent marker'; font-family: 'Permanent marker';
color: $oc-pink-5; color: $oc-pink-5;
} }
.fw-100 {
font-weight: 100;
}
.fw-200 {
font-weight: 200;
}
.fw-300 {
font-weight: 300;
}
.fw-400 { .fw-400 {
font-weight: 400; font-weight: 400;
} }
.fw-500 { .fw-500 {
font-weight: 500; font-weight: 500;
} }
.fw-600 {
font-weight: 600;
}
.fw-700 { .fw-700 {
font-weight: 700; font-weight: 700;
} }
.fw-800 {
font-weight: 800;
}
.fw-900 {
font-weight: 900;
}
ul.inline { ul.inline {
list-style-type: none; list-style-type: none;

6
packages/css-theme/src/components/_draft-configurator.scss
View file

@ -49,7 +49,7 @@ ul#draft-config {
} }
ul.config.level-1 > li { ul.config.level-1 > li {
font-size: 1.25rem; font-size: 1.25rem;
font-weight: normal; font-weight: 400;
> div { > div {
padding: 0.2rem 0.5rem 0.1rem 0.5rem; padding: 0.2rem 0.5rem 0.1rem 0.5rem;
} }
@ -73,7 +73,7 @@ ul#draft-config {
} }
ul.config.level-2 > li { ul.config.level-2 > li {
font-size: 1.15rem; font-size: 1.15rem;
font-weight: normal; font-weight: 400;
> span, > span,
> div:first-of-type { > div:first-of-type {
padding: 0.3rem 0.5rem 0.2rem 2rem; padding: 0.3rem 0.5rem 0.2rem 2rem;
@ -106,7 +106,7 @@ ul#draft-config {
} }
ul.config.level-3 > li { ul.config.level-3 > li {
font-size: 1.1rem; font-size: 1.1rem;
font-weight: normal; font-weight: 400;
> div:first-of-type { > div:first-of-type {
padding: 0.3rem 0.5rem 0.2rem 3rem; padding: 0.3rem 0.5rem 0.2rem 3rem;
line-height: 1.2; line-height: 1.2;

4
packages/css-theme/src/components/_draft.scss
View file

@ -59,7 +59,7 @@ svg.freesewing.draft {
font-size: 6px; font-size: 6px;
@include title-font; @include title-font;
text-anchor: start; text-anchor: start;
font-weight: 200; font-weight: 400;
dominant-baseline: ideographic; dominant-baseline: ideographic;
} }
.text-xs { .text-xs {
@ -93,7 +93,7 @@ svg.freesewing.draft {
text.title-nr { text.title-nr {
font-size: 32px; font-size: 32px;
@include title-font; @include title-font;
font-weight: bold; font-weight: 700;
stroke: none; stroke: none;
} }
/* New style for sampled sizes */ /* New style for sampled sizes */

4
packages/css-theme/src/components/_main-menu.scss
View file

@ -34,7 +34,7 @@ ul#main-menu {
ul { ul {
margin: 0; margin: 0;
padding: 0; padding: 0;
font-weight: normal; font-weight: 400;
text-transform: none; text-transform: none;
} }
ul[class^='level-'] { ul[class^='level-'] {
@ -42,7 +42,7 @@ ul#main-menu {
line-height: 1.5; line-height: 1.5;
> a { > a {
padding: 0; padding: 0;
font-weight: 300; font-weight: 400;
text-transform: none; text-transform: none;
} }
> a:before { > a:before {

1
packages/css-theme/src/theme.scss
View file

@ -2,6 +2,7 @@
@import '../../../node_modules/open-color/open-color.scss'; @import '../../../node_modules/open-color/open-color.scss';
@import 'variables'; @import 'variables';
@import 'mixins'; @import 'mixins';
@import 'fonts';
@import 'prism'; @import 'prism';
@import 'theme-wrapper'; @import 'theme-wrapper';
@import 'typography'; @import 'typography';