opensource/filestash
1
0
Fork 0
mirror of https://github.com/mickael-kerjean/filestash.git synced 2025-11-01 10:56:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

improvement (font): Embedded Google Font (#106)

Browse Source 
Fixes #102
This commit is contained in:
Lewis Cowles
2018-09-27 13:38:06 +01:00
committed by Mickael KERJEAN
parent 8f62551787
commit 13b75fd4aa
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client/assets/css/reset.scss
View File

@ -50,28 +50,15 @@
--secondary: #466372;
--emphasis-secondary: #466372;
--light: #909090;
<<<<<<< HEAD
<<<<<<< HEAD
--super-light: #f4f4f4;
=======
--super-light: #F7F9FA;
>>>>>>> 801aef8... improvement (incremental): update colors and improve page when current folder is empty
=======
--super-light: #f9fafc;
>>>>>>> 384b3e0... feature (Share): workable version for sharing
--error: #f26d6d;
--success: #63d9b1;
--dark: #313538;
}
html {
<<<<<<< HEAD
font-family: "San Francisco", "Roboto", "Arial", sans-serif;
-webkit-text-size-adjust: 100%;
=======
font-family: "Roboto", sans-serif;
-webkit-text-size-adjust:100%;
>>>>>>> 801aef8... improvement (incremental): update colors and improve page when current folder is empty
background: var(--bg-color);
color: var(--color);
}
@ -205,4 +192,4 @@ select:-moz-focusring {
.pointer {
cursor: pointer;
}
}