diff options
| author | Julius Härtl <jus@bitgrid.net> | 2021-01-26 18:51:36 +0300 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2021-02-02 13:22:01 +0300 |
| commit | b87600ddf624173afbdec8e5c33a2a2c0af1d4c4 (patch) | |
| tree | 5b5308d0b4577a54a15d3df7353c67a13c067a4c | |
| parent | 5c386ee55fcf79fa5481a531c5e9ece9d5586993 (diff) | |
Smaller adjustments from the design call
Signed-off-by: Julius Härtl <jus@bitgrid.net>
| -rw-r--r-- | src/components/EditorWrapper.vue | 5 | ||||
| -rw-r--r-- | src/components/MenuBar.vue | 8 | ||||
| -rw-r--r-- | src/components/SessionList.vue | 8 |
3 files changed, 17 insertions, 4 deletions
diff --git a/src/components/EditorWrapper.vue b/src/components/EditorWrapper.vue index e4e97ccb6..a998b1873 100644 --- a/src/components/EditorWrapper.vue +++ b/src/components/EditorWrapper.vue @@ -528,6 +528,11 @@ export default { overflow: hidden; position: absolute; + &.show-color-annotations::v-deep .author-annotation { + padding-top: 2px; + padding-bottom: 2px; + } + &:not(.show-color-annotations)::v-deep .author-annotation { background-color: transparent !important; color: var(--color-main-text) !important; diff --git a/src/components/MenuBar.vue b/src/components/MenuBar.vue index 895dd838d..82e1a99b7 100644 --- a/src/components/MenuBar.vue +++ b/src/components/MenuBar.vue @@ -404,6 +404,14 @@ export default { opacity: .4; } } + + &.icon-redo { + margin-right: 22px; + } + + &.icon-ul { + margin-left: 22px; + } } .menubar .submenu { diff --git a/src/components/SessionList.vue b/src/components/SessionList.vue index 1415057dc..675e6fc31 100644 --- a/src/components/SessionList.vue +++ b/src/components/SessionList.vue @@ -25,7 +25,7 @@ <button slot="trigger" v-tooltip.bottom="editorsTooltip" class="avatar-list"> - <div class="avatardiv" :class="{ 'icon-more': sessionPopoverList.length > 0, 'icon-settings-dark': sessionPopoverList.length === 0 }" /> + <div class="avatardiv icon-group" /> <div v-for="session in sessionsVisible" :key="session.id" class="avatar-wrapper" @@ -64,9 +64,9 @@ v-model="showAuthorAnnotations" type="checkbox" class="checkbox"> - <label for="toggle-color-annotations">{{ t('text', 'Show color annotations') }}</label> + <label for="toggle-color-annotations">{{ t('text', 'Show author colors') }}</label> <p class="hint"> - {{ t('text', 'Color annotations will only show during editing sessions, they are not persisted after closing the document.') }} + {{ t('text', 'Author colors are only shown until everyone has closed the document.') }} </p> </div> </template> @@ -175,7 +175,7 @@ export default { margin-left: 0; } - .icon-more, .icon-settings-dark { + .icon-more, .icon-group, .icon-settings-dark { background-color: var(--color-background-dark); width: 36px; height: 36px; |