recompiled style assets

MelonSmasher · Jul 27, 2019 · 3cc4152 · 3cc4152
1 parent 82c278f
commit 3cc4152
Show file tree

Hide file tree

Showing 26 changed files with 775 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -23,6 +23,6 @@
     "vue": "^2.5.17"
   },
   "dependencies": {
-    "bootstrap-sass": "^3.0.0"
+    "bootstrap-sass": "^3.4.1"
   }
 }
diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/fonts/Material-Design-Icons.eot b/public/fonts/Material-Design-Icons.eot
diff --git a/public/fonts/Material-Design-Icons.svg b/public/fonts/Material-Design-Icons.svg
diff --git a/public/fonts/Material-Design-Icons.ttf b/public/fonts/Material-Design-Icons.ttf
diff --git a/public/fonts/Material-Design-Icons.woff b/public/fonts/Material-Design-Icons.woff
diff --git a/public/fonts/Material-Design-Icons.woff2 b/public/fonts/Material-Design-Icons.woff2
diff --git a/public/fonts/Roboto-Bold.ttf b/public/fonts/Roboto-Bold.ttf
diff --git a/public/fonts/Roboto-Bold.woff b/public/fonts/Roboto-Bold.woff
diff --git a/public/fonts/Roboto-Bold.woff2 b/public/fonts/Roboto-Bold.woff2
diff --git a/public/fonts/Roboto-Light.ttf b/public/fonts/Roboto-Light.ttf
diff --git a/public/fonts/Roboto-Light.woff b/public/fonts/Roboto-Light.woff
diff --git a/public/fonts/Roboto-Light.woff2 b/public/fonts/Roboto-Light.woff2
diff --git a/public/fonts/Roboto-Medium.ttf b/public/fonts/Roboto-Medium.ttf
diff --git a/public/fonts/Roboto-Medium.woff b/public/fonts/Roboto-Medium.woff
diff --git a/public/fonts/Roboto-Medium.woff2 b/public/fonts/Roboto-Medium.woff2
diff --git a/public/fonts/Roboto-Regular.ttf b/public/fonts/Roboto-Regular.ttf
diff --git a/public/fonts/Roboto-Regular.woff b/public/fonts/Roboto-Regular.woff
diff --git a/public/fonts/Roboto-Regular.woff2 b/public/fonts/Roboto-Regular.woff2
diff --git a/public/fonts/Roboto-Thin.ttf b/public/fonts/Roboto-Thin.ttf
diff --git a/public/fonts/Roboto-Thin.woff b/public/fonts/Roboto-Thin.woff
diff --git a/public/fonts/Roboto-Thin.woff2 b/public/fonts/Roboto-Thin.woff2
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -0,0 +1,3 @@
+{
+    "/css/app.css": "/css/app.css?id=1880eb74b0f84f93487a"
+}
diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php
@@ -23,7 +23,7 @@
     <meta name="msapplication-square310x310logo" content="mstile-310x310.png"/>
 
     <title>{{ config('choco.shortname') }} - @yield('title')</title>
-    <link href="{{ elixir('css/app.css') }}" rel="stylesheet" type='text/css'>
+    <link href="{{ mix('css/app.css') }}" rel="stylesheet" type='text/css'>
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <!--Let browser know website is optimized for mobile-->
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>

diff --git a/webpack.mix.js b/webpack.mix.js
@@ -11,5 +11,9 @@ 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')
+mix.sass('resources/sass/app.scss', 'public/css');
+
+if (mix.inProduction()) {
+    mix.version();
+}
diff --git a/yarn.lock b/yarn.lock
@@ -1247,9 +1247,10 @@ boolbase@^1.0.0, boolbase@~1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
-bootstrap-sass@^3.0.0:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.3.7.tgz#6596c7ab40f6637393323ab0bc80d064fc630498"
+bootstrap-sass@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.4.1.tgz#6843c73b1c258a0ac5cb2cc6f6f5285b664a8e9a"
+  integrity sha512-p5rxsK/IyEDQm2CwiHxxUi0MZZtvVFbhWmyMOt4lLkA4bujDA1TGoKT0i1FKIWiugAdP+kK8T5KMDFIKQCLYIA==
 
 bootstrap@^4.0.0:
   version "4.3.1"