Skip to content
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.

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

fix: design review issues #6113

Merged
merged 1 commit into from
Jul 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions css/deck.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,13 @@
background-image: url(../img/deck.svg);
filter: var(--background-invert-if-dark);
}

input[type=submit].icon-confirm {
border-color: var(--color-border-maxcontrast) !important;
border-left: none;
}

input[type=text]:focus+input[type=submit].icon-confirm,
input[type=text]:hover+input[type=submit].icon-confirm {
border-color: var(--color-main-text) !important;
}
2 changes: 1 addition & 1 deletion src/components/ActivityEntry.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</div>
</div>
<!-- FIXME ins/del tags do no longer work with activity so we should get rid of that -->
<p v-if="activity.message" class="activity--message" v-html="sanitizedMessage" />

Check warning on line 16 in src/components/ActivityEntry.vue

View workflow job for this annotation

GitHub Actions / NPM lint

'v-html' directive can lead to XSS attack
</div>
</template>

Expand Down Expand Up @@ -120,7 +120,7 @@
margin-left: 10px;
}
.activity--message {
margin-left: 44px;
margin-left: var(--default-clickable-area);
color: var(--color-text-light);
margin-bottom: 10px;
}
Expand Down
12 changes: 6 additions & 6 deletions src/components/Controls.vue
Original file line number Diff line number Diff line change
Expand Up @@ -476,8 +476,8 @@ export default {
.controls {
display: flex;
margin: 5px;
height: 44px;
padding-left: 44px;
height: var(--default-clickable-area);
padding-left: var(--default-clickable-area);

.board-title {
display: flex;
Expand Down Expand Up @@ -507,8 +507,8 @@ export default {

#app-navigation-toggle-custom {
position: static;
width: 44px;
height: 44px;
width: var(--default-clickable-area);
height: var(--default-clickable-area);
cursor: pointer;
opacity: 1;
display: inline-block !important;
Expand Down Expand Up @@ -567,8 +567,8 @@ export default {
.filter-button {
padding: 0;
border-radius: 50%;
width: 44px;
height: 44px;
width: var(--default-clickable-area);
height: var(--default-clickable-area);

&[data-popper-shown] {
background-color: var(--color-background-hover);
Expand Down
2 changes: 1 addition & 1 deletion src/components/SessionList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export default {
<style scoped lang="scss">

.avatar-list {
min-height: 44px;
min-height: var(--default-clickable-area);
align-items: center;
padding-right: 0.5em;
border: none;
Expand Down
2 changes: 1 addition & 1 deletion src/components/board/Board.vue
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ export default {
.board {
padding-left: $board-spacing;
position: relative;
max-height: calc(100% - 44px);
max-height: calc(100% - var(--default-clickable-area));
overflow: hidden;
overflow-x: auto;
flex-grow: 1;
Expand Down
13 changes: 11 additions & 2 deletions src/components/board/BoardSidebar.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
- SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
- SPDX-License-Identifier: AGPL-3.0-or-later
- SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
- SPDX-License-Identifier: AGPL-3.0-or-later
-->

<template>
Expand Down Expand Up @@ -100,3 +100,12 @@ export default {
},
}
</script>

<style scoped lang="scss">
:deep {
.app-sidebar-tabs__tab-caption,
.app-sidebar-tabs__nav .checkbox-content__text {
white-space: normal !important;
}
}
</style>
6 changes: 3 additions & 3 deletions src/components/board/DeletedTabSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
-->
<template>
<div>
<h3>{{ t('deck', 'Deleted lists') }}</h3>
<h5>{{ t('deck', 'Deleted lists') }}</h5>
<ul>
<li v-for="deletedStack in deletedStacks" :key="deletedStack.id">
<span class="icon icon-deck" />
Expand All @@ -18,7 +18,7 @@
</li>
</ul>

<h3>{{ t('deck', 'Deleted cards') }}</h3>
<h5>{{ t('deck', 'Deleted cards') }}</h5>
<ul>
<li v-for="deletedCard in deletedCards" :key="deletedCard.id">
<div class="icon icon-deck" />
Expand Down Expand Up @@ -102,7 +102,7 @@ export default {
}

* {
flex-basis: 44px;
flex-basis: var(--default-clickable-area);
}

.title {
Expand Down
18 changes: 13 additions & 5 deletions src/components/board/Stack.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
- SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
- SPDX-License-Identifier: AGPL-3.0-or-later
- SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
- SPDX-License-Identifier: AGPL-3.0-or-later
-->

<template>
Expand Down Expand Up @@ -261,7 +261,7 @@ export default {
},
startEditing(stack) {
if (this.dragging) {
return
return
}

this.copiedStack = Object.assign({}, stack)
Expand Down Expand Up @@ -322,7 +322,7 @@ export default {
padding-left: $card-spacing;
padding-right: $card-spacing;
cursor: grab;
min-height: 44px;
min-height: var(--default-clickable-area);

// Smooth fade out of the cards at the top
&:before {
Expand Down Expand Up @@ -374,6 +374,7 @@ export default {
border-radius: 3px;
margin: 6px;
padding: 4px 4px;
font-size: 120%;

&:focus-visible {
outline: 2px solid var(--color-border-dark);
Expand All @@ -384,10 +385,17 @@ export default {
form {
margin: 2px 0;
}

:deep {
.action-item,
.v-popper--theme-dropdown {
display: flex;
}
}
}

.stack__card-add {
height: 44px;
height: var(--default-clickable-area);
flex-shrink: 0;
z-index: 100;
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion src/components/board/TagsTabSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ export default {
}
</script>
<style scoped lang="scss">
$clickable-area: 44px;
$clickable-area: var(--default-clickable-area);

.labels li {
display: flex;
Expand Down
4 changes: 2 additions & 2 deletions src/components/boards/Boards.vue
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export default {

<style lang="scss">
.board-list {
margin-top: -44px;
margin-top: - var(--default-clickable-area); //@TODO

.board-list-row {
align-items: center;
Expand All @@ -77,7 +77,7 @@ export default {

.board-list-header-row {
color: var(--color-text-lighter);
height: 44px;
height: var(--default-clickable-area);
}

.board-list-bullet-cell,
Expand Down
8 changes: 4 additions & 4 deletions src/components/card/AttachmentList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -253,10 +253,10 @@ export default {
gap: calc(var(--default-grid-baseline) * 3);

.icon-upload, .icon-folder {
padding-left: 44px;
padding-left: var(--default-clickable-area);
background-position: 16px center;
flex-grow: 1;
height: 44px;
height: var(--default-clickable-area);
margin-bottom: 12px;
text-align: left;
}
Expand Down Expand Up @@ -291,7 +291,7 @@ export default {
li.attachment {
display: flex;
padding: 3px;
min-height: 44px;
min-height: var(--default-clickable-area);

&.deleted {
opacity: .5;
Expand Down Expand Up @@ -339,7 +339,7 @@ export default {
}
}
button.icon-history {
width: 44px;
width: var(--default-clickable-area);
}
progress {
margin-top: 3px;
Expand Down
2 changes: 1 addition & 1 deletion src/components/card/CardSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ section.app-sidebar__tab--active {
right: 0;
max-width: calc(100% - #{$modal-padding * 2});
padding: 0 14px;
height: 100%;
height: 97%;
overflow: initial;
user-select: text;
-webkit-user-select: text;
Expand Down
2 changes: 1 addition & 1 deletion src/components/card/CommentItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ export default {
@import '../../css/comments';

.reply {
margin: 0 0 0 44px;
margin: 0 0 0 var(--default-clickable-area);

&.reply--preview {
margin: 4px 0;
Expand Down
2 changes: 1 addition & 1 deletion src/components/card/Description.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
id="description-preview"
dir="auto"
@click="clickedPreview"
v-html="renderedDescription" />

Check warning on line 43 in src/components/card/Description.vue

View workflow job for this annotation

GitHub Actions / NPM lint

'v-html' directive can lead to XSS attack
<p v-else-if="!descriptionEditing" class="placeholder" @click="showEditor()">
{{ t('deck', 'Write a description …') }}
</p>
Expand Down Expand Up @@ -367,7 +367,7 @@
}

.description__text :deep(.ProseMirror) {
padding-bottom: 44px;
padding-bottom: var(--default-clickable-area);
}

</style>
Expand Down
4 changes: 2 additions & 2 deletions src/components/cards/CardItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ export default {
}
}
.card-menu {
height: 44px;
height: var(--default-clickable-area);
align-self: end;
}
}
Expand Down Expand Up @@ -391,7 +391,7 @@ export default {
}

.compact {
min-height: 44px;
min-height: var(--default-clickable-area);

.duedate {
margin-right: 0;
Expand Down
6 changes: 3 additions & 3 deletions src/components/navigation/AppNavigationAddBoard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export default {
.board-create {
order: 1;
display: flex;
height: 44px;
height: var(--default-clickable-area);

form {
display: flex;
Expand All @@ -86,8 +86,8 @@ export default {
}

.app-navigation-entry-bullet-wrapper {
width: 44px;
height: 44px;
width: var(--default-clickable-area);
height: var(--default-clickable-area);
.color0 {
width: 30px !important;
margin: 5px;
Expand Down
8 changes: 4 additions & 4 deletions src/components/navigation/AppNavigationBoard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -319,10 +319,10 @@ export default {

<style lang="scss" scoped>
.board-edit {
margin-left: 44px;
margin-left: var(--default-clickable-area);
order: 1;
display: flex;
height: 44px;
height: var(--default-clickable-area);

form {
display: flex;
Expand All @@ -335,8 +335,8 @@ export default {
}

.app-navigation-entry-bullet-wrapper {
width: 44px;
height: 44px;
width: var(--default-clickable-area);
height: var(--default-clickable-area);
.color0 {
width: 30px !important;
margin: 5px;
Expand Down
2 changes: 1 addition & 1 deletion src/components/overview/Overview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ export default {

.overview {
position: relative;
height: calc(100% - 44px);
height: calc(100% - var(--default-clickable-area));
overflow-x: scroll;
display: flex;
align-items: stretch;
Expand Down
2 changes: 1 addition & 1 deletion src/components/search/Placeholder.vue
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export default {

<style lang="scss" scoped>
@import '../../css/variables';
$clickable-area: 44px;
$clickable-area: var(--default-clickable-area);

.card--placeholder {
width: $stack-width;
Expand Down
8 changes: 4 additions & 4 deletions src/css/comments.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@

.editor__content:deep {
flex-grow: 1;
margin-left: 44px;
margin-left: var(--default-clickable-area);

.ProseMirror {
width: 100%;
}
}

input[type='submit'] {
width: 44px;
height: 44px;
width: var(--default-clickable-area);
height: var(--default-clickable-area);
margin: 0;
padding: 13px;
background-color: transparent;
Expand Down Expand Up @@ -51,6 +51,6 @@
}

.comment--content {
margin-left: 44px;
margin-left: var(--default-clickable-area);
word-break: break-word;
}
1 change: 1 addition & 0 deletions src/helpers/mentions.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

const rawToParsed = (text) => {
text = text.replace(/<br>/g, '\n')
text = text.replace(/&nbsp;/g, ' ')
Expand Down
1 change: 1 addition & 0 deletions src/helpers/xml.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

const xmlToJson = (xml) => {
let obj = {}
if (xml.nodeType === 1) {
Expand Down