qugalet/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

layout

Browse source
This commit is contained in:
Henry Jameson 2024-10-08 22:25:55 +03:00
parent 707ed633e4
commit 54c740c252
6 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/components/select/select.vue
View file

@ -49,6 +49,7 @@ label.Select {
option { option {
background-color: transparent; background-color: transparent;
&:checked,
&.-active { &.-active {
color: var(--selectionText); color: var(--selectionText);
background-color: var(--selectionBackground); background-color: var(--selectionBackground);

11
src/components/settings_modal/tabs/style_tab/style_tab.js
View file

@ -33,7 +33,13 @@ import {
} from 'src/services/export_import/export_import.js' } from 'src/services/export_import/export_import.js'
import { library } from '@fortawesome/fontawesome-svg-core' import { library } from '@fortawesome/fontawesome-svg-core'
import { faFloppyDisk, faFolderOpen, faFile, faArrowsRotate } from '@fortawesome/free-solid-svg-icons' import {
faFloppyDisk,
faFolderOpen,
faFile,
faArrowsRotate,
faCheck
} from '@fortawesome/free-solid-svg-icons'
// helper for debugging // helper for debugging
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
@ -46,7 +52,8 @@ library.add(
faFile, faFile,
faFloppyDisk, faFloppyDisk,
faFolderOpen, faFolderOpen,
faArrowsRotate faArrowsRotate,
faCheck
) )
export default { export default {

18
src/components/settings_modal/tabs/style_tab/style_tab.scss
View file

@ -66,14 +66,14 @@
&.heading { &.heading {
display: grid; display: grid;
grid-template: grid-template:
"meta meta preview" "meta meta preview preview"
"meta meta preview" "meta meta preview preview"
"meta meta preview" "meta meta preview preview"
"meta meta preview" "meta meta preview preview"
"new new preview" "new new preview preview"
"load save refresh"; "load save refresh apply";
grid-gap: 0.5em; grid-gap: 0.5em;
grid-template-columns: min-content min-content 6fr; grid-template-columns: min-content min-content 6fr max-content;
grid-template-rows: repeat(4, min-content) repeat(2, 2em); grid-template-rows: repeat(4, min-content) repeat(2, 2em);
ul.setting-list { ul.setting-list {
@ -116,6 +116,10 @@
.button-refresh { .button-refresh {
grid-area: refresh; grid-area: refresh;
} }
.button-apply {
grid-area: apply;
}
} }
} }

7
src/components/settings_modal/tabs/style_tab/style_tab.vue
View file

@ -39,6 +39,13 @@
<FAIcon icon="arrows-rotate" /> <FAIcon icon="arrows-rotate" />
{{ $t('settings.style.themes3.editor.refresh_preview') }} {{ $t('settings.style.themes3.editor.refresh_preview') }}
</button> </button>
<button
class="btn button-default button-apply"
@click="applyTheme"
>
<FAIcon icon="check" />
{{ $t('settings.style.themes3.editor.apply_preview') }}
</button>
<ul class="setting-list style-metadata"> <ul class="setting-list style-metadata">
<li> <li>
<StringSetting class="meta-field" v-model="name"> <StringSetting class="meta-field" v-model="name">

2
src/components/shadow_control/shadow_control.scss
View file

@ -5,8 +5,6 @@
grid-template-areas: "selector preview tweak"; grid-template-areas: "selector preview tweak";
grid-gap: 0.5em; grid-gap: 0.5em;
justify-content: stretch; justify-content: stretch;
margin-bottom: 1em;
width: 100%;
&.-compact { &.-compact {
grid-template-columns: 10em 1fr; grid-template-columns: 10em 1fr;

1
src/i18n/en.json
View file

@ -800,6 +800,7 @@
"include_in_rule": "Add to rule", "include_in_rule": "Add to rule",
"test_string": "TEST", "test_string": "TEST",
"refresh_preview": "Refresh preview", "refresh_preview": "Refresh preview",
"apply_preview": "Apply",
"text_auto": { "text_auto": {
"label": "Auto-contrast", "label": "Auto-contrast",
"no-preserve": "Black or White", "no-preserve": "Black or White",