X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Fapplication.scss;h=c76e5db7b2c692fd418581a5c46ea403a108b6d8;hb=ed5bb517266c80904c44bf44a335f1003f5aa277;hp=a4fea13c26ba768a938048cdf320e76f4231de9b;hpb=3b766e181c59ce148fde73e507276c9fbaf37eb1;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index a4fea13c2..c76e5db7b 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -1,17 +1,18 @@ +$icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; + +@import '_bootstrap-variables'; @import '_variables'; @import '_mixins'; -$icon-font-path: '../../node_modules/@neos21/bootstrap3-glyphicons/assets/fonts/'; -@import '_bootstrap'; - @import '_fonts'; @import '~video.js/dist/video-js.css'; $assets-path: '../assets/'; -@import './player/player'; +@import './player/index'; @import './loading-bar'; +@import './bootstrap'; @import './primeng-custom'; [hidden] { @@ -19,10 +20,52 @@ $assets-path: '../assets/'; } body { + /*** theme ***/ + // now beware node-sass requires interpolation + // for css custom properties #{$var} + --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}; + + --menuBackgroundColor: #{$menu-background}; + --menuForegroundColor: #{$menu-color}; + --submenuColor: #{$sub-menu-color}; + + --inputForegroundColor: #{$input-foreground-color}; + --inputBackgroundColor: #{$input-background-color}; + --inputPlaceholderColor: #{$input-placeholder-color}; + + --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}; + font-family: $main-fonts; font-weight: $font-regular; - color: #000; + 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; +} + +::selection { + color: pvar(--mainBackgroundColor); + background-color: pvar(--mainHoverColor); } #incompatible-browser { @@ -39,11 +82,17 @@ strong { input.readonly { /* Force blank on readonly inputs */ - background-color: #fff !important; + background-color: pvar(--inputBackgroundColor) !important; } input, textarea { outline: none; + color: pvar(--mainForegroundColor); +} + +button { + background: unset; + @include disable-outline; } label { @@ -72,9 +121,14 @@ label { color: black; } +.row { + margin: 0 !important; +} + .main-col { margin-left: $menu-width; - width: auto; + width: calc(100% - #{$menu-width}); + outline: none; .margin-content { margin-left: $not-expanded-horizontal-margins; @@ -83,19 +137,21 @@ label { } .sub-menu { - background-color: #F7F7F7; + background-color: pvar(--submenuColor); width: 100%; - height: 81px; - margin-bottom: 30px; + height: $sub-menu-height; display: flex; align-items: center; padding-left: $not-expanded-horizontal-margins; padding-right: $not-expanded-horizontal-margins; + position: fixed; + z-index: 1; } // Override some properties if the main content is expanded (no menu on the left) &.expanded { margin-left: 0; + width: 100%; .margin-content { margin-left: $expanded-horizontal-margins; @@ -107,30 +163,60 @@ label { padding-right: $expanded-horizontal-margins; } } + + &.lock-scroll .main-row > router-outlet + * { + // Lock and hide body scrollbars + position: fixed; + + // Lock and hide sub-menu scrollbars + .sub-menu { + overflow-x: hidden; + } + } } .title-page { - color: #000; + opacity: 0.6; + color: pvar(--mainForegroundColor); font-size: 16px; display: inline-block; margin-right: 55px; font-weight: $font-semibold; @include disable-default-a-behaviour; - &.active, &.title-page-single { - border-bottom: 2px solid $orange-color; - font-weight: $font-bold; + border-bottom: 2px solid transparent; + + &.title-page-single { margin-top: 30px; margin-bottom: 25px; } + &.active { + border-bottom-color: pvar(--mainColor); + } + + &.title-page-single { + font-size: 125%; + } + &:hover, &:active, &:focus { - color: #000; + color: pvar(--mainForegroundColor); } - @media screen and (max-width: 500px) { - margin-right: 20px; + &.active, &:hover, &:active, &:focus, &.title-page-single { + opacity: 1; + outline: 0px hidden !important; } + + @media screen and (max-width: $mobile-view) { + margin-right: 15px; + } +} + +.title-page-about, +.title-page-settings { + white-space: nowrap; + font-size: 115%; } .admin-sub-header { @@ -146,14 +232,19 @@ label { @include disable-default-a-behaviour; font-size: 16px; - color: #000; + 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; } + + &.active, &:hover, &:active, &:focus { + opacity: 1; + } } } @@ -162,139 +253,24 @@ label { font-weight: bold; } -// Thanks https://gist.github.com/alexandrevicenzi/680147013e902a4eaa5d -.glyphicon-refresh-animate { - animation: spin .7s infinite linear; -} - @keyframes spin { from { transform: scale(1) rotate(0deg);} to { transform: scale(1) rotate(360deg);} } -// Bootstrap customizations -.dropdown-menu { - border-radius: 3px; - box-shadow: 0 3px 6px; - font-size: 15px; - - .dropdown-item { - padding: 3px 15px; - } - - a { - color: #000 !important; - } -} - -.modal { - .modal-header { - border-bottom: none; - margin-bottom: 5px; - - .modal-title { - font-size: 20px; - font-weight: $font-semibold; - } - - .close { - @include icon(24px); - - position: relative; - top: 3px; - float: right; - background-image: url('../assets/images/global/cross.svg'); - - margin: 0; - padding: 0; - opacity: 1; - } - } - - .inputs { - margin-top: 40px; - margin-bottom: 0; - text-align: right; - - .action-button-cancel { - @include peertube-button; - @include grey-button; - - display: inline-block; - margin-right: 10px; - } - - .action-button-submit { - @include peertube-button; - @include orange-button; - } - } -} - -// Nav customizations -.nav .nav-link { - display: flex !important; - align-items: center; - height: 30px !important; - padding: 10px 15px !important; -} - -.nav.nav-pills { - font-size: 16px !important; - - .nav-link.active { - font-weight: $font-semibold !important; - } - - a { - @include disable-default-a-behaviour; - - color: #000; - } -} - -ngb-tabset.bootstrap { - - .nav-link { - &, & a { - @include disable-default-a-behaviour; - - color: #000 !important; - } - } -} - -.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 { - background-color: $grey-color !important; + background-color: $grey-background-color !important; } } } .no-results { height: 40vh; + max-height: 500px; + display: flex; align-items: center; justify-content: center; @@ -302,7 +278,21 @@ table { font-weight: $font-semibold; } -@media screen and (max-width: 1000px) { +.dropdown-item { + @include dropdown-with-icon-item; + + my-global-icon { + width: 22px; + height: 22px; + } +} + +.anchor { + position: relative; + top: #{-($header-height + 20px)}; +} + +@media screen and (max-width: #{breakpoint(xxl)}) { .main-col { &.expanded { .margin-content { @@ -313,9 +303,10 @@ table { } } -@media screen and (max-width: 900px) { +@media screen and (max-width: #{breakpoint(lg)}) { + /* the following applies from 500px to 900px and is partially overriden from 500px to 800px by changes below to $small-view */ .main-col { - &.expanded { + &, &.expanded { .margin-content { margin-left: $expanded-horizontal-margins/3; margin-right: $expanded-horizontal-margins/3; @@ -323,25 +314,23 @@ table { .sub-menu { padding-left: 50px; + padding-right: 50px; .title-page { - font-size: 15px; + font-size: 17px; } } } } } -@media screen and (max-width: 600px) { - .menu-wrapper { - width: 100% !important; - z-index: 10000; - } - - menu { - width: $menu-width; +@media screen and (min-width: $mobile-view) and (max-width: $small-view) { + .main-col { + width: 100%; } +} +@media screen and (max-width: $small-view) { .main-col { margin-left: 0; @@ -352,20 +341,84 @@ table { } .sub-menu { + width: 100vw; padding-left: 15px; padding-right: 15px; - margin-bottom: 10px; + margin-bottom: $sub-menu-margin-bottom-small-view; + overflow-x: auto; + } + + .admin-sub-header { + @include admin-sub-header-responsive(15px*2); + } + + my-markdown-textarea { + .root { + max-width: 100% !important; + } } - input[type=text], input[type=password] { + input[type=text], + input[type=password], + input[type=email], + textarea, + .peertube-select-container { width: 100% !important; } + + .caption input[type=text] { + width: unset !important; + flex-grow: 1; + } } } } -@media screen and (max-width: 400px) { - menu { - width: 100%; +// overflow-databale responsive rules +@media screen and (min-width: #{breakpoint(lg)}) { + .main-col { + &.expanded { + @include overflow-datatable(breakpoint(lg), $expanded-horizontal-margins/2, $mobile-paginator: false); + } + + &:not(.expanded) { + @include overflow-datatable(breakpoint(lg), $not-expanded-horizontal-margins + $menu-width/2, $mobile-paginator: false); + } + } +} + +@media screen and (max-width: #{breakpoint(lg)}) { + .main-col { + &.expanded { + @include overflow-datatable(breakpoint(lg), $expanded-horizontal-margins/3); + } + + &:not(.expanded) { + @include overflow-datatable(breakpoint(lg), $expanded-horizontal-margins/3 + $menu-width/2); + } + } +} + +@media screen and (max-width: $small-view) { + .main-col { + &:not(.expanded), + &.expanded { + @include overflow-datatable(breakpoint(lg), 15px); + } + } +} + +@media screen and (min-width: $small-view) and (max-width: #{$small-view + $menu-width}) { + .main-col { + &:not(.expanded) { + .admin-sub-header { + @include admin-sub-header-responsive($expanded-horizontal-margins/3 + $menu-width/2); + } + + .sub-menu { + overflow-x: auto; + width: calc(100vw - #{$menu-width}); + } + } } }