diff --git a/html/logo.html b/html/logo.html index ab7b9a7b..22c2622a 100644 --- a/html/logo.html +++ b/html/logo.html @@ -1 +1 @@ -<%define "logo"%><%end%> \ No newline at end of file +<%define "logo"%><%end%> diff --git a/src/styles/components/_audiovideo.scss b/src/styles/components/_audiovideo.scss index 59a2027e..1eaea45d 100644 --- a/src/styles/components/_audiovideo.scss +++ b/src/styles/components/_audiovideo.scss @@ -225,6 +225,7 @@ } .peerActions { + // scss-lint:disable SelectorDepth bottom: 5%; left: 40px; opacity: 0; @@ -349,6 +350,7 @@ } .renderer-smally { + // scss-lint:disable SelectorDepth background: #000; border-right: 0; border-top: 0; @@ -400,6 +402,7 @@ } .renderer-conferencekiosk { + // scss-lint:disable SelectorDepth .remoteVideos { background: $video-background; bottom: 2px; diff --git a/src/styles/components/_bar.scss b/src/styles/components/_bar.scss index f1903eea..bba29bc3 100644 --- a/src/styles/components/_bar.scss +++ b/src/styles/components/_bar.scss @@ -37,42 +37,43 @@ padding: 2px 5px 0 11px; padding: 2px 5px 0 11px; } +} - .logo { - background: $logo no-repeat; - background-size: 100%; - color: #000; - display: inline-block; - font: normal 11px/11px $font-sans-serif; - height: 32px; - text-align: left; - vertical-align: middle; - width: 90px; +.logo { + background: $logo no-repeat; + background-size: 100%; + color: #000; + display: inline-block; + font: normal 11px/11px $font-sans-serif; + height: 32px; + text-align: left; + vertical-align: middle; + width: 90px; - @include breakpt($breakpoint-medium) { - background: $scalable-logo no-repeat center; - height: 46px; - width: 46px; + @include breakpt($breakpoint-medium) { + background: $scalable-logo no-repeat center; + height: 46px; + width: 46px; - span { - display: none; - } + .desc { + display: none; } + } - span { - font-style: italic; - left: 38px; - position: relative; - top: 26px; - } + .desc { + font-style: italic; + left: 38px; + position: relative; + top: 26px; - span a { + a { color: $bar-logo-text-desc; } } } .bar .middle { + // scss-lint:disable SelectorDepth left: 0; pointer-events: none; position: absolute; @@ -178,23 +179,22 @@ color: #fff; } } +} - .btn-mutemicrophone i:before { - content: '\f130'; - } - - .btn-mutemicrophone.active i:before { - content: '\f131'; - } +.btn-mutemicrophone i:before { + content: '\f130'; +} - .btn-mutecamera i:before { - content: '\f06e'; - } +.btn-mutemicrophone.active i:before { + content: '\f131'; +} - .btn-mutecamera.active i:before { - content: '\f070'; - } +.btn-mutecamera i:before { + content: '\f06e'; +} +.btn-mutecamera.active i:before { + content: '\f070'; } @keyframes shakeityeah { diff --git a/src/styles/components/_buddylist.scss b/src/styles/components/_buddylist.scss index 7c12a828..5cc99341 100644 --- a/src/styles/components/_buddylist.scss +++ b/src/styles/components/_buddylist.scss @@ -276,7 +276,7 @@ } } -.buddy .buddysessions { +.buddysessions { margin-bottom: 10px; margin-top: 56px; max-height: 0; @@ -292,20 +292,20 @@ padding-top: 10px; } - ul li { + li { list-style-type: none; margin-bottom: 2px; margin-left: 0; - .btn-group { - visibility: hidden; - } - &:hover .btn-group { visibility: visible; } } + .btn-group { + visibility: hidden; + } + .currentsession .buddy3 { font-weight: bold; } diff --git a/src/styles/components/_contactsmanager.scss b/src/styles/components/_contactsmanager.scss index f216ea58..e7bb7157 100644 --- a/src/styles/components/_contactsmanager.scss +++ b/src/styles/components/_contactsmanager.scss @@ -68,22 +68,22 @@ .table { margin-bottom: 0; + } - tr:first-child td { - border-top: 0; - } + tr:first-child td { + border-top: 0; + } - .name { - text-align: left; - vertical-align: middle; - width: 40%; - } + .name { + text-align: left; + vertical-align: middle; + width: 40%; + } - .action { - padding-right: 15px; - text-align: right; - vertical-align: middle; - } + .action { + padding-right: 15px; + text-align: right; + vertical-align: middle; } } diff --git a/src/styles/components/_fileinfo.scss b/src/styles/components/_fileinfo.scss index 1a145e0f..c11a5a57 100644 --- a/src/styles/components/_fileinfo.scss +++ b/src/styles/components/_fileinfo.scss @@ -37,17 +37,14 @@ .file-info-bg { bottom: 0; + color: $fileinfo-icon-background-color; + font-size: 20em; left: 41px; overflow: hidden; position: absolute; right: 0; - top: -17px; + top: -82px; z-index: 2; - - .#{$fa-css-prefix} { - color: $fileinfo-icon-background-color; - font-size: 20em; - } } .actions { @@ -64,10 +61,8 @@ border: 1px solid $fileinfo-border-remote; .file-info-bg { - .#{$fa-css-prefix} { - color: $fileinfo-icon-background-color-remote; - font-size: 20em; - } + color: $fileinfo-icon-background-color-remote; + font-size: 20em; } } diff --git a/src/styles/components/_presentation.scss b/src/styles/components/_presentation.scss index e1c227c9..ffe8ad56 100644 --- a/src/styles/components/_presentation.scss +++ b/src/styles/components/_presentation.scss @@ -27,30 +27,6 @@ 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 { display: block; } @@ -62,6 +38,26 @@ position: absolute; right: 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 { @@ -165,14 +161,17 @@ } .presentation .thumbnail .caption .size { + // scss-lint:disable SelectorDepth font-size: 10px; } .presentation .thumbnail .caption .progress { + // scss-lint:disable SelectorDepth position: relative; } .presentation .thumbnail .caption .download-info { + // scss-lint:disable SelectorDepth bottom: 0; color: $text-color; left: 0; diff --git a/src/styles/components/_youtubevideo.scss b/src/styles/components/_youtubevideo.scss index e0b99305..452cf135 100644 --- a/src/styles/components/_youtubevideo.scss +++ b/src/styles/components/_youtubevideo.scss @@ -112,7 +112,7 @@ width: 100%; } -.youtubevideo .overlaybar-content form .overlaybar-buttons { +.youtubevideo .overlaybar-content .overlaybar-buttons { position: absolute; right: 23px; top: 6px;