Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add CSS Properties #2515

Merged
merged 26 commits into from
Apr 15, 2021
Merged

Add CSS Properties #2515

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
93aa4b7
update README.md
earlman Apr 1, 2021
b842241
fix broken start scripts & yarn
earlman Apr 1, 2021
f0f370c
add *.env to .gitignore
earlman Apr 1, 2021
549417f
yarn
earlman Apr 1, 2021
2b7aa3e
use yarn
earlman Apr 1, 2021
01e5936
install valid-url
earlman Apr 2, 2021
3e8bd02
add custom variables
earlman Apr 2, 2021
162dcec
Merge branch 'master' of https://github.com/foundations-design/WhiteL…
earlman Apr 3, 2021
7ad12d9
add original main.css bak
earlman Apr 4, 2021
e16986c
Merge branch 'develop' of https://github.com/MichMich/MagicMirror int…
earlman Apr 4, 2021
8380173
add color variables
earlman Apr 4, 2021
ff43d08
base line-height on scale
earlman Apr 4, 2021
d46784a
base font sizes on rem and var(--base)
earlman Apr 4, 2021
f9c78a5
use variables for fonts
earlman Apr 4, 2021
ff8c2fe
add custom.css.sample
earlman Apr 4, 2021
50c702c
adjust new opacities
earlman Apr 4, 2021
ba0c597
update CHANGELOG.md
earlman Apr 4, 2021
1cabe10
run prettier
earlman Apr 4, 2021
e8031ae
add original main.css bak
earlman Apr 4, 2021
3588875
Update .gitignore
earlman Apr 4, 2021
c68b39d
Merge branch 'css-properties'
earlman Apr 8, 2021
0d698fb
Merge remote-tracking branch 'upstream/develop' into contribute
earlman Apr 8, 2021
fdd6659
delete useless file
earlman Apr 8, 2021
f97d2e2
revert 'dimming' method
earlman Apr 8, 2021
eca35b2
change --base to --font-size
earlman Apr 8, 2021
564bf47
update sample css
earlman Apr 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
change --base to --font-size
  • Loading branch information
@earlman
earlman committed Apr 8, 2021
commit eca35b2371aeafbe74a80355c34f5f720c1e3ac1
4 changes: 2 additions & 2 deletions css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
--color-text-dimmed: #666;
--color-text-bright: #fff;
--color-background: black;
--base: 20px;
--font-size: 20px;
--font-primary: "Roboto Condensed";
--font-secondary: "Roboto";
}
Expand All @@ -13,7 +13,7 @@ html {
overflow: hidden;
background: var(--color-background);
user-select: none;
font-size: var(--base);
font-size: var(--font-size);
}

::-webkit-scrollbar {
Expand Down