From 07a48315a14bee16a3b6a1822502301180803e60 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 30 Sep 2024 15:11:43 +0300 Subject: [PATCH] popover and palette --- .../palette_editor/palette_editor.vue | 63 ++++++++++++++++ .../tabs/style_tab/style_tab.js | 4 +- .../tabs/style_tab/style_tab.vue | 74 ++++++------------- src/components/tooltip/tooltip.vue | 24 ++++++ src/i18n/en.json | 2 +- 5 files changed, 112 insertions(+), 55 deletions(-) create mode 100644 src/components/palette_editor/palette_editor.vue create mode 100644 src/components/tooltip/tooltip.vue diff --git a/src/components/palette_editor/palette_editor.vue b/src/components/palette_editor/palette_editor.vue new file mode 100644 index 00000000..65398004 --- /dev/null +++ b/src/components/palette_editor/palette_editor.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/src/components/settings_modal/tabs/style_tab/style_tab.js b/src/components/settings_modal/tabs/style_tab/style_tab.js index 7be1446e..ecddf9d5 100644 --- a/src/components/settings_modal/tabs/style_tab/style_tab.js +++ b/src/components/settings_modal/tabs/style_tab/style_tab.js @@ -10,7 +10,7 @@ import ColorInput from 'src/components/color_input/color_input.vue' import PaletteEditor from 'src/components/palette_editor/palette_editor.vue' import OpacityInput from 'src/components/opacity_input/opacity_input.vue' import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx' -import Popover from 'src/components/popover/popover.vue' +import Tooltip from 'src/components/tooltip/tooltip.vue' import ContrastRatio from 'src/components/contrast_ratio/contrast_ratio.vue' import { init } from 'src/services/theme_data/theme_data_3.service.js' @@ -43,7 +43,7 @@ export default { components: { Select, Checkbox, - Popover, + Tooltip, StringSetting, ComponentPreview, TabSwitcher, diff --git a/src/components/settings_modal/tabs/style_tab/style_tab.vue b/src/components/settings_modal/tabs/style_tab/style_tab.vue index 7184d33a..f5c605f9 100644 --- a/src/components/settings_modal/tabs/style_tab/style_tab.vue +++ b/src/components/settings_modal/tabs/style_tab/style_tab.vue @@ -165,44 +165,29 @@ :disabled="!isBackgroundColorPresent" :label="$t('settings.style.themes3.editor.background')" /> - - - - + + + - - - - + + + - - - - + +
- - - - + +
@@ -250,34 +230,24 @@ :disabled="!isLinkColorPresent" v-if="componentHas('Link')" /> - - - - + + - - - - + +
+ + + + + + + + + diff --git a/src/i18n/en.json b/src/i18n/en.json index f6267d9e..2c20e292 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -779,7 +779,7 @@ "no-auto": "Disabled" }, "palette": { - "label": "Edited palette", + "label": "Palette", "dark": "Dark mode", "light": "Light mode", "bg": "Panel background",