X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Finclude%2F_mixins.scss;h=a25741d91036708c048e24351753ab602408f0ce;hb=HEAD;hp=1b460b7231d2fe29de9609dabb3cc14d9e4c1cbc;hpb=082d32eb8873190e48329b61b91f87d71f3cf812;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 1b460b723..a25741d91 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -1,18 +1,25 @@
 @use 'sass:math';
+@use 'sass:color';
+
 @use '_variables' as *;
 
+@import '_bootstrap-mixins';
+
 @mixin disable-default-a-behaviour {
   &:hover,
   &:focus,
   &:active {
     text-decoration: none !important;
+  }
+
+  &:focus:not(.focus-visible) {
     outline: none !important;
   }
 }
 
 @mixin disable-outline {
   &:focus:not(.focus-visible) {
-    outline: none;
+    outline: none !important;
   }
 }
 
@@ -22,17 +29,8 @@
   text-overflow: ellipsis;
 }
 
-@mixin ellipsis-multiline($font-size: 16px, $number-of-lines: 2) {
-  display: block;
-  /* Fallback for non-webkit */
-  display: -webkit-box; /* stylelint-disable-line value-no-vendor-prefix */
-  -webkit-line-clamp: $number-of-lines;
-  /* Fallback for non-webkit */
-  font-size: $font-size;
-  line-height: $font-size;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  max-height: $font-size * $number-of-lines;
+@mixin muted {
+  color: pvar(--greyForegroundColor) !important;
 }
 
 @mixin fade-text ($fade-after, $background-color) {
@@ -84,18 +82,23 @@
   }
 }
 
-@mixin peertube-input-text($width) {
-  padding: 0 15px;
+@mixin rounded-line-height-1-5 ($font-size) {
+  line-height: $font-size + math.round(math.div($font-size, 2));
+}
+
+@mixin peertube-input-text($width, $font-size: $form-input-font-size) {
+  @include rounded-line-height-1-5($font-size);
+
+  font-size: $font-size;
+
+  padding: 3px 15px;
   display: inline-block;
-  height: $button-height;
   width: $width;
   max-width: $width;
   color: pvar(--inputForegroundColor);
   background-color: pvar(--inputBackgroundColor);
-  border: 1px solid $input-border-color;
+  border: 1px solid pvar(--inputBorderColor);
   border-radius: 3px;
-  font-size: $form-input-font-size;
-  line-height: $form-input-line-height;
 
   &::placeholder {
     color: pvar(--inputPlaceholderColor);
@@ -138,7 +141,7 @@
   &.disabled {
     cursor: default;
     color: #fff;
-    background-color: $input-border-color;
+    background-color: pvar(--inputBorderColor);
   }
 
   my-global-icon {
@@ -149,6 +152,7 @@
 @mixin orange-button-inverted {
   @include button-focus(pvar(--mainColorLightest));
 
+  padding: 2px 13px;
   border: 2px solid pvar(--mainColor);
   font-weight: $font-semibold;
 
@@ -168,7 +172,7 @@
   &.disabled {
     cursor: default;
     color: pvar(--mainColor);
-    background-color: $input-border-color;
+    background-color: pvar(--inputBorderColor);
   }
 
   my-global-icon {
@@ -218,7 +222,7 @@
 }
 
 @mixin danger-button {
-  $color: lighten($color: #c54130, $amount: 10);
+  $color: color.adjust($color: #c54130, $lightness: 10%);
   $text: #fff6f5;
 
   @include button-focus(scale-color($color, $alpha: -95%));
@@ -231,7 +235,7 @@
   &:focus,
   &[disabled],
   &.disabled {
-    background-color: lighten($color: $color, $amount: 10);
+    background-color: color.adjust($color: $color, $lightness: 10%);
   }
 
   &[disabled],
@@ -245,12 +249,12 @@
 }
 
 @mixin peertube-button {
-  padding: 0 13px;
+  @include rounded-line-height-1-5($button-font-size);
+
+  padding: 4px 13px;
 
   border: 0;
   font-weight: $font-semibold;
-  height: $button-height;
-  line-height: $button-height;
 
   // Because of primeng that redefines border-radius of all input[type="..."]
   border-radius: 3px !important;
@@ -262,6 +266,7 @@
 
   my-global-icon + * {
     @include margin-right(4px);
+    @include margin-left(4px);
   }
 }
 
@@ -284,6 +289,13 @@
   display: inline-block;
 }
 
+@mixin peertube-button-big-link {
+  @include disable-default-a-behaviour;
+  @include peertube-button-big;
+
+  display: inline-block;
+}
+
 @mixin peertube-button-outline {
   @include disable-default-a-behaviour;
   @include peertube-button;
@@ -306,7 +318,6 @@
   position: relative;
   overflow: hidden;
   display: inline-block;
-  min-height: 30px;
 
   input[type=file] {
     position: absolute;
@@ -319,7 +330,7 @@
     filter: alpha(opacity=0);
     opacity: 0;
     outline: none;
-    background: #fff;
+    background: pvar(--mainBackgroundColor);
     cursor: inherit;
     display: block;
   }
@@ -385,22 +396,23 @@
     position: absolute;
     pointer-events: none;
     border: 5px solid rgba(0, 0, 0, 0);
-    border-top-color: #000;
+    border-top-color: pvar(--mainForegroundColor);
     margin-top: -2px;
     z-index: 100;
   }
 
   select {
-    padding: 0 35px 0 12px;
+    @include rounded-line-height-1-5($form-input-font-size);
+
+    font-size: $form-input-font-size;
+
+    padding: 3px 35px 3px 12px;
     position: relative;
-    border: 1px solid $input-border-color;
+    border: 1px solid pvar(--inputBorderColor);
     background: transparent none;
     appearance: none;
-    height: $button-height;
     text-overflow: ellipsis;
     color: pvar(--mainForegroundColor);
-    font-size: $form-input-font-size;
-    line-height: $form-input-line-height;
 
     &:focus {
       outline: none;
@@ -427,6 +439,9 @@
       font-weight: $font-semibold;
       color: pvar(--greyForegroundColor);
       border: 0;
+
+      // No border, add +1 to vertical padding
+      padding: 4px 35px 4px 12px;
     }
   }
 }
@@ -440,7 +455,10 @@
   [type=radio]:checked,
   [type=radio]:not(:checked) {
     position: absolute;
-    left: -9999px;
+    opacity: 0;
+    cursor: pointer;
+    height: 0;
+    width: 0;
   }
 
   [type=radio]:checked + label,
@@ -461,7 +479,7 @@
     top: 0;
     width: 18px;
     height: 18px;
-    border: 1px solid $input-border-color;
+    border: 1px solid pvar(--inputBorderColor);
     border-radius: 100%;
     background: #fff;
   }
@@ -508,7 +526,7 @@
     width: 18px;
     min-width: 18px;
     height: 18px;
-    border: $border-width solid $input-border-color;
+    border: $border-width solid pvar(--inputBorderColor);
     border-radius: 3px;
     vertical-align: middle;
     cursor: pointer;
@@ -522,8 +540,8 @@
       height: 12px;
       opacity: 0;
       transform: rotate(45deg) scale(0);
-      border-right: 2px solid $bg-color;
-      border-bottom: 2px solid $bg-color;
+      border-right: 2px solid pvar(--mainBackgroundColor);
+      border-bottom: 2px solid pvar(--mainBackgroundColor);
     }
   }
 
@@ -588,12 +606,6 @@
   margin-bottom: 10px;
 }
 
-@mixin create-button {
-  @include peertube-button-link;
-  @include orange-button;
-  @include button-with-icon(20px, 5px, -1px);
-}
-
 @mixin row-blocks ($column-responsive: true, $min-height: 130px, $separator: true) {
   display: flex;
   min-height: $min-height;
@@ -601,7 +613,7 @@
   margin-bottom: 20px;
 
   @if $separator {
-    border-bottom: 1px solid $input-border-color;
+    border-bottom: 1px solid pvar(--inputBorderColor);
   }
 
   @media screen and (max-width: $small-view) {
@@ -631,7 +643,7 @@
 }
 
 @mixin progressbar($small: false) {
-  background-color: $grey-background-color;
+  background-color: pvar(--greyBackgroundColor);
   display: flex;
   height: 1rem;
   overflow: hidden;
@@ -641,7 +653,7 @@
 
   span {
     position: absolute;
-    color: $grey-foreground-color;
+    color: pvar(--greyForegroundColor);
 
     @if $small {
       top: -1px;
@@ -666,7 +678,7 @@
     transition: width 0.6s ease;
 
     &.red {
-      background-color: lighten($color: #c54130, $amount: 10);
+      background-color: color.adjust($color: #c54130, $lightness: 10%);
     }
   }
 }
@@ -711,7 +723,7 @@
 
   > div {
     box-sizing: border-box;
-    flex: 0 0 percentage(math.div(1, 3));
+    flex: 0 0 math.percentage(math.div(1, 3));
     padding: 0 5px;
     margin-bottom: 10px;
 
@@ -780,51 +792,39 @@
 }
 
 @mixin chip {
-  --chip-radius: 5rem;
-  --chip-padding: .2rem .4rem;
-  $avatar-height: 1.2rem;
+  --avatar-size: 1.2rem;
 
-  align-items: center;
-  border-radius: var(--chip-radius);
   display: inline-flex;
-  font-size: 90%;
   color: pvar(--mainForegroundColor);
-  height: $avatar-height;
-  line-height: 1rem;
-  margin: .1rem;
+  height: var(--avatar-size);
   max-width: 320px;
   overflow: hidden;
-  padding: var(--chip-padding);
   text-decoration: none;
   text-overflow: ellipsis;
   vertical-align: middle;
   white-space: nowrap;
 
-  &.rectangular {
-    --chip-radius: .2rem;
-    --chip-padding: .2rem .3rem;
-  }
-
   my-actor-avatar {
-    @include margin-left(-.4rem);
     @include margin-right(.2rem);
+
+    border-radius: 5rem;
+    width: var(--avatar-size);
+    height: var(--avatar-size);
   }
 
   &.two-lines {
-    $avatar-height: 2rem;
+    --avatar-size: 2rem;
 
-    height: $avatar-height;
+    font-size: 14px;
+    line-height: 1rem;
 
     my-actor-avatar {
       display: inline-block;
     }
 
-    div {
-      margin: 0 .1rem;
-
+    > div {
       display: flex;
       flex-direction: column;
-      height: $avatar-height;
       justify-content: center;
     }
   }
@@ -834,7 +834,7 @@
 // an immediate's parent size. This allows to set a ratio without explicit
 // dimensions, as width/height cannot be computed from each other.
 @mixin block-ratio ($selector: 'div', $inverted-ratio: math.div(9, 16)) {
-  $padding-percent: percentage($inverted-ratio);
+  $padding-percent: math.percentage($inverted-ratio);
 
   position: relative;
   height: 0;
@@ -891,7 +891,7 @@
 
 @mixin on-small-main-col () {
   :host-context(.main-col:not(.expanded)) {
-    @media screen and (max-width: $small-view + $menu-width) {
+    @media screen and (max-width: #{$small-view + $menu-width}) {
       @content;
     }
   }
@@ -905,7 +905,7 @@
 
 @mixin on-mobile-main-col () {
   :host-context(.main-col:not(.expanded)) {
-    @media screen and (max-width: $mobile-view + $menu-width) {
+    @media screen and (max-width: #{$mobile-view + $menu-width}) {
       @content;
     }
   }
@@ -917,58 +917,81 @@
   }
 }
 
-@mixin margin ($block-start, $inline-end, $block-end, $inline-start) {
-  @include margin-left($inline-start);
-  @include margin-right($inline-end);
-
-  margin-top: $block-start;
-  margin-bottom: $block-end;
+@mixin margin ($arg1: null, $arg2: null, $arg3: null, $arg4: null) {
+  @if $arg2 == null and $arg3 == null and $arg4 == null {
+    @include margin-original($arg1, $arg1, $arg1, $arg1);
+  } @else if $arg3 == null and $arg4 == null {
+    @include margin-original($arg1, $arg2, $arg1, $arg2);
+  } @else if $arg4 == null {
+    @include margin-original($arg1, $arg2, $arg3, $arg2);
+  } @else {
+    @include margin-original($arg1, $arg2, $arg3, $arg4);
+  }
 }
 
-@mixin padding ($block-start, $inline-end, $block-end, $inline-start) {
-  @include padding-left($inline-start);
-  @include padding-right($inline-end);
-
-  padding-top: $block-start;
-  padding-bottom: $block-end;
+@mixin margin-original ($block-start, $inline-end, $block-end, $inline-start) {
+  @include margin-left($inline-start);
+  @include margin-right($inline-end);
+  @include margin-top($block-start);
+  @include margin-bottom($block-end);
 }
 
 @mixin margin-left ($value) {
   @supports (margin-inline-start: $value) {
-    margin-inline-start: $value;
+    @include rfs($value, margin-inline-start);
   }
 
   @supports not (margin-inline-start: $value) {
-    margin-left: $value;
+    @include rfs($value, margin-left);
   }
 }
 
 @mixin margin-right ($value) {
   @supports (margin-inline-end: $value) {
-    margin-inline-end: $value;
+    @include rfs($value, margin-inline-end);
   }
 
   @supports not (margin-inline-end: $value) {
-    margin-right: $value;
+    @include rfs($value, margin-right);
+  }
+}
+
+@mixin padding-original ($block-start, $inline-end, $block-end, $inline-start) {
+  @include padding-left($inline-start);
+  @include padding-right($inline-end);
+  @include padding-top($block-start);
+  @include padding-bottom($block-end);
+}
+
+
+@mixin padding ($arg1: null, $arg2: null, $arg3: null, $arg4: null) {
+  @if $arg2 == null and $arg3 == null and $arg4 == null {
+    @include padding-original($arg1, $arg1, $arg1, $arg1);
+  } @else if $arg3 == null and $arg4 == null {
+    @include padding-original($arg1, $arg2, $arg1, $arg2);
+  } @else if $arg4 == null {
+    @include padding-original($arg1, $arg2, $arg3, $arg2);
+  } @else {
+    @include padding-original($arg1, $arg2, $arg3, $arg4);
   }
 }
 
 @mixin padding-left ($value) {
   @supports (padding-inline-start: $value) {
-    padding-inline-start: $value;
+    @include rfs($value, padding-inline-start);
   }
 
   @supports not (padding-inline-start: $value) {
-    padding-left: $value;
+    @include rfs($value, padding-left);
   }
 }
 
 @mixin padding-right ($value) {
   @supports (padding-inline-end: $value) {
-    padding-inline-end: $value;
+    @include rfs($value, padding-inline-end);
   }
 
   @supports not (padding-inline-end: $value) {
-    padding-right: $value;
+    @include rfs($value, padding-right);
   }
 }