Merge branch 'release/4.2.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / sass / include / _variables.scss

diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss
index ef22fafe03c73c2c7fa6b1b4e439cda45532ba09..2b893a62bbe5546193908825a100178439912d79 100644 (file)
--- a/client/src/sass/include/_variables.scss
+++ b/client/src/sass/include/_variables.scss
@@ -29,7 +29,7 @@ $support-button: inherit;
 $support-button-heart: #e83e8c;
 
 $bg-color: #fff;
-$fg-color: #000;
+$fg-color: #212529;
 
 $red: #FF0000;
 $green: #39CC0B;
@@ -39,6 +39,7 @@ $grey-actor-name: #777272;
 $expanded-horizontal-margins: 150px;
 $not-expanded-horizontal-margins: 30px;
 
+$button-font-size: 15px;
 $button-height: 30px;
 
 $header-height: 50px;
@@ -94,9 +95,11 @@ $markdown-textarea-background-color: $grey-background-hover-color;
 $sub-menu-margin-bottom: 30px;
 $sub-menu-margin-bottom-small-view: 10px;
 
-$activated-action-button-color: #000;
+$activated-action-button-color: #212529;
 
 $focus-box-shadow-form: 0 0 0 .2rem;
+$form-input-font-size: 15px;
+$form-input-line-height: 1.4;
 
 $video-watch-player-factor: math.div(16, 9);
 $video-watch-info-margin-left: 44px;
@@ -172,10 +175,10 @@ $zindex: (
   popover         : 13000,
   tooltip         : 14000,
   loadbar         : 15000,
-  dropdown        : 17000,
-  help-popover    : 17000,
   privacymsg      : 17500,
   header          : 17500,
+  help-popover    : 17600,
+  dropdown        : 17600,
   modal           : 19000,
   hotkeys         : 19000,
   notification    : 20000