diff --git a/src/App.scss b/src/App.scss index b36e702d5..f556a7d9d 100644 --- a/src/App.scss +++ b/src/App.scss @@ -787,6 +787,19 @@ option { padding: 0 0.25em; border-radius: var(--roundness); border: 1px solid var(--border); + + &.-dismissible { + display: flex; + padding-left: 0.5em; + margin: 0; + align-items: baseline; + line-height: 2; + + span { + display: block; + flex: 1 0 auto; + } + } } .faint { diff --git a/src/components/about/about.js b/src/components/about/about.js index 404843e8b..dc6733491 100644 --- a/src/components/about/about.js +++ b/src/components/about/about.js @@ -1,3 +1,5 @@ +import { mapState } from 'pinia' + import FeaturesPanel from '../features_panel/features_panel.vue' import InstanceSpecificPanel from '../instance_specific_panel/instance_specific_panel.vue' import MRFTransparencyPanel from '../mrf_transparency_panel/mrf_transparency_panel.vue' @@ -7,6 +9,9 @@ import TermsOfServicePanel from '../terms_of_service_panel/terms_of_service_pane import { useInstanceStore } from 'src/stores/instance.js' import { useMergedConfigStore } from 'src/stores/merged_config.js' +const pleromaFeCommitUrl = + 'https://git.pleroma.social/pleroma/pleroma-fe/commit/' + const About = { components: { InstanceSpecificPanel, @@ -19,6 +24,10 @@ const About = { showFeaturesPanel() { return useInstanceStore().instanceIdentity.showFeaturesPanel }, + frontendVersionLink() { + return pleromaFeCommitUrl + this.frontendVersion + }, + ...mapState(useInstanceStore, ['backendVersion', 'backendRepository', 'frontendVersion']), showInstanceSpecificPanel() { return ( useInstanceStore().instanceIdentity.showInstanceSpecificPanel && diff --git a/src/components/about/about.vue b/src/components/about/about.vue index 8a551485f..df395c7dd 100644 --- a/src/components/about/about.vue +++ b/src/components/about/about.vue @@ -1,11 +1,45 @@ + diff --git a/src/components/confirm_modal/confirm_modal.js b/src/components/confirm_modal/confirm_modal.js index cd83194be..affad7dcb 100644 --- a/src/components/confirm_modal/confirm_modal.js +++ b/src/components/confirm_modal/confirm_modal.js @@ -21,6 +21,9 @@ const ConfirmModal = { confirmText: { type: String, }, + confirmDanger: { + type: Boolean, + }, }, emits: ['cancelled', 'accepted'], computed: {}, diff --git a/src/components/confirm_modal/confirm_modal.vue b/src/components/confirm_modal/confirm_modal.vue index 992792ede..7e1a7ff68 100644 --- a/src/components/confirm_modal/confirm_modal.vue +++ b/src/components/confirm_modal/confirm_modal.vue @@ -14,6 +14,7 @@ - +
- Error: {{ error }} + + {{ error }} +
+
+ + {{ backgroundError }} + + +