diff options
| author | René Gieling <github@dartcafe.de> | 2021-06-01 22:59:59 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-01 22:59:59 +0300 |
| commit | e7f558fc728c015a90c952a2d670c1068044306e (patch) | |
| tree | e2dcaa85dd269be7604ebaa61441f9f19e95ca39 /src | |
| parent | 83d56f550d21a284f81838161f81576c8dc2fcbe (diff) | |
| parent | 767e6941767dc402d0ffaeb3817c85046498777e (diff) | |
Merge pull request #1678 from nextcloud/enh/counter-list-style
change counter in list view
Diffstat (limited to 'src')
| -rw-r--r-- | src/js/assets/scss/print.scss | 2 | ||||
| -rw-r--r-- | src/js/components/Options/Counter.vue | 2 | ||||
| -rw-r--r-- | src/js/components/VoteTable/VoteTable.vue | 18 |
3 files changed, 13 insertions, 9 deletions
diff --git a/src/js/assets/scss/print.scss b/src/js/assets/scss/print.scss index 9e2e6ad3..cde3110a 100644 --- a/src/js/assets/scss/print.scss +++ b/src/js/assets/scss/print.scss @@ -48,7 +48,7 @@ #header, #app-navigation-vue, #app-sidebar-vue, - .counter, + .counter.barStyle, .area__footer, .action-item, .header-actions, diff --git a/src/js/components/Options/Counter.vue b/src/js/components/Options/Counter.vue index f43c8786..7ac414c4 100644 --- a/src/js/components/Options/Counter.vue +++ b/src/js/components/Options/Counter.vue @@ -21,7 +21,7 @@ --> <template> - <div class="counter"> + <div :class="['counter' , counterStyle ]"> <div v-if="counterStyle === 'iconStyle'" class="counter--icon"> <div class="yes"> <span>{{ option.yes }}</span> diff --git a/src/js/components/VoteTable/VoteTable.vue b/src/js/components/VoteTable/VoteTable.vue index 312fc83f..0ac5c0d4 100644 --- a/src/js/components/VoteTable/VoteTable.vue +++ b/src/js/components/VoteTable/VoteTable.vue @@ -49,9 +49,7 @@ <Counter v-else-if="acl.allowSeeResults" :show-maybe="!!poll.allowMaybe" - :option="option" - :counter-style="viewMode === 'table-view' ? 'iconStyle' : 'barStyle'" - :show-no="viewMode === 'list-view'" /> + :option="option" /> <CalendarPeek v-if="poll.type === 'datePoll' && getCurrentUser() && settings.calendarPeek" :option="option" /> <VoteItem v-for="(participant) in participants" @@ -320,10 +318,16 @@ export default { } .counter { - position: absolute; - bottom: 0; - width: 100%; - padding-left: 44px; + &.barStyle { + position: absolute; + bottom: 0; + width: 100%; + padding-left: 44px; + } + &.iconStyle { + order: 0; + padding-left: 44px; + } } .vote-item.currentuser { |