Merge pull request #329 from uasoft-indonesia/bugfix/v1/move-css

Move import css from app.js to style.scss
uasoft-indonesia · Aug 16, 2021 · 9b97ec3 · 9b97ec3
2 parents fd34d32 + 1a5780e
commit 9b97ec3
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 14 deletions.
diff --git a/src/Commands/BadasoSetup.php b/src/Commands/BadasoSetup.php
@@ -143,11 +143,8 @@ protected function updateWebpackMix()
                 <<<'EOT'
 
         // Badaso
-        mix
-            .js(
-                "vendor/badaso/core/src/resources/js/app.js",
-                "public/js/badaso.js"
-            )
+        mix.js("vendor/badaso/core/src/resources/js/app.js", "public/js/badaso.js")
+            .sass("vendor/badaso/core/src/resources/js/assets/scss/style.scss", "public/css/badaso.css");
         EOT;
 
             $this->file->append($mix_file, $data);

diff --git a/src/resources/js/app.js b/src/resources/js/app.js
@@ -5,11 +5,6 @@ import { Datetime } from "vue-datetime";
 import Vuelidate from "vuelidate";
 import VueGtag from "vue-gtag";
 
-import "vuesax/dist/vuesax.css"; //Vuesax styles
-import "material-icons/iconfont/material-icons.css";
-import "vue-datetime/dist/vue-datetime.css";
-import "./assets/scss/style.scss";
-
 import api from "./api/index";
 import handleError from "./api/handle-error";
 import resource from "./api/resource";

diff --git a/src/resources/js/assets/scss/layout/_custom.scss b/src/resources/js/assets/scss/layout/_custom.scss
@@ -12,7 +12,7 @@
   display: flex;
 }
 .datetime-input {
-  width: -webkit-fill-available;
+  width: -webkit-stretch;
 }
 .datetime-icon-box {
   border: 1px solid rgba(0, 0, 0, 0.2);

diff --git a/src/resources/js/assets/scss/module/_date.scss b/src/resources/js/assets/scss/module/_date.scss
@@ -24,7 +24,7 @@
   }
 
   &__input {
-    width: -webkit-fill-available;
+    width: -webkit-stretch;
 
     & .vdatetime-overlay {
       z-index: 25000;

diff --git a/src/resources/js/assets/scss/module/_datetime.scss b/src/resources/js/assets/scss/module/_datetime.scss
@@ -24,7 +24,7 @@
   }
 
   &__input {
-    width: -webkit-fill-available;
+    width: -webkit-stretch;
 
     & .vdatetime-overlay {
       z-index: 25000;

diff --git a/src/resources/js/assets/scss/module/_time.scss b/src/resources/js/assets/scss/module/_time.scss
@@ -24,7 +24,7 @@
   }
 
   &__input {
-    width: -webkit-fill-available;
+    width: -webkit-stretch;
 
     .vdatetime-input {
       width: 100%;

diff --git a/src/resources/js/assets/scss/style.scss b/src/resources/js/assets/scss/style.scss
@@ -1,3 +1,7 @@
+@import "~vuesax/dist/vuesax.css";
+@import "~material-icons/iconfont/material-icons.scss";
+@import "~vue-datetime/dist/vue-datetime.css";
+
 @import "variable";
 @import "./layout/layout";
 @import "./layout/custom";

diff --git a/src/resources/views/admin-panel/index.blade.php b/src/resources/views/admin-panel/index.blade.php
@@ -23,6 +23,7 @@
     @else
         <link rel="shortcut icon" href="{{ asset('storage' . $favicon) }}" type="image/png">
     @endif
+    <link rel="stylesheet" href="{{ mix('css/badaso.css') }}">
 </head>
 <body>
     <div id="app"></div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,7 @@ @@
         @else
             <link rel="shortcut icon" href="{{ asset('storage' . $favicon) }}" type="image/png">
         @endif
+        <link rel="stylesheet" href="{{ mix('css/badaso.css') }}">
     </head>
     <body>
         <div id="app"></div>
@@ Expand Down @@