diff --git a/src/styles/components/_audiolevel.scss b/src/styles/components/_audiolevel.scss index 81d2f253..b1dc4239 100644 --- a/src/styles/components/_audiolevel.scss +++ b/src/styles/components/_audiolevel.scss @@ -19,7 +19,7 @@ * */ -#audiolevel { +#audiolevel { // scss-lint:disable IdSelector left: 0; margin: 0 auto; position: fixed; diff --git a/src/styles/components/_audiovideo.scss b/src/styles/components/_audiovideo.scss index d2ea565f..9481bfe4 100644 --- a/src/styles/components/_audiovideo.scss +++ b/src/styles/components/_audiovideo.scss @@ -19,7 +19,29 @@ * */ -#audiovideo { +.mainScreenshare, +.mainPresentation { + // scss-lint:disable IdSelector + #audiovideo { + @include breakpt($breakpoint-video-medium, max-width, only screen) { + display: none; + } + } +} + +.withChat, +.withBuddylist { + // scss-lint:disable IdSelector + #audiovideo { + right: 260px; + } +} + +.withBuddylist.withChat #audiovideo { // scss-lint:disable IdSelector + right: 520px; +} + +#audiovideo { // scss-lint:disable IdSelector bottom: 0; left: 0; position: absolute; @@ -43,22 +65,6 @@ } } -.mainScreenshare #audiovideo, -.mainPresentation #audiovideo { - @include breakpt($breakpoint-video-medium, max-width, only screen) { - display: none; - } -} - -.withChat #audiovideo, -.withBuddylist #audiovideo { - right: 260px; -} - -.withBuddylist.withChat #audiovideo { - right: 520px; -} - .audiovideo { bottom: 0; left: 0; diff --git a/src/styles/components/_buddylist.scss b/src/styles/components/_buddylist.scss index 6560a5af..8cac6628 100644 --- a/src/styles/components/_buddylist.scss +++ b/src/styles/components/_buddylist.scss @@ -19,7 +19,7 @@ * */ -#buddylist { +#buddylist { // scss-lint:disable IdSelector bottom: 0; position: absolute; right: 0; @@ -28,7 +28,7 @@ z-index: 50; } -#buddylist:before { +#buddylist:before { // scss-lint:disable IdSelector background: $buddylist-tab-background; border-bottom: 1px solid $bordercolor; border-bottom-left-radius: 6px; @@ -55,12 +55,12 @@ z-index: 1; } -.withBuddylist #buddylist:before { +.withBuddylist #buddylist:before { // scss-lint:disable IdSelector content: '\f101'; padding-right: 0; } -.withBuddylistAutoHide #buddylist:before { +.withBuddylistAutoHide #buddylist:before { // scss-lint:disable IdSelector display: block; } diff --git a/src/styles/components/_chat.scss b/src/styles/components/_chat.scss index 1b979bff..a9f4c9fb 100644 --- a/src/styles/components/_chat.scss +++ b/src/styles/components/_chat.scss @@ -19,7 +19,7 @@ * */ -#chat { +#chat { // scss-lint:disable IdSelector bottom: 0; min-width: $chat-width; opacity: 0; @@ -32,6 +32,7 @@ } .withChat { + // scss-lint:disable IdSelector #chat { opacity: 1; } diff --git a/src/styles/components/_presentation.scss b/src/styles/components/_presentation.scss index a0101fa5..487a1f94 100644 --- a/src/styles/components/_presentation.scss +++ b/src/styles/components/_presentation.scss @@ -19,7 +19,8 @@ * */ -.mainPresentation #presentation { + +.mainPresentation #presentation { // scss-lint:disable IdSelector display: block; } diff --git a/src/styles/components/_rightslide.scss b/src/styles/components/_rightslide.scss index a7c2b9c3..9fd0eb82 100644 --- a/src/styles/components/_rightslide.scss +++ b/src/styles/components/_rightslide.scss @@ -19,7 +19,12 @@ * */ -#rightslide { + +.withBuddylist #rightslide { // scss-lint:disable IdSelector + right: 0; +} + +#rightslide { // scss-lint:disable IdSelector bottom: 0; left: 0; pointer-events: none; @@ -35,7 +40,3 @@ width: 100%; } } - -.withBuddylist #rightslide { - right: 0; -} diff --git a/src/styles/components/_roombar.scss b/src/styles/components/_roombar.scss index b182d44c..1d7c499c 100644 --- a/src/styles/components/_roombar.scss +++ b/src/styles/components/_roombar.scss @@ -19,7 +19,7 @@ * */ -#roombar { +#roombar { // scss-lint:disable IdSelector left: 0; min-width: 260px; position: absolute; diff --git a/src/styles/components/_screenshare.scss b/src/styles/components/_screenshare.scss index 838bae41..c5028d60 100644 --- a/src/styles/components/_screenshare.scss +++ b/src/styles/components/_screenshare.scss @@ -19,7 +19,8 @@ * */ -.mainScreenshare #screenshare { + +.mainScreenshare #screenshare { // scss-lint:disable IdSelector display: block; } diff --git a/src/styles/components/_settings.scss b/src/styles/components/_settings.scss index 3b874c8a..55d1fcac 100644 --- a/src/styles/components/_settings.scss +++ b/src/styles/components/_settings.scss @@ -19,7 +19,7 @@ * */ -#settings { +#settings { // scss-lint:disable IdSelector // scss-lint:disable NestingDepth background: $settings-background; border-left: 1px solid $bordercolor; diff --git a/src/styles/components/_usability.scss b/src/styles/components/_usability.scss index 20c87055..3db56ef4 100644 --- a/src/styles/components/_usability.scss +++ b/src/styles/components/_usability.scss @@ -19,17 +19,24 @@ * */ -.withChat #help, -.withBuddylist #help { - right: 260px; + +.withChat, +.withBuddylist { + // scss-lint:disable IdSelector + #help { + right: 260px; + } } -.withChat.withBuddylist #help, -.withSettings #help { - right: 520px; +.withChat.withBuddylist, +.withSettings { + // scss-lint:disable IdSelector + #help { + right: 520px; + } } -#help { +#help { // scss-lint:disable IdSelector bottom: 10px; color: #aaa; font-size: 1.1em; @@ -42,7 +49,9 @@ transition: right 200ms ease-in-out; user-select: none; width: 350px; +} +.help { @include breakpt($breakpoint-useability-small, max-width, only screen) { display: none; } diff --git a/src/styles/components/_youtubevideo.scss b/src/styles/components/_youtubevideo.scss index 0221154e..8d122f72 100644 --- a/src/styles/components/_youtubevideo.scss +++ b/src/styles/components/_youtubevideo.scss @@ -19,7 +19,7 @@ * */ -.mainYoutubevideo #youtubevideo { +.mainYoutubevideo #youtubevideo { // scss-lint:disable IdSelector display: block; } @@ -90,11 +90,11 @@ top: 0; } -#youtubecontainer { +#youtubecontainer { // scss-lint:disable IdSelector position: relative; } -#youtubeplayerinfo { +#youtubeplayerinfo { // scss-lint:disable IdSelector bottom: 10%; left: 0; opacity: 0; diff --git a/src/styles/global/_base.scss b/src/styles/global/_base.scss index 42d2305e..e1db99f7 100644 --- a/src/styles/global/_base.scss +++ b/src/styles/global/_base.scss @@ -38,7 +38,7 @@ a { cursor: pointer; } -#background { +#background { // scss-lint:disable IdSelector background: $main-background; bottom: 0; left: 0; @@ -68,4 +68,4 @@ a { :fullscreen { background: #000; -} \ No newline at end of file +} diff --git a/src/styles/global/_loader.scss b/src/styles/global/_loader.scss index 9f2e9ad4..20d89f8f 100644 --- a/src/styles/global/_loader.scss +++ b/src/styles/global/_loader.scss @@ -19,7 +19,7 @@ * */ -#loader { +#loader { // scss-lint:disable IdSelector background: $load-logo no-repeat center; background-size: contain; bottom: 15%; diff --git a/src/styles/global/_pages.scss b/src/styles/global/_pages.scss index f10f2f63..487d7f8f 100644 --- a/src/styles/global/_pages.scss +++ b/src/styles/global/_pages.scss @@ -19,7 +19,7 @@ * */ -#page { +#page { // scss-lint:disable IdSelector bottom: 0; left: 0; position: absolute; diff --git a/static/partials/usability.html b/static/partials/usability.html index 8f57cd65..9c5e9002 100644 --- a/static/partials/usability.html +++ b/static/partials/usability.html @@ -1,4 +1,4 @@ -