diff --git a/public/css/app.css b/public/css/app.css index 6b146df26..10df2433b 100644 Binary files a/public/css/app.css and b/public/css/app.css differ diff --git a/public/js/app.js b/public/js/app.js index 0107955d6..ae8eccafc 100644 Binary files a/public/js/app.js and b/public/js/app.js differ diff --git a/resources/assets/sass/_variables.scss b/resources/assets/sass/_variables.scss index 70ecfdb39..276355396 100644 --- a/resources/assets/sass/_variables.scss +++ b/resources/assets/sass/_variables.scss @@ -3,6 +3,6 @@ $body-bg: #f5f8fa; // Typography -$font-family-sans-serif: "Raleway", sans-serif; -$font-size-base: 0.9rem; +$font-family-sans-serif: "Roboto", sans-serif; +$font-size-base: 1rem; $line-height-base: 1.6; diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index 0077cb141..ae5d490bc 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -1,6 +1,6 @@ // Fonts -@import url("https://fonts.googleapis.com/css?family=Raleway:300,400,600"); +@import url("https://fonts.googleapis.com/css?family=Roboto:300,400,600"); // Variables @import "variables"; @@ -8,7 +8,4 @@ // Bootstrap @import '~bootstrap/scss/bootstrap'; -.navbar-laravel { - background-color: #fff; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04); -} +@import "custom"; diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss new file mode 100644 index 000000000..e2103a7d8 --- /dev/null +++ b/resources/assets/sass/custom.scss @@ -0,0 +1,4 @@ +.navbar-laravel { + background-color: #fff; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04); +} \ No newline at end of file