Skip to content

Commit

Permalink
Multiple fixes (#6954)
Browse files Browse the repository at this point in the history
* fix: text editor textarea height

* show default action first in context menu

* fix: applications menu items hover text color

* fix: horizontal overflow by sidebar

* add changelogs

* text editor textarea height
  • Loading branch information
elizavetaRa authored May 16, 2022
1 parent 50fe28a commit 1246561
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 5 deletions.
6 changes: 6 additions & 0 deletions changelog/unreleased/bugfix-text-color-application-menu-item
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Bugfix: The selected app item has a bad text color contrast in light mode

We've fixed the contrast of the text color for hovered and active application menus items.

https://github.com/owncloud/web/pull/6954
https://github.com/owncloud/web/issues/6958
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Enhancement: Show default action at the first place in context menu

We've added the sorting of actions in the way that default file handler shows first in the context menu

https://github.com/owncloud/web/issues/6971
https://github.com/owncloud/web/pull/6954
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,9 @@ export default {
...this.$_fileActions_loadExternalAppActions(this.filterParams.resources)
]
return [...fileHandlers].filter((item) => item.isEnabled(this.filterParams))
return [...fileHandlers]
.filter((item) => item.isEnabled(this.filterParams))
.sort((x, y) => Number(y.canBeDefault) - Number(x.canBeDefault))
},
menuItemsShare() {
Expand Down
12 changes: 8 additions & 4 deletions packages/web-app-text-editor/src/App.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<main id="text-editor" class="oc-mx-l oc-my-m">
<main id="text-editor" class="oc-px-l oc-py-m oc-height-1-1">
<app-bar
:current-file-context="currentFileContext"
:is-loading="isLoading"
Expand All @@ -16,8 +16,8 @@
@close="clearLastError"
/>
</oc-notifications>
<div class="oc-flex">
<div :class="showPreview ? 'oc-width-1-2' : 'oc-width-1-1'">
<div class="oc-flex editor-wrapper-height">
<div :class="showPreview ? 'oc-width-1-2' : 'oc-width-1-1'" class="oc-height-1-1">
<oc-textarea
id="text-editor-input"
v-model="currentContent"
Expand Down Expand Up @@ -230,12 +230,16 @@ export default {
}
}
</script>
<style lang="scss" scoped>
<style lang="scss">
#text-editor-preview {
max-height: 80vh;
overflow-y: scroll;
}
#text-editor-input {
resize: vertical;
height: 100%;
}
.editor-wrapper-height {
height: calc(100% - 42px);
}
</style>
1 change: 1 addition & 0 deletions packages/web-pkg/src/components/sidebar/SideBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ export default defineComponent({
&__body {
overflow-y: auto;
overflow-x: hidden;
padding: 10px;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,5 +103,13 @@ export default {
right: 1rem;
}
}
a.router-link-active,
button.router-link-active {
&:focus,
&:hover {
color: var(--oc-color-swatch-inverse-default);
}
}
}
</style>

0 comments on commit 1246561

Please sign in to comment.