diff --git a/change/@acedatacloud-nexior-fa09da0a-3543-46f5-b71a-b85c03f6aceb.json b/change/@acedatacloud-nexior-fa09da0a-3543-46f5-b71a-b85c03f6aceb.json new file mode 100644 index 00000000..169ca6af --- /dev/null +++ b/change/@acedatacloud-nexior-fa09da0a-3543-46f5-b71a-b85c03f6aceb.json @@ -0,0 +1,7 @@ +{ + "type": "minor", + "comment": "update mj style", + "packageName": "@acedatacloud/nexior", + "email": "office@acedata.cloud", + "dependentChangeType": "patch" +} diff --git a/src/assets/scss/_common.scss b/src/assets/scss/_common.scss index 2e55dec9..17968060 100644 --- a/src/assets/scss/_common.scss +++ b/src/assets/scss/_common.scss @@ -44,19 +44,26 @@ html.dark, } .el-radio-group { - --el-border-radius-base: 15px; + --el-border-radius-base: 5px; + } + + .el-slider { + --el-slider-button-wrapper-size: 14px; + --el-slider-button-wrapper-offset: -9px; + --el-slider-height: 6px; + --el-slider-button-size: 18px; } .el-textarea { - border-radius: 10px; + border-radius: 5px; textarea { - border-radius: 10px; + border-radius: 5px; } } .el-input { .el-input__wrapper { - border-radius: 10px; + border-radius: 5px; width: 100%; &.is-focus { box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset; diff --git a/src/assets/scss/_element.scss b/src/assets/scss/_element.scss index 2a4cb6a8..dd2c5224 100644 --- a/src/assets/scss/_element.scss +++ b/src/assets/scss/_element.scss @@ -1,3 +1,13 @@ +@forward 'element-plus/theme-chalk/src/common/var.scss' with ( + $colors: ( + 'primary': ( + 'base': #277186 + ), + 'danger': ( + 'base': #ec4450 + ) + ) +); $--font-path: 'element-plus/theme-chalk/src/fonts'; @import 'element-plus/theme-chalk/src/index.scss'; diff --git a/src/components/common/InfoIcon.vue b/src/components/common/InfoIcon.vue index 5c9805b9..5d8ad38b 100644 --- a/src/components/common/InfoIcon.vue +++ b/src/components/common/InfoIcon.vue @@ -26,7 +26,7 @@ export default defineComponent({ diff --git a/src/components/midjourney/FinalPrompt.vue b/src/components/midjourney/FinalPrompt.vue deleted file mode 100644 index 766a5a91..00000000 --- a/src/components/midjourney/FinalPrompt.vue +++ /dev/null @@ -1,41 +0,0 @@ - - - - - diff --git a/src/components/midjourney/InputBox.vue b/src/components/midjourney/InputBox.vue deleted file mode 100644 index 87c6c52c..00000000 --- a/src/components/midjourney/InputBox.vue +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - - diff --git a/src/components/midjourney/PresetPanel.vue b/src/components/midjourney/PresetPanel.vue deleted file mode 100644 index 840023ea..00000000 --- a/src/components/midjourney/PresetPanel.vue +++ /dev/null @@ -1,63 +0,0 @@ - - - - - diff --git a/src/components/midjourney/PromptInput.vue b/src/components/midjourney/PromptInput.vue deleted file mode 100644 index f1116791..00000000 --- a/src/components/midjourney/PromptInput.vue +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - diff --git a/src/components/midjourney/preset/AdvancedSelector.vue b/src/components/midjourney/config/AdvancedSelector.vue similarity index 84% rename from src/components/midjourney/preset/AdvancedSelector.vue rename to src/components/midjourney/config/AdvancedSelector.vue index d52bb3ad..9946b1e9 100644 --- a/src/components/midjourney/preset/AdvancedSelector.vue +++ b/src/components/midjourney/config/AdvancedSelector.vue @@ -19,12 +19,12 @@ export default defineComponent({ computed: { value: { get() { - return this.$store.state.midjourney.preset?.advanced; + return this.$store.state.midjourney.config.advanced; }, set(val) { console.debug('set advanced', val); - this.$store.commit('midjourney/setPreset', { - ...this.$store.state.midjourney.preset, + this.$store.commit('midjourney/setConfig', { + ...this.$store.state.midjourney.config, advanced: val }); } diff --git a/src/components/midjourney/config/ChaosSelector.vue b/src/components/midjourney/config/ChaosSelector.vue new file mode 100644 index 00000000..7c51d02f --- /dev/null +++ b/src/components/midjourney/config/ChaosSelector.vue @@ -0,0 +1,69 @@ + + + + + diff --git a/src/components/midjourney/ElementsSelector.vue b/src/components/midjourney/config/ElementsSelector.vue similarity index 97% rename from src/components/midjourney/ElementsSelector.vue rename to src/components/midjourney/config/ElementsSelector.vue index 2cf436f5..adfb9538 100644 --- a/src/components/midjourney/ElementsSelector.vue +++ b/src/components/midjourney/config/ElementsSelector.vue @@ -1,36 +1,62 @@ + + + + diff --git a/src/components/midjourney/preset/ModelSelector.vue b/src/components/midjourney/config/ModelSelector.vue similarity index 76% rename from src/components/midjourney/preset/ModelSelector.vue rename to src/components/midjourney/config/ModelSelector.vue index 4da5599c..e390e772 100644 --- a/src/components/midjourney/preset/ModelSelector.vue +++ b/src/components/midjourney/config/ModelSelector.vue @@ -1,6 +1,9 @@