malhuda/laravel
1
0
Fork 0
mirror of https://github.com/laravel/laravel.git synced 2025-02-20 11:53:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Apply fixes from StyleCI

Browse Source
This commit is contained in:
Dries Vints 2019-04-22 14:06:03 +00:00 committed by StyleCI Bot
parent 43b09ad0f3
commit 91dc5ed286
5 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/js/app.js vendored
View File

@ -1,4 +1,3 @@
/**
* First we will load all of this project's JavaScript dependencies which
* includes Vue and other libraries. It is a great starting point when
@ -29,5 +28,5 @@ Vue.component('example-component', require('./components/ExampleComponent.vue').
*/
const app = new Vue({
el: '#app'
el: '#app',
});

1
resources/js/bootstrap.js vendored
View File

@ -1,4 +1,3 @@
window._ = require('lodash');
/**

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;

5
resources/sass/app.scss vendored
View File

@ -1,4 +1,3 @@
// Fonts
@import url('https://fonts.googleapis.com/css?family=Nunito');
@ -9,6 +8,6 @@
@import '~bootstrap/scss/bootstrap';
.navbar-laravel {
background-color: #fff;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04);
background-color: #fff;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04);
}

3
webpack.mix.js vendored
View File

@ -11,5 +11,4 @@ const mix = require('laravel-mix');
|
*/
mix.js('resources/js/app.js', 'public/js')
.sass('resources/sass/app.scss', 'public/css');
mix.js('resources/js/app.js', 'public/js').sass('resources/sass/app.scss', 'public/css');