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:08:06 +00:00 committed by StyleCI Bot
parent 998cd09781
commit 0e6042fba0
5 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/assets/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
@ -18,5 +17,5 @@ window.Vue = require('vue');
Vue.component('example-component', require('./components/ExampleComponent.vue'));
const app = new Vue({
el: '#app'
el: '#app',
});

1
resources/assets/js/bootstrap.js vendored
View File

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

7
resources/assets/sass/_variables.scss vendored
View File

@ -1,4 +1,3 @@
// Body
$body-bg: #f5f8fa;
@ -10,15 +9,15 @@ $panel-default-border: $laravel-border-color;
$panel-inner-border: $laravel-border-color;
// Brands
$brand-primary: #3097D1;
$brand-primary: #3097d1;
$brand-info: #8eb4cb;
$brand-success: #2ab27b;
$brand-warning: #cbb956;
$brand-danger: #bf5329;
// Typography
$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
$font-family-sans-serif: "Raleway", sans-serif;
$icon-font-path: '~bootstrap-sass/assets/fonts/bootstrap/';
$font-family-sans-serif: 'Raleway', sans-serif;
$font-size-base: 14px;
$line-height-base: 1.6;
$text-color: #636b6f;

7
resources/assets/sass/app.scss vendored
View File

@ -1,9 +1,8 @@
// Fonts
@import url("https://fonts.googleapis.com/css?family=Raleway:300,400,600");
@import url('https://fonts.googleapis.com/css?family=Raleway:300,400,600');
// Variables
@import "variables";
@import 'variables';
// Bootstrap
@import "~bootstrap-sass/assets/stylesheets/bootstrap";
@import '~bootstrap-sass/assets/stylesheets/bootstrap';

3
webpack.mix.js vendored
View File

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