Browse Source

Merge pull request #178 from theurere/fix-scss-lint-idselector

Fix scss-lint error IdSelector
pull/193/head
Simon Eisenmann 10 years ago
parent
commit
22031e24b6
  1. 2
      src/styles/components/_audiolevel.scss
  2. 40
      src/styles/components/_audiovideo.scss
  3. 8
      src/styles/components/_buddylist.scss
  4. 3
      src/styles/components/_chat.scss
  5. 3
      src/styles/components/_presentation.scss
  6. 11
      src/styles/components/_rightslide.scss
  7. 2
      src/styles/components/_roombar.scss
  8. 3
      src/styles/components/_screenshare.scss
  9. 2
      src/styles/components/_settings.scss
  10. 23
      src/styles/components/_usability.scss
  11. 6
      src/styles/components/_youtubevideo.scss
  12. 2
      src/styles/global/_base.scss
  13. 2
      src/styles/global/_loader.scss
  14. 2
      src/styles/global/_pages.scss
  15. 2
      static/partials/usability.html

2
src/styles/components/_audiolevel.scss

@ -19,7 +19,7 @@
* *
*/ */
#audiolevel { #audiolevel { // scss-lint:disable IdSelector
left: 0; left: 0;
margin: 0 auto; margin: 0 auto;
position: fixed; position: fixed;

40
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; bottom: 0;
left: 0; left: 0;
position: absolute; 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 { .audiovideo {
bottom: 0; bottom: 0;
left: 0; left: 0;

8
src/styles/components/_buddylist.scss

@ -19,7 +19,7 @@
* *
*/ */
#buddylist { #buddylist { // scss-lint:disable IdSelector
bottom: 0; bottom: 0;
position: absolute; position: absolute;
right: 0; right: 0;
@ -28,7 +28,7 @@
z-index: 50; z-index: 50;
} }
#buddylist:before { #buddylist:before { // scss-lint:disable IdSelector
background: $buddylist-tab-background; background: $buddylist-tab-background;
border-bottom: 1px solid $bordercolor; border-bottom: 1px solid $bordercolor;
border-bottom-left-radius: 6px; border-bottom-left-radius: 6px;
@ -55,12 +55,12 @@
z-index: 1; z-index: 1;
} }
.withBuddylist #buddylist:before { .withBuddylist #buddylist:before { // scss-lint:disable IdSelector
content: '\f101'; content: '\f101';
padding-right: 0; padding-right: 0;
} }
.withBuddylistAutoHide #buddylist:before { .withBuddylistAutoHide #buddylist:before { // scss-lint:disable IdSelector
display: block; display: block;
} }

3
src/styles/components/_chat.scss

@ -19,7 +19,7 @@
* *
*/ */
#chat { #chat { // scss-lint:disable IdSelector
bottom: 0; bottom: 0;
min-width: $chat-width; min-width: $chat-width;
opacity: 0; opacity: 0;
@ -32,6 +32,7 @@
} }
.withChat { .withChat {
// scss-lint:disable IdSelector
#chat { #chat {
opacity: 1; opacity: 1;
} }

3
src/styles/components/_presentation.scss

@ -19,7 +19,8 @@
* *
*/ */
.mainPresentation #presentation {
.mainPresentation #presentation { // scss-lint:disable IdSelector
display: block; display: block;
} }

11
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; bottom: 0;
left: 0; left: 0;
pointer-events: none; pointer-events: none;
@ -35,7 +40,3 @@
width: 100%; width: 100%;
} }
} }
.withBuddylist #rightslide {
right: 0;
}

2
src/styles/components/_roombar.scss

@ -19,7 +19,7 @@
* *
*/ */
#roombar { #roombar { // scss-lint:disable IdSelector
left: 0; left: 0;
min-width: 260px; min-width: 260px;
position: absolute; position: absolute;

3
src/styles/components/_screenshare.scss

@ -19,7 +19,8 @@
* *
*/ */
.mainScreenshare #screenshare {
.mainScreenshare #screenshare { // scss-lint:disable IdSelector
display: block; display: block;
} }

2
src/styles/components/_settings.scss

@ -19,7 +19,7 @@
* *
*/ */
#settings { #settings { // scss-lint:disable IdSelector
// scss-lint:disable NestingDepth // scss-lint:disable NestingDepth
background: $settings-background; background: $settings-background;
border-left: 1px solid $bordercolor; border-left: 1px solid $bordercolor;

23
src/styles/components/_usability.scss

@ -19,17 +19,24 @@
* *
*/ */
.withChat #help,
.withBuddylist #help { .withChat,
right: 260px; .withBuddylist {
// scss-lint:disable IdSelector
#help {
right: 260px;
}
} }
.withChat.withBuddylist #help, .withChat.withBuddylist,
.withSettings #help { .withSettings {
right: 520px; // scss-lint:disable IdSelector
#help {
right: 520px;
}
} }
#help { #help { // scss-lint:disable IdSelector
bottom: 10px; bottom: 10px;
color: #aaa; color: #aaa;
font-size: 1.1em; font-size: 1.1em;
@ -42,7 +49,9 @@
transition: right 200ms ease-in-out; transition: right 200ms ease-in-out;
user-select: none; user-select: none;
width: 350px; width: 350px;
}
.help {
@include breakpt($breakpoint-useability-small, max-width, only screen) { @include breakpt($breakpoint-useability-small, max-width, only screen) {
display: none; display: none;
} }

6
src/styles/components/_youtubevideo.scss

@ -19,7 +19,7 @@
* *
*/ */
.mainYoutubevideo #youtubevideo { .mainYoutubevideo #youtubevideo { // scss-lint:disable IdSelector
display: block; display: block;
} }
@ -90,11 +90,11 @@
top: 0; top: 0;
} }
#youtubecontainer { #youtubecontainer { // scss-lint:disable IdSelector
position: relative; position: relative;
} }
#youtubeplayerinfo { #youtubeplayerinfo { // scss-lint:disable IdSelector
bottom: 10%; bottom: 10%;
left: 0; left: 0;
opacity: 0; opacity: 0;

2
src/styles/global/_base.scss

@ -38,7 +38,7 @@ a {
cursor: pointer; cursor: pointer;
} }
#background { #background { // scss-lint:disable IdSelector
background: $main-background; background: $main-background;
bottom: 0; bottom: 0;
left: 0; left: 0;

2
src/styles/global/_loader.scss

@ -19,7 +19,7 @@
* *
*/ */
#loader { #loader { // scss-lint:disable IdSelector
background: $load-logo no-repeat center; background: $load-logo no-repeat center;
background-size: contain; background-size: contain;
bottom: 15%; bottom: 15%;

2
src/styles/global/_pages.scss

@ -19,7 +19,7 @@
* *
*/ */
#page { #page { // scss-lint:disable IdSelector
bottom: 0; bottom: 0;
left: 0; left: 0;
position: absolute; position: absolute;

2
static/partials/usability.html

@ -1,4 +1,4 @@
<div class="fadetogglecontainer" ng-hide="peer"> <div class="help fadetogglecontainer" ng-hide="peer">
<div class="animate-show" ng-hide="layout.settings"> <div class="animate-show" ng-hide="layout.settings">
<div class="fadetogglecontainer" ng-switch="usabilityInfo"> <div class="fadetogglecontainer" ng-switch="usabilityInfo">
<div ng-switch-when="checking"><i class="fa fa-refresh fa-spin fa-4x pull-right"></i>{{_("Checking camera and microphone access.")}}</div> <div ng-switch-when="checking"><i class="fa fa-refresh fa-spin fa-4x pull-right"></i>{{_("Checking camera and microphone access.")}}</div>

Loading…
Cancel
Save