ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
Taylor Otwell
2019-05-06 08:30:56 -05:00
parent 65f8271032 af15618b57
commit 4b78ba61ea
12 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
resources/sass/_variables.scss vendored
View File

@@ -1,9 +1,8 @@
// Body
$body-bg: #f8fafc;
// Typography
$font-family-sans-serif: "Nunito", sans-serif;
$font-family-sans-serif: 'Nunito', sans-serif;
$font-size-base: 0.9rem;
$line-height-base: 1.6;
@@ -11,7 +10,7 @@ $line-height-base: 1.6;
$blue: #3490dc;
$indigo: #6574cd;
$purple: #9561e2;
$pink: #f66D9b;
$pink: #f66d9b;
$red: #e3342f;
$orange: #f6993f;
$yellow: #ffed4a;

1
resources/sass/app.scss vendored
View File

@@ -1,4 +1,3 @@
// Fonts
@import url('https://fonts.googleapis.com/css?family=Nunito');