From 931d3430184143ebd88e5243def6eb1d7acfdbf4 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 28 Apr 2021 16:41:07 +0200 Subject: Move to stylelint --- client/src/sass/player/context-menu.scss | 10 +++---- client/src/sass/player/index.scss | 6 ++-- client/src/sass/player/mobile.scss | 2 +- client/src/sass/player/peertube-skin.scss | 48 ++++++++++++++++++------------- client/src/sass/player/playlist.scss | 12 +++----- client/src/sass/player/settings-menu.scss | 2 +- client/src/sass/player/spinner.scss | 2 +- client/src/sass/player/stats.scss | 5 ++-- client/src/sass/player/upnext.scss | 14 ++++----- 9 files changed, 52 insertions(+), 49 deletions(-) (limited to 'client/src/sass/player') diff --git a/client/src/sass/player/context-menu.scss b/client/src/sass/player/context-menu.scss index 6bc66af0c..45cee3e77 100644 --- a/client/src/sass/player/context-menu.scss +++ b/client/src/sass/player/context-menu.scss @@ -31,26 +31,26 @@ $context-menu-width: 350px; background-color: rgba(255, 255, 255, 0.2); } - [class^="vjs-icon-"] { + [class^='vjs-icon-'] { + $icons: 'link-2', 'repeat', 'code', 'tick-white', 'info'; + display: inline-flex; position: relative; top: 2px; cursor: pointer; width: 14px; height: 14px; - background-color: white; + background-color: #fff; mask-size: cover; margin-right: 0.8rem !important; - $icons: 'link-2', 'repeat', 'code', 'tick-white', 'info'; - @each $icon in $icons { &[class$="-#{$icon}"] { mask-image: url('#{$assets-path}/player/images/#{$icon}.svg'); } } - &[class$="-tick-white"] { + &[class$='-tick-white'] { float: right; margin: 0 !important; } diff --git a/client/src/sass/player/index.scss b/client/src/sass/player/index.scss index 502ee33ff..e674fa2f6 100644 --- a/client/src/sass/player/index.scss +++ b/client/src/sass/player/index.scss @@ -4,6 +4,6 @@ @import './settings-menu'; @import './spinner'; @import './upnext'; -@import './bezels.scss'; -@import './playlist.scss'; -@import './stats.scss'; +@import './bezels'; +@import './playlist'; +@import './stats'; diff --git a/client/src/sass/player/mobile.scss b/client/src/sass/player/mobile.scss index c2fa855ab..26066d218 100644 --- a/client/src/sass/player/mobile.scss +++ b/client/src/sass/player/mobile.scss @@ -13,4 +13,4 @@ } } } -} \ No newline at end of file +} diff --git a/client/src/sass/player/peertube-skin.scss b/client/src/sass/player/peertube-skin.scss index 81aacf1d7..8fe2e054d 100644 --- a/client/src/sass/player/peertube-skin.scss +++ b/client/src/sass/player/peertube-skin.scss @@ -52,12 +52,12 @@ body { } .vjs-big-play-button { - outline: 0; - font-size: 6em; - $big-play-width: 1.2em; $big-play-height: 1.2em; + outline: 0; + font-size: 6em; + border: 2px solid #fff; border-radius: 100%; @@ -72,7 +72,7 @@ body { &::-moz-focus-inner { border: 0; - padding: 0 + padding: 0; } .vjs-icon-placeholder::before { @@ -82,8 +82,9 @@ body { background-image: url('#{$assets-path}/player/images/big-play-button.svg'); } - &.focus-visible, &:hover { - background-color: var(--mainColor, dimgray); + &.focus-visible, + &:hover { + background-color: var(--mainColor, #696969); } } @@ -91,16 +92,19 @@ body { // Small effect when we click on the play button &.vjs-has-big-play-button-clicked { - .vjs-big-play-button, .vjs-poster { + .vjs-big-play-button, + .vjs-poster { display: block; visibility: hidden; - &.vjs-big-play-button, &.vjs-big-play-button::before { + &.vjs-big-play-button, + &.vjs-big-play-button::before { opacity: 0; transition: visibility 0.2s, opacity 0.2s; } - &.vjs-poster, &.vjs-poster::before { + &.vjs-poster, + &.vjs-poster::before { opacity: 0; transition: visibility 0.3s, opacity 0.3s; transition-delay: 0.05s; @@ -165,8 +169,7 @@ body { .vjs-fullscreen-control, .vjs-peertube-link, .vjs-theater-control, - .vjs-settings - { + .vjs-settings { color: pvar(--embedForegroundColor) !important; opacity: $primary-foreground-opacity; @@ -217,7 +220,8 @@ body { } .vjs-load-progress { - &, & div { + &, + div { background: rgba(255, 255, 255, .2); } } @@ -266,7 +270,7 @@ body { line-height: calc(#{$control-bar-height} - 1px); &::after { - content: "/"; + content: '/'; margin: 0 1px 0 2px; } } @@ -308,11 +312,17 @@ body { display: none; } - .download-speed-number, .upload-speed-number, .peers-number, .http-fallback { + .download-speed-number, + .upload-speed-number, + .peers-number, + .http-fallback { font-weight: $font-semibold; } - .download-speed-text, .upload-speed-text, .peers-text, .http-fallback { + .download-speed-text, + .upload-speed-text, + .peers-text, + .http-fallback { margin-right: 15px; } @@ -336,10 +346,8 @@ body { &.icon-next, &.icon-previous { mask-image: url('#{$assets-path}/player/images/next.svg'); - -webkit-mask-image: url('#{$assets-path}/player/images/next.svg'); - background-color: white; + background-color: #fff; mask-size: cover; - -webkit-mask-size: cover; width: 11px; height: 11px; margin-top: -2px; @@ -410,7 +418,7 @@ body { } .vjs-volume-bar { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAcCAQAAACw95UnAAAAMElEQVRIx2NgoBL4n4YKGUYNHkEG4zJg1OCRYDCpBowaPJwMppbLRg0eNXjUYBLEAXWNUA6QNm1lAAAAAElFTkSuQmCC) no-repeat; + background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAcCAQAAACw95UnAAAAMElEQVRIx2NgoBL4n4YKGUYNHkEG4zJg1OCRYDCpBowaPJwMppbLRg0eNXjUYBLEAXWNUA6QNm1lAAAAAElFTkSuQmCC') no-repeat; background-size: 22px 14px; height: 100%; width: 100%; @@ -421,7 +429,7 @@ body { top: 3px; .vjs-volume-level { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAcAQAAAAAyhWABAAAAAnRSTlMAAHaTzTgAAAAZSURBVHgBYwAB/g9EUv+JokCqiaT+U4MCAPKPS7WUUOc1AAAAAElFTkSuQmCC) no-repeat; + background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAcAQAAAAAyhWABAAAAAnRSTlMAAHaTzTgAAAAZSURBVHgBYwAB/g9EUv+JokCqiaT+U4MCAPKPS7WUUOc1AAAAAElFTkSuQmCC') no-repeat; background-size: 22px 14px; max-width: 22px; max-height: 14px; diff --git a/client/src/sass/player/playlist.scss b/client/src/sass/player/playlist.scss index ebbed02d9..8558fc837 100644 --- a/client/src/sass/player/playlist.scss +++ b/client/src/sass/player/playlist.scss @@ -44,10 +44,8 @@ $playlist-menu-width: 350px; width: 20px; height: 20px; mask-image: url('#{$assets-path}/images/feather/x.svg'); - -webkit-mask-image: url('#{$assets-path}/images/feather/x.svg'); - background-color: white; + background-color: #fff; mask-size: cover; - -webkit-mask-size: cover; } } } @@ -90,10 +88,8 @@ $playlist-menu-width: 350px; width: 22px; height: 22px; mask-image: url('#{$assets-path}/images/feather/list.svg'); - -webkit-mask-image: url('#{$assets-path}/images/feather/list.svg'); - background-color: white; + background-color: #fff; mask-size: cover; - -webkit-mask-size: cover; margin-bottom: 3px; } @@ -133,9 +129,9 @@ $playlist-menu-width: 350px; } .item-player { - display: none; - @include play-icon(20px, 16px); + + display: none; } &.vjs-selected { diff --git a/client/src/sass/player/settings-menu.scss b/client/src/sass/player/settings-menu.scss index 09c872ef7..74eee7d64 100644 --- a/client/src/sass/player/settings-menu.scss +++ b/client/src/sass/player/settings-menu.scss @@ -149,7 +149,7 @@ $setting-transition-easing: ease-out; background-color: inherit; padding: 8px 8px 13px 12px; margin-bottom: 5px; - border-bottom: 1px solid grey; + border-bottom: 1px solid #808080; text-align: left; &::before { diff --git a/client/src/sass/player/spinner.scss b/client/src/sass/player/spinner.scss index a6af8da33..94f4d1008 100644 --- a/client/src/sass/player/spinner.scss +++ b/client/src/sass/player/spinner.scss @@ -51,4 +51,4 @@ opacity: 1; } } -} \ No newline at end of file +} diff --git a/client/src/sass/player/stats.scss b/client/src/sass/player/stats.scss index 953f6032a..6fcbcd969 100644 --- a/client/src/sass/player/stats.scss +++ b/client/src/sass/player/stats.scss @@ -6,6 +6,8 @@ $contextmenu-background-color: rgba(0, 0, 0, 0.6); .video-js { .vjs-stats-content { + @include transition(opacity 0.1s); + position: absolute; background-color: $contextmenu-background-color; padding: 5px 0; @@ -18,8 +20,6 @@ $contextmenu-background-color: rgba(0, 0, 0, 0.6); z-index: 64; font-size: 12px; line-height: 1.2; - - @include transition(opacity 0.1s); } .vjs-stats-close { @@ -38,5 +38,4 @@ $contextmenu-background-color: rgba(0, 0, 0, 0.6); width: 11.5em; white-space: nowrap; } - } diff --git a/client/src/sass/player/upnext.scss b/client/src/sass/player/upnext.scss index 7614bb3b6..8c9a6f784 100644 --- a/client/src/sass/player/upnext.scss +++ b/client/src/sass/player/upnext.scss @@ -11,15 +11,15 @@ $browser-context: 16; .video-js { .vjs-upnext-content { + @include transition(opacity 0.1s); + font-size: 1.8em; pointer-events: auto; position: absolute; top: 0; bottom: 0; - background: rgba(0,0,0,0.6); + background: rgba(0, 0, 0, 0.6); width: 100%; - - @include transition(opacity 0.1s); } .vjs-upnext-top { @@ -77,7 +77,7 @@ $browser-context: 16; float: none; padding: 10px !important; font-size: 16px !important; - border: none; + border: 0; } .vjs-upnext-cancel-button, @@ -86,7 +86,7 @@ $browser-context: 16; } .vjs-upnext-cancel-button:hover { - background-color: rgba(255,255,255,0.25); + background-color: rgba(255, 255, 255, 0.25); border-radius: 2px; } @@ -95,6 +95,8 @@ $browser-context: 16; } .vjs-upnext-autoplay-icon { + @include transition(stroke-dasharray 0.1s cubic-bezier(0.4,0,1,1)); + position: absolute; top: 50%; left: 50%; @@ -102,8 +104,6 @@ $browser-context: 16; height: 98px; margin: -49px 0 0 -49px; cursor: pointer; - - @include transition(stroke-dasharray 0.1s cubic-bezier(0.4,0,1,1)); } } -- cgit v1.2.3