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/application.scss | 57 +++++++++------ client/src/sass/bootstrap.scss | 40 +++++++---- client/src/sass/include/_actor.scss | 2 +- client/src/sass/include/_bootstrap.scss | 2 +- client/src/sass/include/_fonts.scss | 4 +- client/src/sass/include/_miniature.scss | 14 ++-- client/src/sass/include/_mixins.scss | 116 +++++++++++++++++------------- client/src/sass/include/_variables.scss | 6 +- client/src/sass/ng-select.scss | 9 +-- 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 ++-- client/src/sass/primeng-custom.scss | 3 +- 19 files changed, 200 insertions(+), 154 deletions(-) (limited to 'client/src/sass') diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index fa9c0d992..89b6f0c4c 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -8,9 +8,9 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; @import './bootstrap'; @import './primeng-custom'; -@import './ng-select.scss'; +@import './ng-select'; -@import './classes.scss'; +@import './classes'; [hidden] { display: none !important; @@ -89,14 +89,16 @@ input.readonly { background-color: pvar(--inputBackgroundColor) !important; } -input, textarea { +input, +textarea { outline: none; color: pvar(--inputForegroundColor); } button { - background: unset; @include disable-outline; + + background: unset; } label { @@ -121,12 +123,12 @@ code { margin-top: 5px; } -.input-error +.input-error, my-input-toggle-hidden ::ng-deep input { border-color: $red !important; } -.fullWidth { +.full-width { width: 100%; margin-left: auto; margin-right: auto; @@ -134,7 +136,7 @@ my-input-toggle-hidden ::ng-deep input { } .glyphicon-black { - color: black; + color: #000; } .row { @@ -184,26 +186,26 @@ my-input-toggle-hidden ::ng-deep input { width: 100%; } - &.lock-scroll .main-row > router-outlet + * { + &.lock-scroll .main-row > router-outlet + * { /* stylelint-disable-line selector-max-compound-selectors */ // Lock and hide body scrollbars position: fixed; // Lock and hide sub-menu scrollbars - .sub-menu { + .sub-menu { /* stylelint-disable-line */ overflow-x: hidden; } } } .title-page { + @include disable-default-a-behaviour; + opacity: 0.6; color: pvar(--mainForegroundColor); font-size: 16px; display: inline-block; margin-right: 55px; font-weight: $font-semibold; - @include disable-default-a-behaviour; - border-bottom: 2px solid transparent; &.title-page-single { @@ -219,13 +221,19 @@ my-input-toggle-hidden ::ng-deep input { font-size: 125%; } - &:hover, &:active, &:focus { + &:hover, + &:active, + &:focus { color: pvar(--mainForegroundColor); } - &.active, &:hover, &:active, &:focus, &.title-page-single { + &.active, + &:hover, + &:active, + &:focus, + &.title-page-single { opacity: 1; - outline: 0px hidden !important; + outline: 0 hidden !important; } @media screen and (max-width: $mobile-view) { @@ -262,7 +270,10 @@ my-input-toggle-hidden ::ng-deep input { background-color: pvar(--submenuBackgroundColor); } - &.active, &:hover, &:active, &:focus { + &.active, + &:hover, + &:active, + &:focus { opacity: 1; } } @@ -275,8 +286,13 @@ my-input-toggle-hidden ::ng-deep input { // In tables, don't have a hover different background table { - .action-button-edit, .action-button-delete { - &:hover, &:active, &:focus, &[disabled], &.disabled { + .action-button-edit, + .action-button-delete { + &:hover, + &:active, + &:focus, + &[disabled], + &.disabled { background-color: $grey-background-color !important; } } @@ -329,15 +345,12 @@ ngx-loading-bar { @media screen and (max-width: #{breakpoint(xxl)}) { .main-col { - & { - --horizontalMarginContent: #{$not-expanded-horizontal-margins / 2}; - } + --horizontalMarginContent: #{$not-expanded-horizontal-margins / 2}; + --videosHorizontalMarginContent: 30px; &.expanded { --horizontalMarginContent: #{$expanded-horizontal-margins / 2}; } - - --videosHorizontalMarginContent: 30px; } } diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss index 0ab6230c8..548e55e1e 100644 --- a/client/src/sass/bootstrap.scss +++ b/client/src/sass/bootstrap.scss @@ -6,7 +6,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; // Thanks https://gist.github.com/alexandrevicenzi/680147013e902a4eaa5d .glyphicon-refresh-animate { - animation: spin .7s infinite linear; + animation: spin 0.7s infinite linear; } .glyphicon-duplicate { @@ -25,6 +25,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; from { transform: scale(1) rotate(0deg); } + to { transform: scale(1) rotate(360deg); } @@ -70,7 +71,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; &.active { color: pvar(--mainBackgroundColor) !important; background-color: pvar(--mainHoverColor); - opacity: .9; + opacity: 0.9; } &:active { @@ -97,9 +98,9 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; } @media screen and (min-width: #{breakpoint(md)}) { - .modal:before { + .modal::before { vertical-align: middle; - content: " "; + content: ' '; height: 100%; } @@ -123,7 +124,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; } .modal-header { - border-bottom: none; + border-bottom: 0; margin-bottom: 5px; .modal-title { @@ -140,10 +141,11 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; margin: 0; padding: 0; - opacity: .5; + opacity: 0.5; - &[iconName="cross"] { + &[iconName=cross] { /* stylelint-disable-line selector-max-compound-selectors */ @include icon(16px); + top: -3px; } } @@ -154,7 +156,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; text-align: right; > .peertube-button:not(:first-child) { - margin-left: 10px + margin-left: 10px; } } } @@ -168,7 +170,8 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; // On touchscreen devices, simply overflow: hidden to avoid detached overlay on scroll @media (hover: none) and (pointer: coarse) { - .modal-open, .menu-open { + .modal-open, + .menu-open { overflow: hidden !important; } @@ -176,7 +179,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; .menu-open { .main-col { &::before { - background-color: black; + background-color: #000; width: 100vw; height: 100vh; opacity: 0.75; @@ -204,7 +207,10 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; .nav-link { opacity: 0.6 !important; - &.active, &:hover, &:active, &:focus { + &.active, + &:hover, + &:active, + &:focus { opacity: 1 !important; } } @@ -221,7 +227,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; color: pvar(--mainForegroundColor); font-weight: $font-semibold; - border: none; + border: 0; border-bottom: 2px solid transparent; opacity: 0.6; @@ -231,7 +237,10 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; border-bottom-color: pvar(--mainColor); } - &.active, &:hover, &:active, &:focus { + &.active, + &:hover, + &:active, + &:focus { opacity: 1; } } @@ -314,9 +323,10 @@ ngb-tooltip-window { } .input-group { - & > .form-control { + > .form-control { flex: initial; } + input.form-control { width: unset !important; flex-grow: 1; @@ -366,7 +376,7 @@ ngb-tooltip-window { border: 1px solid #eee; border-radius: .25rem; - & > label { + > label { position: relative; top: -5px; left: -10px; diff --git a/client/src/sass/include/_actor.scss b/client/src/sass/include/_actor.scss index ccfd73ecd..38bd90ae6 100644 --- a/client/src/sass/include/_actor.scss +++ b/client/src/sass/include/_actor.scss @@ -17,7 +17,7 @@ @mixin show-more-description { color: pvar(--mainColor); cursor: pointer; - margin: 10px auto 45px auto; + margin: 10px auto 45px; } @mixin avatar-row-responsive ($img-margin, $grey-font-size) { diff --git a/client/src/sass/include/_bootstrap.scss b/client/src/sass/include/_bootstrap.scss index b1a23be6b..d9e5efc02 100644 --- a/client/src/sass/include/_bootstrap.scss +++ b/client/src/sass/include/_bootstrap.scss @@ -1,4 +1,4 @@ -@import "./_bootstrap-variables"; +@import './_bootstrap-variables'; @import '~bootstrap/scss/functions'; @import '~bootstrap/scss/variables'; diff --git a/client/src/sass/include/_fonts.scss b/client/src/sass/include/_fonts.scss index 6313736e0..514261d01 100644 --- a/client/src/sass/include/_fonts.scss +++ b/client/src/sass/include/_fonts.scss @@ -1,4 +1,4 @@ -@font-face{ +@font-face { font-family: 'Source Sans Pro'; font-weight: 200 900; font-style: normal; @@ -7,7 +7,7 @@ src: url('../fonts/source-sans/WOFF2/VAR/SourceSans3VF-Roman.ttf.woff2') format('woff2'); } -@font-face{ +@font-face { font-family: 'Source Sans Pro'; font-weight: 200 900; font-style: italic; diff --git a/client/src/sass/include/_miniature.scss b/client/src/sass/include/_miniature.scss index 3b86f29b4..fb504906c 100644 --- a/client/src/sass/include/_miniature.scss +++ b/client/src/sass/include/_miniature.scss @@ -21,12 +21,12 @@ } @mixin miniature-thumbnail { - @include disable-outline; - $play-overlay-transition: 0.2s ease; $play-overlay-height: 26px; $play-overlay-width: 18px; + @include disable-outline; + display: flex; flex-direction: column; position: relative; @@ -47,7 +47,8 @@ opacity: 0; background-color: rgba(0, 0, 0, 0.3); - &, .icon { + &, + .icon { transition: all $play-overlay-transition; } @@ -79,7 +80,7 @@ &.blur-filter { filter: blur(20px); - transform : scale(1.03); + transform: scale(1.03); } } } @@ -129,10 +130,7 @@ column-gap: 30px; grid-template-columns: repeat( auto-fill, - minmax( - var(--miniatureMinWidth), - 1fr - ) + minmax(var(--miniatureMinWidth), 1fr) ); .video-wrapper, diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index dc6ab8076..718e36f2c 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -1,7 +1,9 @@ @import '_variables'; @mixin disable-default-a-behaviour { - &:hover, &:focus, &:active { + &:hover, + &:focus, + &:active { text-decoration: none !important; outline: none !important; } @@ -22,7 +24,7 @@ @mixin ellipsis-multiline($font-size: 16px, $number-of-lines: 2) { display: block; /* Fallback for non-webkit */ - display: -webkit-box; + display: -webkit-box; /* stylelint-disable-line value-no-vendor-prefix */ -webkit-line-clamp: $number-of-lines; /* Fallback for non-webkit */ font-size: $font-size; @@ -36,7 +38,7 @@ position: relative; overflow: hidden; - &:after { + &::after { content: ''; pointer-events: none; width: 100%; @@ -109,9 +111,9 @@ padding-bottom: 0; flex-wrap: nowrap; - .input-group-text{ + .input-group-text { font-size: 14px; - color: gray; + color: #808080; } } @@ -128,7 +130,9 @@ @mixin orange-button { @include button-focus(pvar(--mainColorLightest)); - &, &:active, &:focus { + &, + &:active, + &:focus { color: #fff; background-color: pvar(--mainColor); } @@ -138,14 +142,15 @@ background-color: pvar(--mainHoverColor); } - &[disabled], &.disabled { + &[disabled], + &.disabled { cursor: default; color: #fff; background-color: #C6C6C6; } my-global-icon { - @include apply-svg-color(#fff) + @include apply-svg-color(#fff); } } @@ -155,7 +160,9 @@ border: 2px solid pvar(--mainColor); font-weight: $font-semibold; - &, &:active, &:focus { + &, + &:active, + &:focus { color: pvar(--mainColor); background-color: pvar(--mainBackgroundColor); } @@ -165,14 +172,15 @@ background-color: pvar(--mainColorLightest); } - &[disabled], &.disabled { + &[disabled], + &.disabled { cursor: default; color: pvar(--mainColor); background-color: #C6C6C6; } my-global-icon { - @include apply-svg-color(pvar(--mainColor)) + @include apply-svg-color(pvar(--mainColor)); } } @@ -182,12 +190,13 @@ color: pvar(--greyForegroundColor); background-color: transparent; - &[disabled], &.disabled { + &[disabled], + .disabled { cursor: default; } my-global-icon { - @include apply-svg-color(transparent) + @include apply-svg-color(transparent); } } @@ -197,17 +206,22 @@ background-color: $grey-background-color; color: pvar(--greyForegroundColor); - &:hover, &:active, &:focus, &[disabled], &.disabled { + &:hover, + &:active, + &:focus, + &[disabled], + &.disabled { color: pvar(--greyForegroundColor); background-color: $grey-background-hover-color; } - &[disabled], &.disabled { + &[disabled], + &.disabled { cursor: default; } my-global-icon { - @include apply-svg-color(pvar(--greyForegroundColor)) + @include apply-svg-color(pvar(--greyForegroundColor)); } } @@ -216,24 +230,30 @@ $text: #fff6f5; @include button-focus(scale-color($color, $alpha: -95%)); + background-color: $color; color: $text; - &:hover, &:active, &:focus, &[disabled], &.disabled { + &:hover, + &:active, + &:focus, + &[disabled], + &.disabled { background-color: lighten($color: $color, $amount: 10); } - &[disabled], &.disabled { + &[disabled], + &.disabled { cursor: default; } my-global-icon { - @include apply-svg-color($text) + @include apply-svg-color($text); } } @mixin peertube-button { - border: none; + border: 0; font-weight: $font-semibold; font-size: 15px; height: $button-height; @@ -246,18 +266,17 @@ } @mixin peertube-button-link { - display: inline-block; - @include disable-default-a-behaviour; @include peertube-button; -} -@mixin peertube-button-outline { display: inline-block; +} +@mixin peertube-button-outline { @include disable-default-a-behaviour; @include peertube-button; + display: inline-block; border: 1px solid; } @@ -291,17 +310,17 @@ filter: alpha(opacity=0); opacity: 0; outline: none; - background: white; + background: #fff; cursor: inherit; display: block; } } @mixin peertube-button-file ($width) { - width: $width; - @include peertube-file; @include peertube-button; + + width: $width; } @mixin icon ($size) { @@ -317,7 +336,7 @@ @mixin select-arrow-down { top: 50%; right: calc(0% + 15px); - content: " "; + content: ' '; height: 0; width: 0; position: absolute; @@ -358,7 +377,7 @@ width: 100%; } - &:after { + &::after { @include select-arrow-down; } @@ -394,21 +413,21 @@ option { font-weight: $font-semibold; color: pvar(--greyForegroundColor); - border: none; + border: 0; } } } // Thanks: https://codepen.io/triss90/pen/XNEdRe/ @mixin peertube-radio-container { - input[type="radio"] { + input[type=radio] { display: none; - & + label { + + label { font-weight: $font-regular; cursor: pointer; - &:before { + &::before { position: relative; top: -2px; content: ''; @@ -425,12 +444,12 @@ } } - &:checked + label:before { + &:checked + label::before { background-color: #000; box-shadow: inset 0 0 0 4px #fff; } - &:focus + label:before { + &:focus + label::before { outline: none; border-color: #000; } @@ -445,7 +464,7 @@ box-shadow: #{$focus-box-shadow-form} pvar(--mainColorLightest); } - & + span { + + span { position: relative; width: 18px; min-width: 18px; @@ -455,7 +474,7 @@ vertical-align: middle; cursor: pointer; - &:after { + &::after { content: ''; position: absolute; top: calc(2px - #{$border-width}); @@ -474,13 +493,13 @@ background: pvar(--mainColor); animation: jelly 0.6s ease; - &:after { + &::after { opacity: 1; transform: rotate(45deg) scale(1); } } - & + span + span { + + span + span { font-size: 15px; font-weight: $font-regular; margin-left: 5px; @@ -489,7 +508,7 @@ } &[disabled] + span, - &[disabled] + span + span{ + &[disabled] + span + span { opacity: 0.5; cursor: default; } @@ -685,13 +704,13 @@ color: pvar(--mainColor); } - & + .breadcrumb-item { + + .breadcrumb-item { padding-left: 0.5rem; &::before { display: inline-block; padding-right: 0.5rem; color: #6c757d; - content: "/"; + content: '/'; } } @@ -706,13 +725,13 @@ flex-wrap: wrap; margin: 0 -5px; - & > div { + > div { box-sizing: border-box; flex: 0 0 percentage(1/3); padding: 0 5px; margin-bottom: 10px; - & > a { + > a { @include disable-default-a-behaviour; text-decoration: none; @@ -727,8 +746,8 @@ } } - & > a, - & > div { + > a, + > div { padding: 20px; background: pvar(--submenuBackgroundColor); border-radius: 4px; @@ -737,7 +756,8 @@ } } - .dashboard-num, .dashboard-text { + .dashboard-num, + .dashboard-text { text-align: center; font-size: 130%; color: pvar(--mainForegroundColor); @@ -831,7 +851,7 @@ flex-direction: column; .form-sub-title { - margin-right: 0px !important; + margin-right: 0 !important; margin-bottom: 10px; text-align: center; } diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index d2a5d2bd9..d54563df6 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss @@ -60,7 +60,7 @@ $max-channels-width: 1200px; $footer-height: 30px; $footer-margin: 30px; -$separator-border-color: rgba(0, 0, 0, 0.10); +$separator-border-color: rgba(0, 0, 0, 0.1); $video-miniature-margin-bottom: 15px; @@ -90,7 +90,7 @@ $markdown-textarea-background-color: $grey-background-hover-color; $sub-menu-margin-bottom: 30px; $sub-menu-margin-bottom-small-view: 10px; -$activated-action-button-color: black; +$activated-action-button-color: #000; $focus-box-shadow-form: 0 0 0 .2rem; @@ -147,7 +147,7 @@ $variables: ( @if map-has-key($variables, $variable) { @return map-get($variables, $variable); } @else { - @error "ERROR: Variable #{$variable} does not exist"; + @error 'ERROR: Variable #{$variable} does not exist'; } } diff --git a/client/src/sass/ng-select.scss b/client/src/sass/ng-select.scss index 61da6d266..13b2012b2 100644 --- a/client/src/sass/ng-select.scss +++ b/client/src/sass/ng-select.scss @@ -14,7 +14,7 @@ $ng-select-height: 30px; $ng-select-value-padding-left: 15px; $ng-select-value-font-size: 15px; -@import "~@ng-select/ng-select/scss/default.theme.scss"; +@import '~@ng-select/ng-select/scss/default.theme'; .ng-select { font-size: $ng-select-value-font-size; @@ -31,13 +31,13 @@ $ng-select-value-font-size: 15px; } .ng-arrow-wrapper { - padding-right: 12px + padding-right: 12px; } &.ng-select-single .ng-value-container .ng-value { color: pvar(--inputForegroundColor); - .ng-value-label { + .ng-value-label { /* stylelint-disable-line */ display: flex; align-items: center; } @@ -45,7 +45,8 @@ $ng-select-value-font-size: 15px; &.ng-select-multiple .ng-select-container .ng-value-container { padding-left: 12px; - .ng-value { + + .ng-value { /* stylelint-disable-line */ margin-left: 3px; } } 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)); } } diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 544d0039a..1abcd30e4 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -1,10 +1,11 @@ @import '_variables'; @import '_mixins'; +/* stylelint-disable */ @import '~primeng/resources/primeng.css'; // Override primeng style we don't want -input[type="button"] { +input[type=button] { border-radius: inherit; } -- cgit v1.2.3