diff options
| author | Jonas <jonas@nextcloud.com> | 2022-09-06 11:40:28 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-06 11:40:28 +0300 |
| commit | 5ad54f02789d14b45de078a0e44ac7321531b7cf (patch) | |
| tree | a97dcc4bbb0f0e8d2ed35f353dc077936aa0110c /src | |
| parent | 522c8b29b9bd4297af9bdd68bfb58915a171dbaf (diff) | |
| parent | faff5d13c2cfb230c4a2b5cfa867ca5d0396fe02 (diff) | |
Merge branch 'master' into fix/image_newline
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/Menu/ActionEntry.scss | 6 | ||||
| -rw-r--r-- | src/components/Menu/MenuBar.vue | 1 | ||||
| -rw-r--r-- | src/components/Menu/entries.js | 4 | ||||
| -rw-r--r-- | src/helpers/links.js | 1 |
4 files changed, 5 insertions, 7 deletions
diff --git a/src/components/Menu/ActionEntry.scss b/src/components/Menu/ActionEntry.scss index f0a0a9550..ece97514e 100644 --- a/src/components/Menu/ActionEntry.scss +++ b/src/components/Menu/ActionEntry.scss @@ -61,11 +61,7 @@ .entry-action.entry-action-item { &.is-active { background-color: var(--color-primary-light); - box-shadow: inset 2px 0 var(--color-primary); - border-radius: 0; - } - &:hover { - border-radius: 0; + border-radius: var(--border-radius-large); } } diff --git a/src/components/Menu/MenuBar.vue b/src/components/Menu/MenuBar.vue index ba589f1fe..2be5f9a6e 100644 --- a/src/components/Menu/MenuBar.vue +++ b/src/components/Menu/MenuBar.vue @@ -231,6 +231,7 @@ export default { display: flex; justify-content: flex-end; + align-items: center; &.text-menubar--ready:not(.text-menubar--autohide) { visibility: visible; diff --git a/src/components/Menu/entries.js b/src/components/Menu/entries.js index dc533ad1e..d29c284ec 100644 --- a/src/components/Menu/entries.js +++ b/src/components/Menu/entries.js @@ -187,8 +187,8 @@ export default [ click: ({ $outlineActions }) => $outlineActions.toggle(), label: ({ $outlineState }) => { return $outlineState.visible - ? t('text', 'Hide Outline') - : t('text', 'Show Outline') + ? t('text', 'Hide outline') + : t('text', 'Show outline') }, }, ], diff --git a/src/helpers/links.js b/src/helpers/links.js index b4223f9c5..d7446373e 100644 --- a/src/helpers/links.js +++ b/src/helpers/links.js @@ -112,6 +112,7 @@ const openLink = function(event, _attrs) { const el = document.getElementById(fragment) if (el) { el.scrollIntoView() + window.location.hash = fragment return } } |