X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Finclude%2F_mixins.scss;h=3c5aa6cdf4f26802c39feff1f8f4890349bb2437;hb=bffee1d538aa7b51b78d646a0d372b352c073cd8;hp=9f6d691314c52eb1c5b3dca75cd98eceeb29dd58;hpb=dd24f1bb0a4b252e5342b251ba36853364da7b8e;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 9f6d69131..3c5aa6cdf 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -91,7 +91,7 @@
   width: $width;
   color: pvar(--inputForegroundColor);
   background-color: pvar(--inputBackgroundColor);
-  border: 1px solid #C6C6C6;
+  border: 1px solid $input-border-color;
   border-radius: 3px;
   font-size: 15px;
 
@@ -124,8 +124,8 @@
 @mixin peertube-textarea ($width, $height) {
   @include peertube-input-text($width);
 
-  color: pvar(--textareaForegroundColor);
-  background-color: pvar(--textareaBackgroundColor);
+  color: pvar(--textareaForegroundColor) !important;
+  background-color: pvar(--textareaBackgroundColor) !important;
   height: $height;
   padding: 5px 15px;
   font-size: 15px;
@@ -150,7 +150,7 @@
   &.disabled {
     cursor: default;
     color: #fff;
-    background-color: #C6C6C6;
+    background-color: $input-border-color;
   }
 
   my-global-icon {
@@ -180,7 +180,7 @@
   &.disabled {
     cursor: default;
     color: pvar(--mainColor);
-    background-color: #C6C6C6;
+    background-color: $input-border-color;
   }
 
   my-global-icon {
@@ -207,7 +207,7 @@
 @mixin grey-button {
   @include button-focus($grey-button-outline-color);
 
-  background-color: $grey-background-color;
+  background-color: pvar(--greyBackgroundColor);
   color: pvar(--greyForegroundColor);
 
   &:hover,
@@ -216,7 +216,7 @@
   &[disabled],
   &.disabled {
     color: pvar(--greyForegroundColor);
-    background-color: $grey-background-hover-color;
+    background-color: pvar(--greySecondaryBackgroundColor);
   }
 
   &[disabled],
@@ -257,17 +257,23 @@
 }
 
 @mixin peertube-button {
-  @include padding(0, 17px, 0, 13px);
+  padding: 0 13px;
 
   border: 0;
   font-weight: $font-semibold;
   font-size: 15px;
   height: $button-height;
   line-height: $button-height;
-  // FIXME: because of primeng that redefines border-radius of all input[type="..."]
+
+  // Because of primeng that redefines border-radius of all input[type="..."]
   border-radius: 3px !important;
+
   text-align: center;
   cursor: pointer;
+
+  my-global-icon + * {
+    @include margin-right(4px);
+  }
 }
 
 @mixin peertube-button-link {
@@ -356,6 +362,7 @@
   background: pvar(--inputBackgroundColor);
   position: relative;
   font-size: 15px;
+  height: min-content;
 
   &.disabled {
     background-color: #E5E5E5;
@@ -364,6 +371,9 @@
       cursor: default;
     }
   }
+  select[disabled] {
+    background-color: #f9f9f9;
+  }
 
   @media screen and (max-width: $width) {
     width: 100%;
@@ -386,10 +396,9 @@
   select {
     padding: 0 35px 0 12px;
     position: relative;
-    border: 1px solid #C6C6C6;
+    border: 1px solid $input-border-color;
     background: transparent none;
     appearance: none;
-    cursor: pointer;
     height: $button-height;
     text-overflow: ellipsis;
     color: pvar(--mainForegroundColor);
@@ -405,14 +414,17 @@
 
     option {
       color: #000;
+
+      &[value=undefined] {
+        font-weight: $font-semibold;
+      }
     }
   }
 
   &.peertube-select-button {
     @include grey-button;
 
-    select,
-    option {
+    select {
       font-weight: $font-semibold;
       color: pvar(--greyForegroundColor);
       border: 0;
@@ -435,6 +447,8 @@
     cursor: pointer;
     line-height: 20px;
     display: inline-block;
+    font-size: 15px;
+    font-weight: $font-regular;
   }
 
   [type=radio]:checked + label::before,
@@ -445,7 +459,7 @@
     top: 0;
     width: 18px;
     height: 18px;
-    border: 1px solid #C6C6C6;
+    border: 1px solid $input-border-color;
     border-radius: 100%;
     background: #fff;
   }
@@ -470,6 +484,13 @@
     opacity: 1;
     transform: scale(1);
   }
+
+  .form-group-description {
+    display: block;
+    margin-top: -7px;
+    margin-bottom: 10px;
+    margin-left: 29px;
+  }
 }
 
 @mixin peertube-checkbox ($border-width) {
@@ -485,7 +506,7 @@
     width: 18px;
     min-width: 18px;
     height: 18px;
-    border: $border-width solid #C6C6C6;
+    border: $border-width solid $input-border-color;
     border-radius: 3px;
     vertical-align: middle;
     cursor: pointer;
@@ -531,7 +552,7 @@
   }
 }
 
-@mixin table-badge {
+@mixin peertube-badge {
   border-radius: 2px;
   padding: 1/4em 1/2em;
   text-transform: uppercase;
@@ -641,12 +662,15 @@
   @include button-with-icon(20px, 5px, -1px);
 }
 
-@mixin row-blocks ($column-responsive: true) {
+@mixin row-blocks ($column-responsive: true, $min-height: 130px, $separator: true) {
   display: flex;
-  min-height: 130px;
+  min-height: $min-height;
   padding-bottom: 20px;
   margin-bottom: 20px;
-  border-bottom: 1px solid #C6C6C6;
+
+  @if $separator {
+    border-bottom: 1px solid $input-border-color;
+  }
 
   @media screen and (max-width: $small-view) {
     @if $column-responsive {
@@ -686,6 +710,7 @@
   span {
     position: absolute;
     color: $grey-foreground-color;
+
     @if $small {
       top: -1px;
     }
@@ -864,7 +889,7 @@
     height: $avatar-height;
 
     my-actor-avatar {
-      @include actor-avatar-size($avatar-height);
+      display: inline-block;
     }
 
     div {