Skip to content

Simplify save indicator #1353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusknorr merged 7 commits into from
Feb 2, 2021
Merged

Simplify save indicator #1353

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d241c07
Simplify save indicator
juliusknorr Jan 14, 2021
561a961
Enhance menu bar styling
juliusknorr Jan 14, 2021
97d9070
Switch back to sticky header on public page
juliusknorr Jan 14, 2021
5c386ee
Remove the undo disabled state as there is some weird endless loop ha…
juliusknorr Jan 26, 2021
b87600d
Smaller adjustments from the design call
juliusknorr Jan 26, 2021
a3360e2
Apply same styling to menu bar if talk sidebar is shown on public pag…
juliusknorr Feb 2, 2021
d0edc72
Bump bundles
juliusknorr Jan 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Smaller adjustments from the design call 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Feb 2, 2021
commit b87600ddf624173afbdec8e5c33a2a2c0af1d4c4
5 changes: 5 additions & 0 deletions src/components/EditorWrapper.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 8 additions & 0 deletions src/components/MenuBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,14 @@ export default {
opacity: .4;
}
}

&.icon-redo {
margin-right: 22px;
}

&.icon-ul {
margin-left: 22px;
}
}

.menubar .submenu {
Expand Down
8 changes: 4 additions & 4 deletions src/components/SessionList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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;
Expand Down