diff options
author | Joas Schilling <coding@schilljs.com> | 2020-05-08 18:44:39 +0300 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2020-05-08 19:05:31 +0300 |
commit | 893e6bed04565c358778e2b440830315d0eba258 (patch) | |
tree | ba3fb5267f9248af880bbea9aef76c0e3158e54f | |
parent | 2d2e32105366f3e439cd2b00c475bf16206abb4a (diff) |
Fix stylelint
Signed-off-by: Joas Schilling <coding@schilljs.com>
22 files changed, 101 insertions, 100 deletions
diff --git a/css/publicshare.scss b/css/publicshare.scss index 20ac3bd93..9c5c1ca84 100644 --- a/css/publicshare.scss +++ b/css/publicshare.scss @@ -20,7 +20,6 @@ /* Always full height without header. */ height: calc(100% - 50px); } - display: flex; flex-direction: row; overflow: hidden; diff --git a/src/PublicShareAuthSidebar.vue b/src/PublicShareAuthSidebar.vue index bda91572a..9dda5cfcd 100644 --- a/src/PublicShareAuthSidebar.vue +++ b/src/PublicShareAuthSidebar.vue @@ -200,6 +200,13 @@ export default { overflow-x: hidden; overflow-y: auto; z-index: 1500; + + display: flex; + flex-direction: column; + justify-content: center; + + /* Unset conflicting rules from guest.css for the sidebar. */ + text-align: left; } .slide-right-leave-active, @@ -220,12 +227,6 @@ export default { max-width: 0 !important; } -#talk-sidebar { - display: flex; - flex-direction: column; - justify-content: center; -} - #talk-sidebar > .emptycontent { /* Remove default margin-top as it is unneeded when showing only the empty * content in a flex sidebar. */ @@ -248,10 +249,10 @@ export default { } #talk-sidebar #call-container ::v-deep .videoContainer { - /* The video container has some small padding to prevent the video from - * reaching the edges, but it also uses "width: 100%", so the padding should - * be included in the full width of the element. */ - box-sizing: border-box; + /* The video container has some small padding to prevent the video from + * reaching the edges, but it also uses "width: 100%", so the padding should + * be included in the full width of the element. */ + box-sizing: border-box; } #talk-sidebar #call-container ::v-deep .videoContainer.promoted video { @@ -281,11 +282,6 @@ export default { height: 50%; } -/* Unset conflicting rules from guest.css for the sidebar. */ -#talk-sidebar { - text-align: left; -} - #talk-sidebar ::v-deep .wrapper { margin-top: 0; } diff --git a/src/PublicShareSidebar.vue b/src/PublicShareSidebar.vue index 1877da0fe..381e23827 100644 --- a/src/PublicShareSidebar.vue +++ b/src/PublicShareSidebar.vue @@ -234,6 +234,10 @@ export default { overflow-x: hidden; overflow-y: auto; z-index: 1500; + + display: flex; + flex-direction: column; + justify-content: center; } .slide-right-leave-active, @@ -254,12 +258,6 @@ export default { max-width: 0 !important; } -#talk-sidebar { - display: flex; - flex-direction: column; - justify-content: center; -} - #talk-sidebar > .emptycontent { /* Remove default margin-top as it is unneeded when showing only the empty * content in a flex sidebar. */ @@ -308,10 +306,10 @@ export default { } #talk-sidebar #call-container ::v-deep .videoContainer { - /* The video container has some small padding to prevent the video from - * reaching the edges, but it also uses "width: 100%", so the padding should - * be included in the full width of the element. */ - box-sizing: border-box; + /* The video container has some small padding to prevent the video from + * reaching the edges, but it also uses "width: 100%", so the padding should + * be included in the full width of the element. */ + box-sizing: border-box; } #talk-sidebar #call-container ::v-deep .videoContainer.promoted video { diff --git a/src/components/AdminSettings/StunServers.vue b/src/components/AdminSettings/StunServers.vue index cdad3cb26..f865fd5d5 100644 --- a/src/components/AdminSettings/StunServers.vue +++ b/src/components/AdminSettings/StunServers.vue @@ -149,6 +149,7 @@ export default { display: flex; align-items: center; } + .icon { display: inline-block; width: 44px; diff --git a/src/components/CallView/CallView.vue b/src/components/CallView/CallView.vue index 8e63047f3..95019c45c 100644 --- a/src/components/CallView/CallView.vue +++ b/src/components/CallView/CallView.vue @@ -483,9 +483,11 @@ export default { margin-left: auto; margin-right: auto; } + .videoContainer.promoted ::v-deep .avatar-container { top: 30%; } + .videoContainer.promoted ::v-deep .avatar-container + .nameIndicator { display: none; } @@ -523,18 +525,21 @@ export default { top: initial; left: initial; } + @media only screen and (max-width: 768px) { .participants-1 .videoView, .participants-2 .videoView { max-height: 35%; } } + .constrained-layout.participants-1 .videoView, .constrained-layout.participants-2 .videoView { /* Do not force the width to 200px, as otherwise the video is too tall and * overlaps too much with the promoted video. */ min-width: initial; } + .participants-1 .videoView ::v-deep video, .participants-2 .videoView ::v-deep video { position: absolute; diff --git a/src/components/CallView/GridView/GridView.vue b/src/components/CallView/GridView/GridView.vue index bd3be7900..319abe709 100644 --- a/src/components/CallView/GridView/GridView.vue +++ b/src/components/CallView/GridView/GridView.vue @@ -596,13 +596,12 @@ export default { vertical-align: middle; padding-top: 80px; } + .dev-mode__title { position: absolute; - top: 44px; left: 44px; color: #00FF41; z-index: 100; - font-size: 30px; line-height: 120px; font-weight: 900; font-size: 100px !important; @@ -628,6 +627,7 @@ export default { white-space: nowrap; } } + .video:last-child { grid-column-end: -1; } @@ -641,6 +641,7 @@ export default { top: 8px; z-index: 2; box-shadow: 0 0 4px var(--color-box-shadow); + &:hover, &:focus { background-color: var(var(--color-primary-element-light)); @@ -671,8 +672,9 @@ export default { border-radius: 4px; background-color: white; opacity: 80%; - box-shadow: 0px 0px 4px black; - &--active { + box-shadow: 0 0 4px black; + + &--active { opacity: 100%; } } diff --git a/src/components/CallView/shared/LocalMediaControls.vue b/src/components/CallView/shared/LocalMediaControls.vue index 2b6e97ff5..7ab9b5122 100644 --- a/src/components/CallView/shared/LocalMediaControls.vue +++ b/src/components/CallView/shared/LocalMediaControls.vue @@ -411,7 +411,7 @@ export default { position: absolute; right: 20px; bottom: 12px; - } +} .nameIndicator button { background-color: transparent; @@ -419,6 +419,7 @@ export default { margin: 0; width: 44px; height: 44px; + background-size: 24px; } .nameIndicator #screensharing-menu button { @@ -426,10 +427,6 @@ export default { height: auto; } -.nameIndicator button { - background-size: 24px; -} - .nameIndicator button.audio-disabled, .nameIndicator button.video-disabled, .nameIndicator button.screensharing-disabled { @@ -467,7 +464,7 @@ export default { position: absolute; width: 3px; - right: 0px; + right: 0; /* The button height is 44px; the volume indicator button is 36px at * maximum, but its value will be changed based on the current volume; the diff --git a/src/components/CallView/shared/Video.vue b/src/components/CallView/shared/Video.vue index 156d38434..39694da98 100644 --- a/src/components/CallView/shared/Video.vue +++ b/src/components/CallView/shared/Video.vue @@ -352,28 +352,29 @@ export default { .avatar-container { margin: auto; } + .bottom-bar { position: absolute; bottom: 0; height: 40px; width: 100%; - padding: 0px 20px 12px 24px; + padding: 0 20px 12px 24px; display: flex; justify-content: space-between; align-items: flex-end; &--video-on { - text-shadow: 0px 0 4px rgba(0, 0, 0,.8); + text-shadow: 0 0 4px rgba(0, 0, 0,.8); } &__nameIndicator { - color: white; - position: relative; - font-size: 20px; + color: white; + position: relative; + font-size: 20px; } &__mediaIndicator { - position: relative; - background-size: 22px; - text-align: center; - margin-top: -8px; + position: relative; + background-size: 22px; + text-align: center; + margin-top: -8px; } } diff --git a/src/components/ConversationsOptionsList.vue b/src/components/ConversationsOptionsList.vue index e77e6c312..46d3b8a1e 100644 --- a/src/components/ConversationsOptionsList.vue +++ b/src/components/ConversationsOptionsList.vue @@ -82,6 +82,7 @@ export default { .ellipsis { text-overflow: ellipsis; } + .contacts-list { overflow: visible; display: block; diff --git a/src/components/LeftSidebar/NewGroupConversation/SetContacts/SetContacts.vue b/src/components/LeftSidebar/NewGroupConversation/SetContacts/SetContacts.vue index 35de8beec..ad1d3e47e 100644 --- a/src/components/LeftSidebar/NewGroupConversation/SetContacts/SetContacts.vue +++ b/src/components/LeftSidebar/NewGroupConversation/SetContacts/SetContacts.vue @@ -160,7 +160,7 @@ export default { font-size: 16px; padding-left: 28px; line-height: 34px; - box-shadow: 0px 10px 5px var(--color-main-background); + box-shadow: 0 10px 5px var(--color-main-background); z-index: 1; } &__icon { @@ -192,19 +192,21 @@ export default { } .zoom-enter-active { - animation: zoom-in var(--animation-quick); + animation: zoom-in var(--animation-quick); } + .zoom-leave-active { - animation: zoom-in var(--animation-quick) reverse; - will-change: transform; + animation: zoom-in var(--animation-quick) reverse; + will-change: transform; } + @keyframes zoom-in { - 0% { - transform: scale(0); - } - 100% { - transform: scale(1); - } + 0% { + transform: scale(0); + } + 100% { + transform: scale(1); + } } </style> diff --git a/src/components/LeftSidebar/SearchBox/SearchBox.vue b/src/components/LeftSidebar/SearchBox/SearchBox.vue index 47d18e165..dc2432622 100644 --- a/src/components/LeftSidebar/SearchBox/SearchBox.vue +++ b/src/components/LeftSidebar/SearchBox/SearchBox.vue @@ -129,18 +129,19 @@ export default { z-index: 1; display: flex; justify-content: center; + &__input { align-self: center; width: 100%; - margin: 0px; + margin: 0; } } .abort-search { margin-left: -28px; - z-index: 1; - border: none; - background-color: transparent + z-index: 1; + border: none; + background-color: transparent } </style> diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/DefaultParameter.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/DefaultParameter.vue index 01bbf58cd..f047c418e 100644 --- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/DefaultParameter.vue +++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/DefaultParameter.vue @@ -56,6 +56,6 @@ export default { <style lang="scss" scoped> .external:after { - content: " ↗"; + content: ' ↗'; } </style> diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue index 7deff6d01..7f6b9b983 100644 --- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue +++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue @@ -246,7 +246,7 @@ export default { &:not(.is-viewer-available) { strong:after { - content: " ↗"; + content: ' ↗'; } } } diff --git a/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue b/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue index 46b93fd6d..d15843165 100644 --- a/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue +++ b/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue @@ -351,10 +351,10 @@ export default { .new-message-form__advancedinput { overflow: visible; - margin-left: 6px !important; width: 100%; border:none; margin: 0; + margin-left: 6px !important; word-break: break-word; white-space: pre-wrap; } diff --git a/src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue b/src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue index bf6626751..dd3788d69 100644 --- a/src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue +++ b/src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue @@ -110,7 +110,3 @@ export default { }, } </script> - -<style scoped> - -</style> diff --git a/src/components/RightSidebar/Participants/ParticipantsList/Participant/LoadingParticipant.vue b/src/components/RightSidebar/Participants/ParticipantsList/Participant/LoadingParticipant.vue index e1dd00882..714f8851c 100644 --- a/src/components/RightSidebar/Participants/ParticipantsList/Participant/LoadingParticipant.vue +++ b/src/components/RightSidebar/Participants/ParticipantsList/Participant/LoadingParticipant.vue @@ -35,34 +35,33 @@ export default { </script> <style lang="scss" scoped> - .participant-loading { - $icon-size: 32px; +.participant-loading { + $icon-size: 32px; + height: 44px; + list-style-type: none; + padding-left: 4px; + margin: 5px 0; - height: 44px; - list-style-type: none; - padding-left: 4px; - margin: 5px 0; - - .icon-container { - width: $icon-size; - height: $icon-size; - margin-top: 2px; - display: inline-block; - background-color: var(--color-background-dark); - border-radius: 50%; - } + .icon-container { + width: $icon-size; + height: $icon-size; + margin-top: 2px; + display: inline-block; + background-color: var(--color-background-dark); + border-radius: 50%; + } - .placeholder { - width: 175px; - height: $icon-size; - display: inline-block; + .placeholder { + width: 175px; + height: $icon-size; + display: inline-block; - .username { - background-color: var(--color-background-dark); - height: $icon-size / 2; - margin-top: $icon-size / 4; - margin-left: 2px; - } + .username { + background-color: var(--color-background-dark); + height: $icon-size / 2; + margin-top: $icon-size / 4; + margin-left: 2px; } } +} </style> diff --git a/src/components/RightSidebar/Participants/ParticipantsList/ParticipantsList.vue b/src/components/RightSidebar/Participants/ParticipantsList/ParticipantsList.vue index 0f75d8c1d..57ab4b96e 100644 --- a/src/components/RightSidebar/Participants/ParticipantsList/ParticipantsList.vue +++ b/src/components/RightSidebar/Participants/ParticipantsList/ParticipantsList.vue @@ -87,6 +87,3 @@ export default { }, } </script> - -<style lang="scss" scoped> -</style> diff --git a/src/components/RightSidebar/Participants/ParticipantsTab.vue b/src/components/RightSidebar/Participants/ParticipantsTab.vue index 10c2cf8e4..df536ed52 100644 --- a/src/components/RightSidebar/Participants/ParticipantsTab.vue +++ b/src/components/RightSidebar/Participants/ParticipantsTab.vue @@ -270,6 +270,7 @@ export default { margin-top: 0 !important; right: 54px !important; } + ::v-deep .app-sidebar__close { top: 6px !important; right: 6px !important; diff --git a/src/components/RightSidebar/RightSidebar.vue b/src/components/RightSidebar/RightSidebar.vue index c15ebd748..958426d78 100644 --- a/src/components/RightSidebar/RightSidebar.vue +++ b/src/components/RightSidebar/RightSidebar.vue @@ -250,6 +250,7 @@ export default { overflow-y: auto; } } + .app-sidebar-tabs__content #tab-chat { /* Remove padding to maximize the space for the chat view. */ padding: 0; diff --git a/src/views/NotFoundView.vue b/src/views/NotFoundView.vue index 6f1478f26..9d44cc648 100644 --- a/src/views/NotFoundView.vue +++ b/src/views/NotFoundView.vue @@ -13,6 +13,3 @@ export default { name: 'NotFoundView', } </script> - -<style lang="scss" scoped> -</style> diff --git a/src/views/RoomSelector.vue b/src/views/RoomSelector.vue index 008f5085e..c6a9758f2 100644 --- a/src/views/RoomSelector.vue +++ b/src/views/RoomSelector.vue @@ -54,6 +54,7 @@ height: 50vh; position: relative; } + #modal-content { position: absolute; width: calc(100% - 40px); @@ -62,40 +63,49 @@ flex-direction: column; padding: 20px; } + #room-list { overflow-y: auto; flex: 0 1 auto; } + li { padding: 6px; border: 1px solid transparent; display: flex; } + li:hover, li:focus { background-color: var(--color-background-dark); } + li.selected { box-shadow: inset 4px 0 var(--color-primary-element); } + .avatar.icon { border-radius: 50%; width: 32px; height: 32px; background-color: var(--color-background-darker); } + li > span { padding: 5px; } + li > span, .avatar { vertical-align: middle; } + #modal-buttons { overflow: hidden; height: 44px; flex-shrink: 0; } + #modal-buttons .primary { float: right; } diff --git a/src/views/WelcomeView.vue b/src/views/WelcomeView.vue index 02679053e..5dcbf7ac2 100644 --- a/src/views/WelcomeView.vue +++ b/src/views/WelcomeView.vue @@ -17,6 +17,3 @@ export default { name: 'WelcomeView', } </script> - -<style lang="scss" scoped> -</style> |