Merge branch 'release/4.1.2'

* release/4.1.2: compiling assets wip
austintoddj · Feb 11, 2019 · 2cb6867 · 2cb6867
2 parents 34a11c9 + 3e4c7ce
commit 2cb6867
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 16 deletions.
diff --git a/public/app.js b/public/app.js
diff --git a/public/app.css → public/css/app.css b/public/app.css → public/css/app.css
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/js/app.js.map b/public/js/app.js.map
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,5 +1,6 @@
 {
-    "/app.js": "/app.js?id=a1bbfa8127d35ee1a71b",
-    "/app.css": "/app.css?id=2586c05a868097189501",
+    "/js/app.js": "/js/app.js?id=cab446fe67c77f318dd0",
+    "/css/app.css": "/css/app.css?id=bda34711dea8821a4299",
+    "/js/app.js.map": "/js/app.js.map?id=80a9c6938a70e635658a",
     "/favicon.png": "/favicon.png?id=39d853e8c2bdbc38fde3"
 }
diff --git a/resources/sass/variables.scss b/resources/sass/variables.scss
@@ -2,7 +2,7 @@
 // Typography
 $font-family-sans-serif: "Nunito", sans-serif;
 $font-family-serif: "Merriweather", serif;
-$fa-font-path: "fonts" !default;
+$fa-font-path: "../fonts" !default;
 $font-size-base: 0.9rem;
 $line-height-base: 1.6;
 

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -18,7 +18,7 @@
     <link rel="stylesheet" href="{{ url('https://cdn.jsdelivr.net/gh/highlightjs/[email protected]/build/styles/github.min.css') }}">
 
     <!-- Style sheets -->
-    <link rel="stylesheet" type="text/css" href="{{ mix('app.css', 'vendor/canvas') }}">
+    <link rel="stylesheet" type="text/css" href="{{ mix('css/app.css', 'vendor/canvas') }}">
 
     <!-- Additional style sheets -->
     @stack('styles')
@@ -29,7 +29,7 @@
     </div>
 
     <!-- Application scripts -->
-    <script type="text/javascript" src="{{ mix('app.js', 'vendor/canvas') }}"></script>
+    <script type="text/javascript" src="{{ mix('js/app.js', 'vendor/canvas') }}"></script>
 
     <!-- Additional scripts -->
     @stack('scripts')

diff --git a/stubs/views/blog/partials/styles.stub b/stubs/views/blog/partials/styles.stub
@@ -54,8 +54,8 @@
     }
 
     a, .btn-link {
-      color: #3490dc;
-      text-decoration: none !important;
+        color: #3490dc;
+        text-decoration: none !important;
     }
 
     .btn-outline-primary {
@@ -75,16 +75,16 @@
     }
 
     .serif {
-      font-family: "Merriweather", serif;
+        font-family: "Merriweather", serif;
     }
 
     .sans-serif {
-      font-family: "Nunito", sans-serif;
+        font-family: "Nunito", sans-serif;
     }
 
     .logo {
-      font-family: "Merriweather", serif;
-      font-size: 20px;
+        font-family: "Merriweather", serif;
+        font-size: 20px;
     }
 
     .logo span {
@@ -212,7 +212,7 @@
         line-height: 1.6;
     }
 
-    .btn-primary:hover {
+    .btn-primary:hover, .btn-outline-primary:hover {
         background-color: #227dc7;
         border-color: #2176bd;
     }

diff --git a/webpack.mix.js b/webpack.mix.js
@@ -22,7 +22,9 @@ mix
         }
     })
     .setPublicPath('public')
-    .js('resources/js/app.js', 'public')
-    .sass('resources/sass/app.scss', 'public')
+    .setResourceRoot('../')
+    .js('resources/js/app.js', 'public/js')
+    .sass('resources/sass/app.scss', 'public/css')
     .copy('resources/favicon.png', 'public')
+    .sourceMaps()
     .version();