X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Fapplication.scss;h=eacfad30bc93cc15573e75ae1dba7d7871f69a3d;hb=5abc96fca2496f33075796db208fccc3543e0f65;hp=4f753e04120a34da126cc52ce0d13e0a424fc9dc;hpb=228393302d98136d4dc35c5f197edc8cebd5d64f;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 4f753e041..eacfad30b 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -8,7 +8,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; @import '~video.js/dist/video-js.css'; -$assets-path: '../assets/'; +$assets-path: '../../assets/'; @import './player/index'; @import './loading-bar'; @@ -32,6 +32,7 @@ body { --secondaryColor: #{$secondary-color}; --greyForegroundColor: #{$grey-foreground-color}; + --greyBackgroundColor: #{$grey-background-color}; --menuBackgroundColor: #{$menu-background}; --menuForegroundColor: #{$menu-color}; @@ -57,6 +58,10 @@ body { 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 { @@ -132,15 +137,24 @@ label { flex-grow: 1; } + my-top-menu-dropdown + .margin-content { + padding-top: $sub-menu-height + $sub-menu-margin-bottom; + } + .sub-menu { background-color: pvar(--submenuColor); width: 100%; - height: 81px; - margin-bottom: $sub-menu-margin-bottom; + 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: #{z('header') - 1}; + + & + .margin-content { + padding-top: $sub-menu-height + $sub-menu-margin-bottom; + } } // Override some properties if the main content is expanded (no menu on the left) @@ -171,6 +185,7 @@ label { } .title-page { + opacity: 0.6; color: pvar(--mainForegroundColor); font-size: 16px; display: inline-block; @@ -178,14 +193,15 @@ label { font-weight: $font-semibold; @include disable-default-a-behaviour; - &.active, &.title-page-single { + border-bottom: 2px solid transparent; + + &.title-page-single { margin-top: 30px; margin-bottom: 25px; } &.active { - font-weight: $font-bold; - border-bottom: 2px solid pvar(--mainColor); + border-bottom-color: pvar(--mainColor); } &.title-page-single { @@ -196,6 +212,11 @@ label { color: pvar(--mainForegroundColor); } + &.active, &:hover, &:active, &:focus, &.title-page-single { + opacity: 1; + outline: 0px hidden !important; + } + @media screen and (max-width: $mobile-view) { margin-right: 15px; } @@ -205,11 +226,6 @@ label { .title-page-settings { white-space: nowrap; font-size: 115%; - font-weight: $font-regular; - - &.active { - font-weight: $font-semibold; - } } .admin-sub-header { @@ -228,11 +244,15 @@ label { 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; + } + + &.active, &:hover, &:active, &:focus { + opacity: 1; } } } @@ -352,7 +372,7 @@ table { input[type=email], textarea, .peertube-select-container { - width: 100% !important; + flex-grow: 1; } .caption input[type=text] {