X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Fapplication.scss;h=15ca09ec4a1eaee4b6731b389f0584ee49f1d586;hb=24893b524c47b8f89090192aa38126352a952808;hp=e10663c43d5029de88da29c660305ae203b4ff44;hpb=2fcc2294974dacef3c83928abf0f299e8ae12cd2;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index e10663c43..15ca09ec4 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -1,18 +1,17 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; -@import '_variables'; -@import '_mixins'; +@use '_variables' as *; +@use '_mixins' as *; -@import '_fonts'; +@use '_fonts'; -@import '~video.js/dist/video-js.css'; +@use './bootstrap'; +@use './primeng-custom'; +@use './ng-select'; -$assets-path: '../assets/'; -@import './player/index'; -@import './loading-bar'; +@use './classes'; -@import './bootstrap'; -@import './primeng-custom'; +@use './custom-markup'; [hidden] { display: none !important; @@ -20,36 +19,69 @@ $assets-path: '../assets/'; body { /*** theme ***/ - // now beware node-sass requires interpolation + // now beware sass requires interpolation // for css custom properties #{$var} - --mainColor: #{$orange-color}; - --mainHoverColor: #{$orange-hover-color}; + --mainColor: #{$main-color}; + --mainColorLighter: #{$main-color-lighter}; + --mainColorLightest: #{$main-color-lightest}; + --mainHoverColor: #{$main-hover-color}; --mainBackgroundColor: #{$bg-color}; --mainForegroundColor: #{$fg-color}; + --secondaryColor: #{$secondary-color}; + + --greyForegroundColor: #{$grey-foreground-color}; + --greyBackgroundColor: #{$grey-background-color}; --menuBackgroundColor: #{$menu-background}; --menuForegroundColor: #{$menu-color}; - --submenuColor: #{$sub-menu-color}; - --inputColor: #{$input-background-color}; + --submenuBackgroundColor: #{$sub-menu-background-color}; + --channelBackgroundColor: #{$channel-background-color}; + + --inputForegroundColor: #{$input-foreground-color}; + --inputBackgroundColor: #{$input-background-color}; --inputPlaceholderColor: #{$input-placeholder-color}; - --supportButtonBackgroundColor: #{$support-button}; - --supportButtonColor: #{$white}; + --textareaForegroundColor: #{$textarea-foreground-color}; + --textareaBackgroundColor: #{$textarea-background-color}; + --markdownTextareaBackgroundColor: #{$markdown-textarea-background-color}; + + --actionButtonColor: #{$grey-foreground-color}; + --supportButtonBackgroundColor: #{transparent}; + --supportButtonColor: #{pvar(--actionButtonColor)}; + --supportButtonHeartColor: #{$support-button-heart}; + + --activatedActionButtonColor: #{$activated-action-button-color}; + + --horizontalMarginContent: #{$not-expanded-horizontal-margins}; + --videosHorizontalMarginContent: 6vw; + --mainColWidth: calc(100vw - #{$menu-width}); font-family: $main-fonts; font-weight: $font-regular; - color: var(--mainForegroundColor); - background-color: var(--mainBackgroundColor); + color: pvar(--mainForegroundColor); + background-color: pvar(--mainBackgroundColor); font-size: 14px; + // On desktop browsers, make sure vertical scroll bar is always visible + // Allow to disable the scrollbar instead of hide it when the content fit the body + // And not move the content and header horizontally sticked to right when the content is updating + overflow-y: scroll; + + // Fix "reboot" style that set text-align: left + text-align: start; } +::selection { + color: pvar(--mainBackgroundColor); + background-color: pvar(--mainHoverColor); +} + +noscript, #incompatible-browser { - display: none; - text-align: center; - position: absolute; - width: 100%; - top: 45%; + display: block; + font-size: 1.2rem; + max-width: 600px; + margin: 1rem auto; } strong { @@ -58,16 +90,19 @@ strong { input.readonly { /* Force blank on readonly inputs */ - background-color: var(--inputColor) !important; + background-color: pvar(--inputBackgroundColor) !important; } -input, textarea { +input, +textarea { outline: none; - color: var(--mainForegroundColor); + color: pvar(--inputForegroundColor); } -.btn-outline-secondary { - border-color: $input-border-color; +button { + @include disable-outline; + + background: unset; } label { @@ -75,88 +110,145 @@ label { font-size: 15px; } +code { + background-color: pvar(--greyBackgroundColor); + color: pvar(--greyForegroundColor); + border-radius: 3px; + padding: .2em .4em; + margin: auto .4em; + font-size: 75%; + display: inline-block; + vertical-align: middle; +} + .form-error { display: block; color: $red; 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; + margin: 0 auto; max-width: initial; } .glyphicon-black { - color: black; + color: #000; +} + +.row { + margin: 0 !important; } .main-col { - margin-left: $menu-width; - width: auto; + @include margin-left($menu-width); + + width: calc(100% - #{$menu-width}); + outline: none; .margin-content { - margin-left: $not-expanded-horizontal-margins; - margin-right: $not-expanded-horizontal-margins; + margin: 0 pvar(--horizontalMarginContent); flex-grow: 1; } .sub-menu { - background-color: var(--submenuColor); + background-color: pvar(--submenuBackgroundColor); width: 100%; - height: 81px; - margin-bottom: $sub-menu-margin-bottom; display: flex; align-items: center; - padding-left: $not-expanded-horizontal-margins; - padding-right: $not-expanded-horizontal-margins; + padding: 0 pvar(--horizontalMarginContent); + height: $sub-menu-height; + margin-bottom: $sub-menu-margin-bottom; + overflow-x: auto; + + &.sub-menu-fixed { + position: fixed; + z-index: #{z('sub-menu') - 1}; + max-width: pvar(--mainColWidth); + } + } + + // Use an appropriate offset top when sub-menu fixed + .margin-content.offset-content { + padding-top: $sub-menu-height + $sub-menu-margin-bottom; } // Override some properties if the main content is expanded (no menu on the left) &.expanded { - margin-left: 0; + --horizontalMarginContent: #{$expanded-horizontal-margins}; + --mainColWidth: 100vw; - .margin-content { - margin-left: $expanded-horizontal-margins; - margin-right: $expanded-horizontal-margins; - } + @include margin-left(0); + width: 100%; + } - .sub-menu { - padding-left: $expanded-horizontal-margins; - padding-right: $expanded-horizontal-margins; + &.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 { /* stylelint-disable-line */ + overflow-x: hidden; } } } .title-page { - color: var(--mainForegroundColor); + @include disable-default-a-behaviour; + @include margin-right(55px); + + 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; - &.active, &.title-page-single { - border-bottom: 2px solid var(--mainColor); - font-weight: $font-bold; + &.title-page-single { margin-top: 30px; margin-bottom: 25px; } - &:hover, &:active, &:focus { - color: var(--mainForegroundColor); + &.active { + border-bottom-color: pvar(--mainColor); + } + + &.title-page-single { + font-size: 125%; + } + + &:hover, + &:active, + &:focus { + color: pvar(--mainForegroundColor); + } + + &.active, + &:hover, + &:active, + &:focus, + &.title-page-single { + opacity: 1; + outline: 0 hidden !important; } - @media screen and (max-width: 500px) { - margin-right: 15px; + @media screen and (max-width: $mobile-view) { + @include margin-left(15px); } } +.title-page-about, +.title-page-settings { + white-space: nowrap; + font-size: 115%; +} + .admin-sub-header { display: flex; align-items: center; @@ -170,14 +262,21 @@ label { @include disable-default-a-behaviour; font-size: 16px; - color: var(--mainForegroundColor); + color: pvar(--mainForegroundColor); padding: 5px 15px; border-radius: 0.25rem; + font-weight: $font-semibold; + opacity: 0.6; &.active { - font-weight: $font-semibold; - background-color: #f0f0f0; - color: #000; + background-color: pvar(--submenuBackgroundColor); + } + + &.active, + &:hover, + &:active, + &:focus { + opacity: 1; } } } @@ -187,35 +286,15 @@ label { font-weight: bold; } -@keyframes spin { - from { transform: scale(1) rotate(0deg);} - to { transform: scale(1) rotate(360deg);} -} - -.orange-button { - @include peertube-button; - @include orange-button; -} - -.orange-button-link { - @include peertube-button-link; - @include orange-button; -} - -.grey-button { - @include peertube-button; - @include grey-button; -} - -.grey-button-link { - @include peertube-button-link; - @include grey-button; -} - // 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; } } @@ -223,64 +302,146 @@ table { .no-results { height: 40vh; + max-height: 500px; + display: flex; + flex-direction: column; align-items: center; justify-content: center; font-size: 16px; font-weight: $font-semibold; } -@media screen and (max-width: 1600px) { +.dropdown-item { + @include dropdown-with-icon-item; + + my-global-icon { + width: 22px; + height: 22px; + } +} + +/* offsetTop for scrollToAnchor */ + +.anchor { + position: relative; + top: #{-($header-height + 20px)}; +} + +.offset-content { // if sub-menu fixed + .anchor { + top: #{-($header-height + $sub-menu-height + 20px)}; + } +} + +.form-group-description { + @extend .text-muted; + + font-size: 90%; + margin-top: 10px; +} + +ngx-loading-bar { + z-index: z(header) + 1 !important; +} + +@media screen and (max-width: #{breakpoint(xxl)}) { .main-col { + --horizontalMarginContent: #{$not-expanded-horizontal-margins / 2}; + --videosHorizontalMarginContent: 30px; + &.expanded { - .margin-content { - margin-left: $expanded-horizontal-margins/2; - margin-right: $expanded-horizontal-margins/2; - } + --horizontalMarginContent: #{$expanded-horizontal-margins / 2}; } } } -@media screen and (max-width: 900px) { +@media screen and (max-width: #{breakpoint(lg)}) { .main-col { - &.expanded { - .margin-content { - margin-left: $expanded-horizontal-margins/3; - margin-right: $expanded-horizontal-margins/3; - } + --videosHorizontalMarginContent: #{pvar(--horizontalMarginContent)}; + } - .sub-menu { - padding-left: 50px; + /* the following applies from 500px to 900px and is partially overriden from 500px to 800px by changes below to $small-view */ + .main-col, + .main-col.expanded { + --horizontalMarginContent: #{$expanded-horizontal-margins / 3}; - .title-page { - font-size: 15px; - } + .sub-menu { + padding: 0 50px; + + .title-page { + font-size: 17px; } } } } -@media screen and (max-width: $small-view) { +@media screen and (min-width: $mobile-view) and (max-width: $small-view) { .main-col { - margin-left: 0; + width: 100%; + } +} + +@media screen and (max-width: $small-view) { + .main-col, + .main-col.expanded { + --horizontalMarginContent: 15px; + + @include margin-left(0); + + .sub-menu { + width: 100vw; + padding: 0 15px; + margin-bottom: $sub-menu-margin-bottom-small-view; + overflow-x: auto; + } + + // Use an appropriate offset top when sub-menu fixed + .margin-content.offset-content { + padding-top: $sub-menu-height + $sub-menu-margin-bottom-small-view; + } + + .admin-sub-header { + flex-direction: column; + + .form-sub-title { + @include margin-right(0 !important); - &, &.expanded { - .margin-content { - margin-left: 15px; - margin-right: 15px; + margin-bottom: 10px; + text-align: center; } - .sub-menu { - width: 100vw; + .admin-sub-nav { + display: block; overflow-x: auto; - padding-left: 15px; - padding-right: 15px; - margin-bottom: 10px; + white-space: nowrap; + height: 50px; + padding: 10px 0; + width: 100%; + + a { + @include margin-left(5px); + } } + } - input[type=text], input[type=password] { - width: 100% !important; + my-markdown-textarea { + .root { + max-width: 100% !important; } } + + input[type=text], + input[type=password], + input[type=email], + textarea, + .peertube-select-container { + flex-grow: 1; + } + + .caption input[type=text] { + width: unset !important; + flex-grow: 1; + } } }