diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2020-08-27 12:36:41 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-27 12:36:41 +0300 |
| commit | cd197818dbcb6eb23227baa4a31a01189e44c6bd (patch) | |
| tree | 289fe51edbdb20fa40636445996df22e9f5e33a5 /src | |
| parent | 8581d3bd24e55726c6dbeaff6edcc7309d2b6923 (diff) | |
| parent | f4fc7d5527251715c7d70718e3e7014cb8a58137 (diff) | |
Merge pull request #4041 from nextcloud/dependabot/npm_and_yarn/nextcloud-vue-collections-0.8.1
Bump nextcloud-vue-collections from 0.7.2 to 0.8.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/ConversationIcon.vue | 5 | ||||
| -rw-r--r-- | src/views/RoomSelector.vue | 35 |
2 files changed, 21 insertions, 19 deletions
diff --git a/src/components/ConversationIcon.vue b/src/components/ConversationIcon.vue index 0d551db6d..098607b0a 100644 --- a/src/components/ConversationIcon.vue +++ b/src/components/ConversationIcon.vue @@ -109,6 +109,7 @@ $icon-size: 44px; .conversation-icon { width: $icon-size; height: $icon-size; + position: relative; .avatar.icon { width: $icon-size; @@ -132,8 +133,8 @@ $icon-size: 44px; .overlap-icon { position: absolute; - top: 6px; - left: $icon-size - 6px; + top: 0; + left: calc(#{$icon-size} - 12px); line-height: 100%; .icon-favorite { diff --git a/src/views/RoomSelector.vue b/src/views/RoomSelector.vue index 4ea5ad0af..7b0842aa6 100644 --- a/src/views/RoomSelector.vue +++ b/src/views/RoomSelector.vue @@ -118,7 +118,7 @@ export default { } </script> -<style scoped> +<style lang="scss" scoped> #modal-inner { width: 90vw; max-width: 400px; @@ -144,31 +144,32 @@ li { padding: 6px; border: 1px solid transparent; display: flex; -} - -li:hover, li:focus { - background-color: var(--color-background-dark); - border-radius: var(--border-radius-pill); -} -li.selected { - background-color: var(--color-primary-light); - border-radius: var(--border-radius-pill); -} + &:hover, + &:focus { + background-color: var(--color-background-dark); + border-radius: var(--border-radius-pill); + } -li > span { - padding: 5px; - vertical-align: middle; + &.selected { + background-color: var(--color-primary-light); + border-radius: var(--border-radius-pill); + } + & > span { + padding: 5px 5px 5px 10px; + vertical-align: middle; + } } #modal-buttons { overflow: hidden; height: 44px; flex-shrink: 0; -} -#modal-buttons .primary { - float: right; + .primary { + float: right; + } } + </style> |