Dev 0.4.2 alpha4 (#116)

IceWhaleTech · Feb 13, 2023 · 7b358cf · 7b358cf
1 parent 95eee88
commit 7b358cf
Show file tree

Hide file tree

Showing 7 changed files with 196 additions and 199 deletions.
diff --git a/.env.dev b/.env.dev
@@ -7,8 +7,8 @@ NODE_ENV=dev
 # VUE_APP_DEV_IP=192.168.2.219
 # VUE_APP_DEV_IP=192.168.2.157
 # VUE_APP_DEV_IP=192.168.2.132
-#VUE_APP_DEV_IP=192.168.2.118
+VUE_APP_DEV_IP=192.168.2.180
 #VUE_APP_DEV_IP=192.168.2.243
-VUE_APP_DEV_IP=192.168.2.221
+#VUE_APP_DEV_IP=192.168.2.221
 VUE_APP_DEV_PORT=80
 #VUE_APP_DEV_PORT=81
diff --git a/package.json b/package.json
@@ -5,7 +5,8 @@
   "scripts": {
     "serve": "vue-cli-service serve --mode dev",
     "build": "node message_bus.build.js && vue-cli-service build --dest ./build/sysroot/var/lib/casaos/www/ --mode production",
-    "lint": "vue-cli-service lint"
+    "lint": "vue-cli-service lint",
+    "build:messagebus": "node message_bus.build.js"
   },
   "dependencies": {
     "@fontsource/roboto": "^4.5.7",

diff --git a/src/assets/scss/common/_color.scss b/src/assets/scss/common/_color.scss
@@ -7,13 +7,6 @@
  *  Copyright (c) 2022 by IceWhale, All Rights Reserved.
  */
 
- $grey-100:hsla(208, 16%, 96%, 1) !default;
- $grey-200: hsla(208, 16%, 94%, 1);
- $grey-600: hsla(208, 14%, 58%, 1);
- $grey-400:hsla(208, 16%, 85%, 1) !default;
- $gray-800: hsla(208, 20%, 20%, 1);
-
-
 .op80 {
   opacity: 0.8;
 }
@@ -34,7 +27,7 @@
   color: $grey-600;
 }
 
-.has-text-grey-100{
+.has-text-grey-100 {
   color: $grey-100;
 }
 

diff --git a/src/assets/scss/common/_variables.scss b/src/assets/scss/common/_variables.scss
@@ -34,7 +34,7 @@ $green: hsla(118, 70%, 45%, 1) !default;
 $turquoise: hsl(171, 100%, 41%) !default;
 $casablue: hsl(216, 90%, 54%) !default;
 $cyan: hsl(204, 86%, 53%) !default;
-$blue: hsla(208, 100%, 45%, 1)!default;
+$blue: hsla(208, 100%, 45%, 1) !default;
 $purple: hsl(271, 100%, 71%) !default;
 $red: hsl(348, 100%, 61%) !default;
 $pot: rgb(214, 167, 56) !default;
@@ -217,54 +217,54 @@ $custom-shades: null !default;
 
 // Setup $colors to use as bulma classes (e.g. 'is-twitter')
 $colors: mergeColorMaps(("white": ($white,
-                        $black,
-                ),
-                "black": ($black,
-                        $white,
-                ),
-                "light": ($light,
-                        $light-invert,
-                ),
-                "dark": ($dark,
-                        $dark-invert,
-                ),
-                "primary": ($primary,
-                        $primary-invert,
-                        $primary-light,
-                        $primary-dark,
-                ),
-                "link": ($link,
-                        $link-invert,
-                        $link-light,
-                        $link-dark,
-                ),
-                "info": ($info,
-                        $info-invert,
-                        $info-light,
-                        $info-dark,
-                ),
-                "success": ($success,
-                        $success-invert,
-                        $success-light,
-                        $success-dark,
-                ),
-                "warning": ($warning,
-                        $warning-invert,
-                        $warning-light,
-                        $warning-dark,
-                ),
-                "danger": ($danger,
-                        $danger-invert,
-                        $danger-light,
-                        $danger-dark,
-                ),
-                "facebook":($facebook,
-                        $white),
-                "twitter":($twitter,
-                        $white),
-                "reddit":($reddit,
-                        $white),
+$black,
+),
+        "black": ($black,
+        $white,
         ),
+        "light": ($light,
+        $light-invert,
+        ),
+        "dark": ($dark,
+        $dark-invert,
+        ),
+        "primary": ($primary,
+        $primary-invert,
+        $primary-light,
+        $primary-dark,
+        ),
+        "link": ($link,
+        $link-invert,
+        $link-light,
+        $link-dark,
+        ),
+        "info": ($info,
+        $info-invert,
+        $info-light,
+        $info-dark,
+        ),
+        "success": ($success,
+        $success-invert,
+        $success-light,
+        $success-dark,
+        ),
+        "warning": ($warning,
+        $warning-invert,
+        $warning-light,
+        $warning-dark,
+        ),
+        "danger": ($danger,
+        $danger-invert,
+        $danger-light,
+        $danger-dark,
+        ),
+        "facebook":($facebook,
+        $white),
+        "twitter":($twitter,
+        $white),
+        "reddit":($reddit,
+        $white),
+),
         $custom-colors);
 
 // Links
@@ -289,4 +289,11 @@ $loading-icon-size: 2.5rem;
 $modal-background-background-color: rgba(0, 0, 0, 0.5);
 
 // SideBar
-$sidebar-width: 22.5rem;
+$sidebar-width: 22.5rem;
+
+// _colors.scss
+$grey-100: hsla(208, 16%, 96%, 1) !default;
+$grey-200: hsla(208, 16%, 94%, 1);
+$grey-600: hsla(208, 14%, 58%, 1);
+$grey-400: hsla(208, 16%, 85%, 1) !default;
+$gray-800: hsla(208, 20%, 20%, 1);