Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev 0.4.2 alpha4 #116

Merged
merged 5 commits into from
Feb 13, 2023
Merged

Dev 0.4.2 alpha4 #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
020ce55
🐛 : fix : Fixed invalid variables.
zhanghengxin Feb 13, 2023
872e430
🐛 : fix : Fixed follow eslint.
zhanghengxin Feb 13, 2023
c033206
➕ : Add the register event_bus script.
zhanghengxin Feb 13, 2023
fdbb3bb
💄 : Beautification of style.
zhanghengxin Feb 13, 2023
455ec36
🐛 : Missing authentication.
zhanghengxin Feb 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .env.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 1 addition & 8 deletions src/assets/scss/common/_color.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -34,7 +27,7 @@
color: $grey-600;
}

.has-text-grey-100{
.has-text-grey-100 {
color: $grey-100;
}

Expand Down
105 changes: 56 additions & 49 deletions src/assets/scss/common/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand All @@ -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);