style: update modal UI styles

Signed-off-by: Luka Trovic <luka@nextcloud.com>
This commit is contained in:
Luka Trovic
2022-03-21 09:12:43 +01:00
parent eef33ac220
commit 83b739d117
8 changed files with 75 additions and 34 deletions

View File

@@ -269,7 +269,7 @@ export default {
padding-left: 44px; padding-left: 44px;
background-position: 16px center; background-position: 16px center;
flex-grow: 1; flex-grow: 1;
height: 44px; height: auto;
margin-bottom: 12px; margin-bottom: 12px;
text-align: left; text-align: left;
} }

View File

@@ -7,7 +7,6 @@
@restore-attachment="restoreAttachment" /> @restore-attachment="restoreAttachment" />
</div> </div>
</template> </template>
<script> <script>
import AttachmentList from './AttachmentList' import AttachmentList from './AttachmentList'

View File

@@ -53,7 +53,7 @@
</div> </div>
</div> </div>
<div class="content"> <div class="content">
<div class="content-tabs"> <div :class="[currentCard.labels.length > 3 ? 'content-two-tabs' : 'content-three-tabs']">
<MembersTab <MembersTab
:card="currentCard" :card="currentCard"
:active-tabs="activeTabs" :active-tabs="activeTabs"
@@ -91,15 +91,22 @@
<Description :key="currentCard.id" :card="currentCard" @change="descriptionChanged" /> <Description :key="currentCard.id" :card="currentCard" @change="descriptionChanged" />
</div> </div>
<div class="activities"> <div class="activities">
<h2 class="activities-title"> <div class="activities-header">
<div class="icon-activity" /> {{ t('deck', 'Activity') }} <div class="activities-title">
</h2> <i class="icon-activity" /> {{ t('deck', 'Activity') }}
<CardSidebarTabComments :card="currentCard" :tab-query="tabQuery" /> </div>
<ActivityList v-if="hasActivity" <div class="show-details-btn" @click="showDetails = !showDetails">
filter="deck" {{ showDetails ? t('deck', 'Hide details') : t('deck', 'Show details') }}
:object-id="currentBoard.id" </div>
object-type="deck" </div>
type="deck" /> <template v-if="showDetails">
<CardSidebarTabComments :card="currentCard" :tab-query="tabQuery" />
<ActivityList v-if="hasActivity"
filter="deck"
:object-id="currentBoard.id"
object-type="deck"
type="deck" />
</template>
</div> </div>
</div> </div>
</template> </template>
@@ -166,6 +173,7 @@ export default {
comment: '', comment: '',
currentTab: null, currentTab: null,
activeTabs: [], activeTabs: [],
showDetails: false,
} }
}, },
computed: { computed: {
@@ -292,12 +300,30 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.content-tabs { .show-details-btn {
cursor: pointer;
text-decoration: underline;
color: var(--color-text-maxcontrast);
}
.activities-header{
display: flex;
justify-content: space-between;
}
.content-two-tabs, .content-three-tabs {
display: grid; display: grid;
grid-template-columns: 1fr 2fr 1fr;
align-items: flex-start; align-items: flex-start;
} }
.content-two-tabs {
grid-template-columns: 1fr 2fr;
}
.content-three-tabs {
grid-template-columns: 1fr 2fr 1fr;
}
.icon-activity { .icon-activity {
background-image: url(../../../img/flash-black.svg); background-image: url(../../../img/flash-black.svg);
width: 15px; width: 15px;
@@ -324,7 +350,7 @@ export default {
} }
.activities { .activities {
&-title { &-title{
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
@@ -338,12 +364,12 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
&-input { &-input{
width: 100%; width: 100%;
margin-left: 10px; margin-left: 10px;
} }
.comment-form { .comment-form{
width: 95%; width: 95%;
} }
} }
@@ -366,10 +392,8 @@ export default {
.tabs { .tabs {
margin-top: 20px; margin-top: 20px;
margin-bottom: 20px; margin-bottom: 5px;
display: grid; display: flex;
grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
grid-gap: 30px;
} }
.tab { .tab {
@@ -382,12 +406,11 @@ export default {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
overflow: hidden; overflow: hidden;
padding: 10px 10px; padding: 10px 20px;
border-radius: 10px; border-radius: 10px;
font-size: 85%; font-size: 85%;
margin-bottom: 3px; margin-bottom: 3px;
margin-right: 5px; margin-right: 15px;
width: 100px;
} }
.action-btn { .action-btn {

View File

@@ -26,8 +26,7 @@
</InfiniteLoading> </InfiniteLoading>
</ul> </ul>
<div v-else-if="isLoading" class="icon icon-loading" /> <div v-else-if="isLoading" class="icon icon-loading" />
<div v-else class="emptycontent"> <div v-else>
<div :class="{ 'icon-comment': !error, 'icon-error': error }" />
<p>{{ error || t('deck', 'No comments yet. Begin the discussion!') }}</p> <p>{{ error || t('deck', 'No comments yet. Begin the discussion!') }}</p>
</div> </div>
</div> </div>

View File

@@ -166,12 +166,12 @@ export default {
}, },
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.section-details{ .section-details{
margin-right: 5px; margin-right: 5px;
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
margin-top: 10px;
} }
</style> </style>

View File

@@ -192,6 +192,7 @@ export default {
.section-details { .section-details {
width: 100%; width: 100%;
margin-top: 10px;
} }
.members { .members {

View File

@@ -1,6 +1,6 @@
<template> <template>
<div v-if="activeTabs.includes('project')" class="section-details"> <div v-if="activeTabs.includes('project')" class="section-details">
<div class="section-wrapper"> <div class="section-wrapper project-tab">
<CollectionList v-if="card.id" <CollectionList v-if="card.id"
:id="`${card.id}`" :id="`${card.id}`"
:name="card.title" :name="card.title"
@@ -8,10 +8,8 @@
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { CollectionList } from 'nextcloud-vue-collections' import { CollectionList } from 'nextcloud-vue-collections'
export default { export default {
components: { CollectionList }, components: { CollectionList },
props: { props: {
@@ -26,7 +24,12 @@ export default {
}, },
} }
</script> </script>
<style scoped>
.section-details{
margin-top: 10px;
min-width: 500px;
}
</style>
<style lang="scss"> <style lang="scss">
#collection-select-container p { #collection-select-container p {
display: none; display: none;
@@ -35,4 +38,16 @@ export default {
#collection-list li { #collection-list li {
align-items: flex-end; align-items: flex-end;
} }
.project-tab .collection-list-item {
display: flex !important;
align-items: center !important;
}
.project-tab .linked-icons {
img {
height: 20px !important;
}
}
</style> </style>

View File

@@ -144,7 +144,7 @@ export default {
align-items: center; align-items: center;
&-item { &-item {
border-radius: 5px; border-radius: 15px;
margin-right: 5px; margin-right: 5px;
min-width: 110px; min-width: 110px;
height: 32px; height: 32px;
@@ -156,12 +156,16 @@ export default {
.select-tag { .select-tag {
height: 32px; height: 32px;
width: 34px; width: 34px;
padding: 5px 8px; padding: 5px 8px;
} }
.tag{ .tag{
padding: 0px 5px; padding: 0px 5px;
border-radius: 15px; border-radius: 15px;
} }
.section-details{
margin-top: 10px;
}
</style> </style>