X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Finclude%2F_variables.scss;h=8c5e7586423334e4c4e84a5cb48fbb74f2d262bc;hb=33253c1aa6b82284ddd0a9cb516ad85e276ca3a3;hp=565f9b512c7b092969c0723d260a63fbb10a58a2;hpb=5d666c0eb25a1b665caa46c4210c1dc2a6b5b333;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index 565f9b512..8c5e75864 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss @@ -7,6 +7,7 @@ $main-fonts: 'Source Sans Pro', sans-serif; $font-regular: 400; $font-semibold: 600; $font-bold: 700; +$line-height-normal: 1.2; $grey-background-color: #E5E5E5; $grey-background-hover-color: #EFEFEF; @@ -14,13 +15,12 @@ $grey-foreground-color: #585858; $grey-foreground-hover-color: #303030; $grey-button-outline-color: scale-color($grey-foreground-color, $alpha: -95%); -// Palette $main-color: hsl(24, 90%, 50%); -$main-hover-color: lighten($main-color, 5%); $main-color-lighter: lighten($main-color, 10%); $main-color-lightest: lighten($main-color, 40%); -$secondary-color: hsl(187, 77, 34); -// +$main-hover-color: lighten($main-color, 5%); + +$secondary-color: hsl(187, 77%, 34%); $support-button: inherit; $support-button-heart: #e83e8c; @@ -34,7 +34,7 @@ $green: #39CC0B; $grey-actor-name: #777272; $expanded-horizontal-margins: 150px; -$not-expanded-horizontal-margins: 30px; +$not-expanded-horizontal-margins: 60px; $button-height: 30px; @@ -48,9 +48,12 @@ $menu-bottom-color: #C6C6C6; $menu-width: 240px; $menu-lateral-padding: 26px; -$sub-menu-color: #F7F7F7; +$sub-menu-background-color: #F7F7F7; $sub-menu-height: 81px; +$channel-background-color: #f6ede8; +$max-channels-width: 1200px; + $footer-height: 30px; $footer-margin: 30px; @@ -86,9 +89,12 @@ $variables: ( --mainColor: var(--mainColor), --mainColorLighter: var(--mainColorLighter), --mainColorLightest: var(--mainColorLightest), + --mainHoverColor: var(--mainHoverColor), + --mainBackgroundColor: var(--mainBackgroundColor), --mainForegroundColor: var(--mainForegroundColor), + --secondaryColor: var(--secondaryColor), --greyForegroundColor: var(--greyForegroundColor), @@ -96,7 +102,9 @@ $variables: ( --menuBackgroundColor: var(--menuBackgroundColor), --menuForegroundColor: var(--menuForegroundColor), - --submenuColor: var(--submenuColor), + + --submenuBackgroundColor: var(--submenuBackgroundColor), + --channelBackgroundColor: var(--channelBackgroundColor), --inputForegroundColor: var(--inputForegroundColor), --inputBackgroundColor: var(--inputBackgroundColor), @@ -114,11 +122,19 @@ $variables: ( --supportButtonHeartColor: var(--supportButtonHeartColor), --embedForegroundColor: var(--embedForegroundColor), - --embedBigPlayBackgroundColor: var(--embedBigPlayBackgroundColor) + --embedBigPlayBackgroundColor: var(--embedBigPlayBackgroundColor), + + --horizontalMarginContent: var(--horizontalMarginContent), + --mainColWidth: var(--mainColWidth) ); +// SASS type check our CSS variables @function pvar($variable) { - @return map-get($variables, $variable); + @if map-has-key($variables, $variable) { + @return map-get($variables, $variable); + } @else { + @error "ERROR: Variable #{$variable} does not exist"; + } } /*** z-index groups ***/ @@ -126,7 +142,6 @@ $variables: ( $zindex: ( miniature : 10, privacymsg : 20, - dropdown : 12000, sub-menu : 12500, menu : 12600, search-typeahead: 12650, @@ -135,6 +150,7 @@ $zindex: ( tooltip : 14000, loadbar : 15000, modal : 16000, + dropdown : 17000, help-popover : 17000, notification : 18000, hotkeys : 19000