kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 11:50:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2908 from BKeyport/develop

Browse Source
This commit is contained in:
Michael Teeuw 2022-09-18 07:41:08 +02:00 committed by GitHub
commit e917f40542
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -21,6 +21,7 @@ _This release is scheduled to be released on 2022-10-01._
- Removed DAYAFTERTOMORROW from English - Removed DAYAFTERTOMORROW from English
- Update dependencies - Update dependencies
- Updated jsdoc - Updated jsdoc
- Updated font tree to use variables consistantly
## Fixed ## Fixed

18
css/main.css
View File

@ -8,7 +8,11 @@
--font-secondary: "Roboto"; --font-secondary: "Roboto";
--font-size: 20px; --font-size: 20px;
--font-size-small: 0.75rem; --font-size-xsmall: 0.75rem;
--font-size-small: 1rem;
--font-size-medium: 1.5rem;
--font-size-large: 3.25rem;
--font-size-xlarge: 3.75rem;
--gap-body-top: 60px; --gap-body-top: 60px;
--gap-body-right: 60px; --gap-body-right: 60px;
@ -60,27 +64,27 @@ body {
} }
.xsmall { .xsmall {
font-size: var(--font-size-small); font-size: var(--font-size-xsmall);
line-height: 1.275; line-height: 1.275;
} }
.small { .small {
font-size: 1rem; font-size: var(--font-size-small);
line-height: 1.25; line-height: 1.25;
} }
.medium { .medium {
font-size: 1.5rem; font-size: var(--font-size-medium);
line-height: 1.225; line-height: 1.225;
} }
.large { .large {
font-size: 3.25rem; font-size: var(--font-size-large);
line-height: 1; line-height: 1;
} }
.xlarge { .xlarge {
font-size: 3.75rem; font-size: var(--font-size-xlarge);
line-height: 1; line-height: 1;
letter-spacing: -3px; letter-spacing: -3px;
} }
@ -115,7 +119,7 @@ body {
header { header {
text-transform: uppercase; text-transform: uppercase;
font-size: var(--font-size-small); font-size: var(--font-size-xsmall);
font-family: var(--font-primary), Arial, Helvetica, sans-serif; font-family: var(--font-primary), Arial, Helvetica, sans-serif;
font-weight: 400; font-weight: 400;
border-bottom: 1px solid var(--color-text-dimmed); border-bottom: 1px solid var(--color-text-dimmed);