diff --git a/src/client/components/form/form.scss b/src/client/components/form/form.scss
index b8d1429c9..8c01fad72 100644
--- a/src/client/components/form/form.scss
+++ b/src/client/components/form/form.scss
@@ -1,11 +1,17 @@
._formPanel {
background: var(--panel);
border-radius: var(--radius);
+ transition: background 0.2s ease;
&._formClickable {
&:hover {
//background: var(--panelHighlight);
}
+
+ &:active {
+ background: var(--panelHighlight);
+ transition: background 0s;
+ }
}
}
diff --git a/src/client/components/form/info.vue b/src/client/components/form/info.vue
new file mode 100644
index 000000000..a9224c7e6
--- /dev/null
+++ b/src/client/components/form/info.vue
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
diff --git a/src/client/components/form/link.vue b/src/client/components/form/link.vue
index 2efc6b58c..af36bcf22 100644
--- a/src/client/components/form/link.vue
+++ b/src/client/components/form/link.vue
@@ -66,6 +66,7 @@ export default defineComponent({
&.active {
color: var(--accent);
+ background: var(--panelHighlight);
}
> .icon {
diff --git a/src/client/components/modal-page-window.vue b/src/client/components/modal-page-window.vue
index 24511215d..474a67f98 100644
--- a/src/client/components/modal-page-window.vue
+++ b/src/client/components/modal-page-window.vue
@@ -168,7 +168,7 @@ export default defineComponent({
}
> .header {
- $height: 54px;
+ $height: 52px;
$height-narrow: 42px;
display: flex;
flex-shrink: 0;
diff --git a/src/client/pages/settings/mute-block.vue b/src/client/pages/settings/mute-block.vue
index d1c3d5f29..11450e049 100644
--- a/src/client/pages/settings/mute-block.vue
+++ b/src/client/pages/settings/mute-block.vue
@@ -6,7 +6,7 @@
- {{ $ts.noUsers }}
+ {{ $ts.noUsers }}
@@ -18,7 +18,7 @@
- {{ $ts.noUsers }}
+ {{ $ts.noUsers }}
@@ -36,7 +36,7 @@ import { defineComponent } from 'vue';
import { faBan } from '@fortawesome/free-solid-svg-icons';
import MkPagination from '@client/components/ui/pagination.vue';
import MkTab from '@client/components/tab.vue';
-import MkInfo from '@client/components/ui/info.vue';
+import FormInfo from '@client/components/form/info.vue';
import FormLink from '@client/components/form/link.vue';
import FormBase from '@client/components/form/base.vue';
import FormGroup from '@client/components/form/group.vue';
@@ -48,7 +48,7 @@ export default defineComponent({
components: {
MkPagination,
MkTab,
- MkInfo,
+ FormInfo,
FormBase,
FormGroup,
FormLink,
diff --git a/src/client/pages/settings/plugin.install.vue b/src/client/pages/settings/plugin.install.vue
index ecda0a4e0..bc80188fc 100644
--- a/src/client/pages/settings/plugin.install.vue
+++ b/src/client/pages/settings/plugin.install.vue
@@ -1,6 +1,6 @@
- {{ $ts._plugin.installWarn }}
+ {{ $ts._plugin.installWarn }}
@@ -25,7 +25,7 @@ import FormBase from '@client/components/form/base.vue';
import FormGroup from '@client/components/form/group.vue';
import FormLink from '@client/components/form/link.vue';
import FormButton from '@client/components/form/button.vue';
-import MkInfo from '@client/components/ui/info.vue';
+import FormInfo from '@client/components/form/info.vue';
import * as os from '@client/os';
import { ColdDeviceStorage } from '@client/store';
import { unisonReload } from '@client/scripts/unison-reload';
@@ -40,7 +40,7 @@ export default defineComponent({
FormGroup,
FormLink,
FormButton,
- MkInfo,
+ FormInfo,
},
emits: ['info'],
diff --git a/src/client/pages/settings/plugin.manage.vue b/src/client/pages/settings/plugin.manage.vue
index 16d2225d0..d7aabe560 100644
--- a/src/client/pages/settings/plugin.manage.vue
+++ b/src/client/pages/settings/plugin.manage.vue
@@ -36,7 +36,6 @@ import { faPlug, faSave, faTrashAlt, faFolderOpen, faDownload, faCog } from '@fo
import MkButton from '@client/components/ui/button.vue';
import MkTextarea from '@client/components/ui/textarea.vue';
import MkSelect from '@client/components/ui/select.vue';
-import MkInfo from '@client/components/ui/info.vue';
import FormSwitch from '@client/components/form/switch.vue';
import FormBase from '@client/components/form/base.vue';
import FormGroup from '@client/components/form/group.vue';
@@ -49,7 +48,6 @@ export default defineComponent({
MkButton,
MkTextarea,
MkSelect,
- MkInfo,
FormSwitch,
FormBase,
FormGroup,
diff --git a/src/client/pages/settings/registry.keys.vue b/src/client/pages/settings/registry.keys.vue
index d2fd75aca..5cdfdc133 100644
--- a/src/client/pages/settings/registry.keys.vue
+++ b/src/client/pages/settings/registry.keys.vue
@@ -24,7 +24,6 @@
import { defineAsyncComponent, defineComponent } from 'vue';
import { faCogs } from '@fortawesome/free-solid-svg-icons';
import * as JSON5 from 'json5';
-import MkInfo from '@client/components/ui/info.vue';
import FormSwitch from '@client/components/form/switch.vue';
import FormSelect from '@client/components/form/select.vue';
import FormLink from '@client/components/form/link.vue';
@@ -37,7 +36,6 @@ import * as symbols from '@client/symbols';
export default defineComponent({
components: {
- MkInfo,
FormBase,
FormSelect,
FormSwitch,
diff --git a/src/client/pages/settings/registry.value.vue b/src/client/pages/settings/registry.value.vue
index bba92bb74..7d5756af9 100644
--- a/src/client/pages/settings/registry.value.vue
+++ b/src/client/pages/settings/registry.value.vue
@@ -1,6 +1,6 @@
- {{ $ts.editTheseSettingsMayBreakAccount }}
+ {{ $ts.editTheseSettingsMayBreakAccount }}
@@ -39,7 +39,7 @@
import { defineAsyncComponent, defineComponent } from 'vue';
import { faCogs, faSave, faTrash } from '@fortawesome/free-solid-svg-icons';
import * as JSON5 from 'json5';
-import MkInfo from '@client/components/ui/info.vue';
+import FormInfo from '@client/components/form/info.vue';
import FormSwitch from '@client/components/form/switch.vue';
import FormSelect from '@client/components/form/select.vue';
import FormTextarea from '@client/components/form/textarea.vue';
@@ -52,7 +52,7 @@ import * as symbols from '@client/symbols';
export default defineComponent({
components: {
- MkInfo,
+ FormInfo,
FormBase,
FormSelect,
FormSwitch,
diff --git a/src/client/pages/settings/registry.vue b/src/client/pages/settings/registry.vue
index a09c309d3..085389fc9 100644
--- a/src/client/pages/settings/registry.vue
+++ b/src/client/pages/settings/registry.vue
@@ -12,7 +12,6 @@
import { defineAsyncComponent, defineComponent } from 'vue';
import { faCogs } from '@fortawesome/free-solid-svg-icons';
import * as JSON5 from 'json5';
-import MkInfo from '@client/components/ui/info.vue';
import FormSwitch from '@client/components/form/switch.vue';
import FormSelect from '@client/components/form/select.vue';
import FormLink from '@client/components/form/link.vue';
@@ -25,7 +24,6 @@ import * as symbols from '@client/symbols';
export default defineComponent({
components: {
- MkInfo,
FormBase,
FormSelect,
FormSwitch,
diff --git a/src/client/pages/settings/update.vue b/src/client/pages/settings/update.vue
index fb1458da8..d7b2adae5 100644
--- a/src/client/pages/settings/update.vue
+++ b/src/client/pages/settings/update.vue
@@ -1,8 +1,8 @@
- {{ $ts.youAreRunningUpToDateClient }}
- {{ $ts.newVersionOfClientAvailable }}
+ {{ $ts.youAreRunningUpToDateClient }}
+ {{ $ts.newVersionOfClientAvailable }}
{{ instanceName }}
@@ -38,7 +38,7 @@ import FormBase from '@client/components/form/base.vue';
import FormGroup from '@client/components/form/group.vue';
import FormButton from '@client/components/form/button.vue';
import FormKeyValueView from '@client/components/form/key-value-view.vue';
-import MkInfo from '@client/components/ui/info.vue';
+import FormInfo from '@client/components/form/info.vue';
import * as os from '@client/os';
import { version, instanceName } from '@client/config';
import * as symbols from '@client/symbols';
@@ -52,7 +52,7 @@ export default defineComponent({
FormLink,
FormGroup,
FormKeyValueView,
- MkInfo,
+ FormInfo,
},
emits: ['info'],
diff --git a/src/client/pages/settings/word-mute.vue b/src/client/pages/settings/word-mute.vue
index 029eb5d41..79de2ebbd 100644
--- a/src/client/pages/settings/word-mute.vue
+++ b/src/client/pages/settings/word-mute.vue
@@ -7,14 +7,14 @@