Browse Source

Merge pull request #4998 from laravel/analysis-z9QV6a

Apply fixes from StyleCI
Dries Vints 5 years ago
parent
commit
81fba471af
5 changed files with 6 additions and 11 deletions
  1. 1 2
      resources/js/app.js
  2. 0 1
      resources/js/bootstrap.js
  3. 2 3
      resources/sass/_variables.scss
  4. 2 3
      resources/sass/app.scss
  5. 1 2
      webpack.mix.js

+ 1 - 2
resources/js/app.js

@@ -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',
 });

+ 0 - 1
resources/js/bootstrap.js

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

+ 2 - 3
resources/sass/_variables.scss

@@ -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;

+ 2 - 3
resources/sass/app.scss

@@ -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);
 }

+ 1 - 2
webpack.mix.js

@@ -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');