Skip to content

Commit 81fba47

Browse files
authored
Merge pull request laravel#4998 from laravel/analysis-z9QV6a
Apply fixes from StyleCI
2 parents 43b09ad + 91dc5ed commit 81fba47

File tree

5 files changed

+6
-11
lines changed

5 files changed

+6
-11
lines changed

resources/js/app.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
/**
32
* First we will load all of this project's JavaScript dependencies which
43
* includes Vue and other libraries. It is a great starting point when
@@ -29,5 +28,5 @@ Vue.component('example-component', require('./components/ExampleComponent.vue').
2928
*/
3029

3130
const app = new Vue({
32-
el: '#app'
31+
el: '#app',
3332
});

resources/js/bootstrap.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
window._ = require('lodash');
32

43
/**

resources/sass/_variables.scss

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
21
// Body
32
$body-bg: #f8fafc;
43

54
// Typography
6-
$font-family-sans-serif: "Nunito", sans-serif;
5+
$font-family-sans-serif: 'Nunito', sans-serif;
76
$font-size-base: 0.9rem;
87
$line-height-base: 1.6;
98

109
// Colors
1110
$blue: #3490dc;
1211
$indigo: #6574cd;
1312
$purple: #9561e2;
14-
$pink: #f66D9b;
13+
$pink: #f66d9b;
1514
$red: #e3342f;
1615
$orange: #f6993f;
1716
$yellow: #ffed4a;

resources/sass/app.scss

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
// Fonts
32
@import url('https://fonts.googleapis.com/css?family=Nunito');
43

@@ -9,6 +8,6 @@
98
@import '~bootstrap/scss/bootstrap';
109

1110
.navbar-laravel {
12-
background-color: #fff;
13-
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04);
11+
background-color: #fff;
12+
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04);
1413
}

webpack.mix.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@ const mix = require('laravel-mix');
1111
|
1212
*/
1313

14-
mix.js('resources/js/app.js', 'public/js')
15-
.sass('resources/sass/app.scss', 'public/css');
14+
mix.js('resources/js/app.js', 'public/js').sass('resources/sass/app.scss', 'public/css');

0 commit comments

Comments
 (0)