Browse Source

Merge pull request #183 from theurere/fix-scss-lint-selectordepth

Fix scss-lint  error SelectorDepth
pull/186/head
Simon Eisenmann 10 years ago
parent
commit
c544238755
  1. 2
      html/logo.html
  2. 3
      src/styles/components/_audiovideo.scss
  3. 74
      src/styles/components/_bar.scss
  4. 12
      src/styles/components/_buddylist.scss
  5. 26
      src/styles/components/_contactsmanager.scss
  6. 15
      src/styles/components/_fileinfo.scss
  7. 47
      src/styles/components/_presentation.scss
  8. 2
      src/styles/components/_youtubevideo.scss

2
html/logo.html

@ -1 +1 @@
<%define "logo"%><span class="logo" title="<%.Cfg.Title%>"><span><a target="_blank" href="https://github.com/strukturag/spreed-webrtc">WebRTC</a></span></span><%end%> <%define "logo"%><span class="logo" title="<%.Cfg.Title%>"><span class="desc"><a target="_blank" href="https://github.com/strukturag/spreed-webrtc">WebRTC</a></span></span><%end%>

3
src/styles/components/_audiovideo.scss

@ -225,6 +225,7 @@
} }
.peerActions { .peerActions {
// scss-lint:disable SelectorDepth
bottom: 5%; bottom: 5%;
left: 40px; left: 40px;
opacity: 0; opacity: 0;
@ -349,6 +350,7 @@
} }
.renderer-smally { .renderer-smally {
// scss-lint:disable SelectorDepth
background: #000; background: #000;
border-right: 0; border-right: 0;
border-top: 0; border-top: 0;
@ -400,6 +402,7 @@
} }
.renderer-conferencekiosk { .renderer-conferencekiosk {
// scss-lint:disable SelectorDepth
.remoteVideos { .remoteVideos {
background: $video-background; background: $video-background;
bottom: 2px; bottom: 2px;

74
src/styles/components/_bar.scss

@ -37,42 +37,43 @@
padding: 2px 5px 0 11px; padding: 2px 5px 0 11px;
padding: 2px 5px 0 11px; padding: 2px 5px 0 11px;
} }
}
.logo { .logo {
background: $logo no-repeat; background: $logo no-repeat;
background-size: 100%; background-size: 100%;
color: #000; color: #000;
display: inline-block; display: inline-block;
font: normal 11px/11px $font-sans-serif; font: normal 11px/11px $font-sans-serif;
height: 32px; height: 32px;
text-align: left; text-align: left;
vertical-align: middle; vertical-align: middle;
width: 90px; width: 90px;
@include breakpt($breakpoint-medium) { @include breakpt($breakpoint-medium) {
background: $scalable-logo no-repeat center; background: $scalable-logo no-repeat center;
height: 46px; height: 46px;
width: 46px; width: 46px;
span { .desc {
display: none; display: none;
}
} }
}
span { .desc {
font-style: italic; font-style: italic;
left: 38px; left: 38px;
position: relative; position: relative;
top: 26px; top: 26px;
}
span a { a {
color: $bar-logo-text-desc; color: $bar-logo-text-desc;
} }
} }
} }
.bar .middle { .bar .middle {
// scss-lint:disable SelectorDepth
left: 0; left: 0;
pointer-events: none; pointer-events: none;
position: absolute; position: absolute;
@ -178,23 +179,22 @@
color: #fff; color: #fff;
} }
} }
}
.btn-mutemicrophone i:before { .btn-mutemicrophone i:before {
content: '\f130'; content: '\f130';
} }
.btn-mutemicrophone.active i:before {
content: '\f131';
}
.btn-mutecamera i:before { .btn-mutemicrophone.active i:before {
content: '\f06e'; content: '\f131';
} }
.btn-mutecamera.active i:before { .btn-mutecamera i:before {
content: '\f070'; content: '\f06e';
} }
.btn-mutecamera.active i:before {
content: '\f070';
} }
@keyframes shakeityeah { @keyframes shakeityeah {

12
src/styles/components/_buddylist.scss

@ -276,7 +276,7 @@
} }
} }
.buddy .buddysessions { .buddysessions {
margin-bottom: 10px; margin-bottom: 10px;
margin-top: 56px; margin-top: 56px;
max-height: 0; max-height: 0;
@ -292,20 +292,20 @@
padding-top: 10px; padding-top: 10px;
} }
ul li { li {
list-style-type: none; list-style-type: none;
margin-bottom: 2px; margin-bottom: 2px;
margin-left: 0; margin-left: 0;
.btn-group {
visibility: hidden;
}
&:hover .btn-group { &:hover .btn-group {
visibility: visible; visibility: visible;
} }
} }
.btn-group {
visibility: hidden;
}
.currentsession .buddy3 { .currentsession .buddy3 {
font-weight: bold; font-weight: bold;
} }

26
src/styles/components/_contactsmanager.scss

@ -68,22 +68,22 @@
.table { .table {
margin-bottom: 0; margin-bottom: 0;
}
tr:first-child td { tr:first-child td {
border-top: 0; border-top: 0;
} }
.name { .name {
text-align: left; text-align: left;
vertical-align: middle; vertical-align: middle;
width: 40%; width: 40%;
} }
.action { .action {
padding-right: 15px; padding-right: 15px;
text-align: right; text-align: right;
vertical-align: middle; vertical-align: middle;
}
} }
} }

15
src/styles/components/_fileinfo.scss

@ -37,17 +37,14 @@
.file-info-bg { .file-info-bg {
bottom: 0; bottom: 0;
color: $fileinfo-icon-background-color;
font-size: 20em;
left: 41px; left: 41px;
overflow: hidden; overflow: hidden;
position: absolute; position: absolute;
right: 0; right: 0;
top: -17px; top: -82px;
z-index: 2; z-index: 2;
.#{$fa-css-prefix} {
color: $fileinfo-icon-background-color;
font-size: 20em;
}
} }
.actions { .actions {
@ -64,10 +61,8 @@
border: 1px solid $fileinfo-border-remote; border: 1px solid $fileinfo-border-remote;
.file-info-bg { .file-info-bg {
.#{$fa-css-prefix} { color: $fileinfo-icon-background-color-remote;
color: $fileinfo-icon-background-color-remote; font-size: 20em;
font-size: 20em;
}
} }
} }

47
src/styles/components/_presentation.scss

@ -27,30 +27,6 @@
top: 0; top: 0;
} }
.presentationpane .welcome {
padding: 0;
}
.presentationpane .welcome h1 {
white-space: normal;
}
.presentationpane .welcome button {
margin-top: 30px;
}
.presentationpane .welcome .progress span {
text-shadow: none;
}
.presentationpane .welcome .progress .download-info {
color: $text-color;
left: 0;
position: absolute;
text-shadow: 1px 1px 1px #fff;
width: 100%;
}
.mainPresentation #presentation { .mainPresentation #presentation {
display: block; display: block;
} }
@ -62,6 +38,26 @@
position: absolute; position: absolute;
right: 0; right: 0;
top: 0; top: 0;
.welcome {
padding: 0;
.btn {
margin-top: 30px;
}
}
h1 {
white-space: normal;
}
.download-info {
color: $text-color;
left: 0;
position: absolute;
text-shadow: 1px 1px 1px #fff;
width: 100%;
}
} }
.presentationpane { .presentationpane {
@ -165,14 +161,17 @@
} }
.presentation .thumbnail .caption .size { .presentation .thumbnail .caption .size {
// scss-lint:disable SelectorDepth
font-size: 10px; font-size: 10px;
} }
.presentation .thumbnail .caption .progress { .presentation .thumbnail .caption .progress {
// scss-lint:disable SelectorDepth
position: relative; position: relative;
} }
.presentation .thumbnail .caption .download-info { .presentation .thumbnail .caption .download-info {
// scss-lint:disable SelectorDepth
bottom: 0; bottom: 0;
color: $text-color; color: $text-color;
left: 0; left: 0;

2
src/styles/components/_youtubevideo.scss

@ -112,7 +112,7 @@
width: 100%; width: 100%;
} }
.youtubevideo .overlaybar-content form .overlaybar-buttons { .youtubevideo .overlaybar-content .overlaybar-buttons {
position: absolute; position: absolute;
right: 23px; right: 23px;
top: 6px; top: 6px;

Loading…
Cancel
Save