Merge branch 'release/4.1.1'

* release/4.1.1: Fixing the font paths
austintoddj · Feb 10, 2019 · 34a11c9 · 34a11c9
2 parents 50aba11 + 739e36c
commit 34a11c9
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/public/app.css b/public/app.css
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,5 +1,5 @@
 {
     "/app.js": "/app.js?id=a1bbfa8127d35ee1a71b",
-    "/app.css": "/app.css?id=bda34711dea8821a4299",
+    "/app.css": "/app.css?id=2586c05a868097189501",
     "/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/stubs/views/blog/partials/styles.stub b/stubs/views/blog/partials/styles.stub
@@ -195,13 +195,28 @@
     }
 
     .welcome {
+        font-weight: 400;
         font-family: "Merriweather", serif;
     }
 
     .welcome span {
         color: #9ba3aa;
     }
 
+    .btn-primary {
+        color: #fff;
+        background-color: #3490dc;
+        border-color: #3490dc;
+        padding: .375rem .75rem;
+        font-size: .9rem;
+        line-height: 1.6;
+    }
+
+    .btn-primary:hover {
+        background-color: #227dc7;
+        border-color: #2176bd;
+    }
+
     @media screen and (max-width: 1024px) {
         .content-body .embedded_image[data-layout=wide] img {
             max-width: 100%

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