Fix font paths, remove sass comments in webpack dev server styles (#611)

phase2 · Sep 10, 2019 · 849f226 · 849f226
1 parent 6880b80
commit 849f226
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 14 deletions.
diff --git a/apps/node-pl/particle.app.config.js b/apps/node-pl/particle.app.config.js
@@ -18,7 +18,7 @@ const APP_DESIGN_SYSTEM = path.resolve(__dirname, '../../source/default');
 // Where should this app compile to, e.g. dist/app-drupal/assets/
 const APP_DIST = path.join(PATH_DIST, APP_NAME, ASSETS_BUNDLE_FOLDER);
 // Base path for all assets
-const APP_DIST_PUBLIC = path.join(APP_NAME, ASSETS_BUNDLE_FOLDER);
+const APP_DIST_PUBLIC = `/${path.join(APP_NAME, ASSETS_BUNDLE_FOLDER)}`;
 
 module.exports = {
   APP_NAME,

diff --git a/source/default/_data/scssVariables.json b/source/default/_data/scssVariables.json
@@ -39,10 +39,10 @@
     "6": "4rem"
   },
   "fontFamilies": {
-    "$font-family-sans-serif": "Open Sans, Helvetica Neue, Helvetica, Arial, sans-serif",
-    "$font-family-serif": "Oswald, Times New Roman, serif",
-    "$font-family-monospace": "Source Code Pro, Courier New, monospace",
-    "$headings-font-family": "Open Sans, Helvetica Neue, Helvetica, Arial, sans-serif"
+    "$font-family-sans-serif": "Open Sans,Helvetica Neue,Helvetica,Arial,sans-serif",
+    "$font-family-serif": "Oswald,Times New Roman,serif",
+    "$font-family-monospace": "Source Code Pro,Courier New,monospace",
+    "$headings-font-family": "Oswald,Times New Roman,serif"
   },
   "fontSizes": {
     "base": "1rem",

diff --git a/source/default/tokens/sass/non-printing/_bootstrap-overrides.scss b/source/default/tokens/sass/non-printing/_bootstrap-overrides.scss
@@ -90,7 +90,7 @@ $font-family-sans-serif: map-get($font-families, 'sans');
 $font-family-monospace: map-get($font-families, 'monospace');
 $font-family-base: $font-family-sans-serif;
 
-$headings-font-family: $font-family-sans-serif;
+$headings-font-family: $font-family-serif;
 
 /*
 ----------------------------------------

diff --git a/source/default/tokens/sass/non-printing/functions/_operators.scss b/source/default/tokens/sass/non-printing/functions/_operators.scss
@@ -12,7 +12,7 @@ Operator Functions
 */
 
 /**
- * Concert to Rem
+ * Convert to Rem
  *   Does the main work of converting to a standardized unit by stripping a number
  *   and multiplying by the rem value.
  */

diff --git a/source/default/tokens/sass/printing/_type.scss b/source/default/tokens/sass/printing/_type.scss
@@ -27,6 +27,6 @@ are provided to this file via: webpack.particle.js: sass-loader.data
 //  font-family: 'Oswald';
 //  font-style: normal;
 //  font-weight: 400;
-//  src: local('Oswald Regular'), local('Oswald-Regular'), url(../fonts/Oswald-Medium.ttf) format('truetype');
+//  src: local('Oswald Regular'), local('Oswald-Regular'), url(../../fonts/Oswald-Medium.ttf) format('truetype');
 //  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 //}
diff --git a/webpack.particle.js b/webpack.particle.js
@@ -79,6 +79,7 @@ module.exports = {
             loader: 'sass-loader',
             options: {
               sourceMap: true,
+              outputStyle: 'compressed',
             },
           },
         ],
@@ -106,16 +107,12 @@ module.exports = {
         },
       },
       {
-        // base64 encode all referenced font files for simple loading.
         test: /\.(woff|woff2|eot|ttf|otf)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
         use: [
           {
-            loader: 'url-loader',
+            loader: 'file-loader',
             options: {
-              // If a font file is over 1k, output below fonts directory.
-              limit: 1000,
-              name: '[name].[ext]',
-              outputPath: 'fonts/',
+              name: 'fonts/[name].[ext]',
             },
           },
         ],