logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://anongit.hacktivis.me/git/pleroma-fe.git/
commit: d787fb1a608f4e8bec7f7f0c01344c4f9d0b6b3b
parent a2a58dc082ecb1fe7e509b66b0073957c6a192f9
Author: Henry Jameson <me@hjkos.com>
Date:   Tue, 12 Nov 2024 21:10:50 +0200

roundness control

Diffstat:

Msrc/components/settings_modal/tabs/style_tab/style_tab.js4++++
Msrc/components/settings_modal/tabs/style_tab/style_tab.vue8++++++++
Msrc/i18n/en.json2++
3 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/src/components/settings_modal/tabs/style_tab/style_tab.js b/src/components/settings_modal/tabs/style_tab/style_tab.js @@ -11,6 +11,7 @@ import ShadowControl from 'src/components/shadow_control/shadow_control.vue' 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 RoundnessInput from 'src/components/roundness_input/roundness_input.vue' import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx' import Tooltip from 'src/components/tooltip/tooltip.vue' import ContrastRatio from 'src/components/contrast_ratio/contrast_ratio.vue' @@ -72,6 +73,7 @@ export default { ColorInput, PaletteEditor, OpacityInput, + RoundnessInput, ContrastRatio, Preview, VirtualDirectivesTab @@ -347,6 +349,8 @@ export default { exports.isBackgroundColorPresent = isElementPresent(null, 'background', '#FFFFFF') exports.editedOpacity = getEditedElement(null, 'opacity') exports.isOpacityPresent = isElementPresent(null, 'opacity', 1) + exports.editedRoundness = getEditedElement(null, 'roundness') + exports.isRoundnessPresent = isElementPresent(null, 'roundness', 0) exports.editedTextColor = getEditedElement('Text', 'textColor') exports.isTextColorPresent = isElementPresent('Text', 'textColor', '#000000') exports.editedTextAuto = getEditedElement('Text', 'textAuto') diff --git a/src/components/settings_modal/tabs/style_tab/style_tab.vue b/src/components/settings_modal/tabs/style_tab/style_tab.vue @@ -286,6 +286,14 @@ <Tooltip :text="$t('settings.style.themes3.editor.include_in_rule')"> <Checkbox v-model="isOpacityPresent" /> </Tooltip> + <RoundnessInput + v-model="editedRoundness" + :disabled="!isRoundnessPresent" + :label="$t('settings.style.themes3.editor.roundness')" + /> + <Tooltip :text="$t('settings.style.themes3.editor.include_in_rule')"> + <Checkbox v-model="isRoundnessPresent" /> + </Tooltip> </div> <div key="shadow" diff --git a/src/i18n/en.json b/src/i18n/en.json @@ -792,6 +792,8 @@ "icon_color": "Icon color", "link_color": "Link color", "contrast": "Text contrast", + "roundness": "Roundness", + "opacity": "Opacity", "border_color": "Border color", "include_in_rule": "Add to rule", "test_string": "TEST",