X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Finclude%2F_mixins.scss;h=17217283ea334b8a433c94e0478d3e5b0e9615d4;hb=801fb632caf0d505ad05bc7da7ecbe482e50aa54;hp=37bd404dd02f026a97ed02da590e50fa6346ce5e;hpb=a55052c9baf2952795685d3b4e5348c8cb9da70d;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 37bd404dd..17217283e 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -24,23 +24,15 @@
   overflow: hidden;
   text-overflow: ellipsis;
 }
-/**
- *  This mixin will crop text in block for needed amount of lines and put ellipsis at the end
- *
- *  @param $font-size font-size property
- *  @param $line-height line-height property
- *  @param $lines-to-show amount of lines to show
- */
-@mixin ellipsis-multiline($font-size: 1rem, $line-height: 1, $lines-to-show: 2) {
+
+@mixin ellipsis-multiline($font-size: 16px, $number-of-lines: 2) {
   display: block;
   /* Fallback for non-webkit */
   display: -webkit-box;
-  max-height: $font-size * $line-height * $lines-to-show;
+  max-height: $font-size * $number-of-lines;
   /* Fallback for non-webkit */
   font-size: $font-size;
-  line-height: $line-height;
-  -webkit-line-clamp: $lines-to-show;
-  -webkit-box-orient: vertical;
+  line-height: $font-size;
   overflow: hidden;
   text-overflow: ellipsis;
 }
@@ -52,7 +44,7 @@
 }
 
 @mixin peertube-word-wrap {
-  word-break: normal;
+  word-break: break-word;
   word-wrap: break-word;
   overflow-wrap: break-word;
   -webkit-hyphens: auto;
@@ -62,7 +54,7 @@
 }
 
 @mixin apply-svg-color ($color) {
-  /deep/ svg {
+  ::ng-deep svg {
     path[fill="#000000"],
     g[fill="#000000"],
     rect[fill="#000000"],
@@ -107,7 +99,7 @@
 
 @mixin peertube-input-group($width) {
   width: $width;
-  height: $button-height;
+  min-height: $button-height;
   padding-top: 0;
   padding-bottom: 0;
 
@@ -232,6 +224,20 @@
   cursor: pointer;
 }
 
+@mixin select-arrow-down {
+  top: 50%;
+  right: calc(0% + 15px);
+  content: " ";
+  height: 0;
+  width: 0;
+  position: absolute;
+  pointer-events: none;
+  border: 5px solid rgba(0, 0, 0, 0);
+  border-top-color: #000;
+  margin-top: -2px;
+  z-index: 100;
+}
+
 @mixin peertube-select-container ($width) {
   padding: 0;
   margin: 0;
@@ -243,18 +249,20 @@
   position: relative;
   font-size: 15px;
 
+  &.disabled {
+    background-color: #E5E5E5;
+
+    select {
+      cursor: default;
+    }
+  }
+
+  @media screen and (max-width: $width) {
+    width: 100%;
+  }
+
   &:after {
-    top: 50%;
-    right: calc(0% + 15px);
-    content: " ";
-    height: 0;
-    width: 0;
-    position: absolute;
-    pointer-events: none;
-    border: 5px solid rgba(0, 0, 0, 0);
-    border-top-color: #000;
-    margin-top: -2px;
-    z-index: 100;
+    @include select-arrow-down;
   }
 
   select {
@@ -286,16 +294,6 @@
   }
 }
 
-@mixin peertube-select-disabled-container ($width) {
-  @include peertube-select-container($width);
-
-  background-color: #E5E5E5;
-
-  select {
-    cursor: default;
-  }
-}
-
 // Thanks: https://codepen.io/triss90/pen/XNEdRe/
 @mixin peertube-radio-container {
   input[type="radio"] {
@@ -335,13 +333,19 @@
 }
 
 @mixin peertube-checkbox ($border-width) {
-  display: none;
+  opacity: 0;
+  position: absolute;
+
+  &:focus + span {
+    outline: 1px solid #1e5180;
+  }
 
   & + span {
     position: relative;
     width: 18px;
+    min-width: 18px;
     height: 18px;
-    border: $border-width solid var(--mainForegroundColor);
+    border: $border-width solid $fg-color;
     border-radius: 3px;
     vertical-align: middle;
     cursor: pointer;
@@ -355,14 +359,14 @@
       height: 12px;
       opacity: 0;
       transform: rotate(45deg) scale(0);
-      border-right: 2px solid var(--mainBackgroundColor);
-      border-bottom: 2px solid var(--mainBackgroundColor);
+      border-right: 2px solid $bg-color;
+      border-bottom: 2px solid $bg-color;
     }
   }
 
   &:checked + span {
     border-color: transparent;
-    background: var(--mainColor);
+    background: $orange-color;
     animation: jelly 0.6s ease;
 
     &:after {
@@ -392,6 +396,8 @@
   border-radius: 50%;
   width: $size;
   height: $size;
+  min-width: $size;
+  min-height: $size;
 }
 
 @mixin chevron ($size, $border-width) {
@@ -523,16 +529,16 @@
   @media screen and (max-width: 800px) {
     flex-direction: column;
     height: auto;
-    text-align: center;
     align-items: center;
   }
 }
 
 @mixin dropdown-with-icon-item {
-  padding: 6px 24px;
+  padding: 6px 15px;
 
   my-global-icon {
-    width: 24px;
+    width: 22px;
+    opacity: .7;
 
     margin-right: 10px;
     position: relative;