X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fsass%2Finclude%2F_mixins.scss;h=d4a2269a1b9767e3bbfc2c66b8b9631ae78cb76b;hb=776ca9b1cc21daf96b48ecc9cc70a50ee3bfaf68;hp=6e2feb748b06d5fbda21b7b55df5d381ec308009;hpb=9a0fc8409c7a783348ec212fa9f38d0a98413467;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 6e2feb748..d4a2269a1 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -8,7 +8,9 @@
 }
 
 @mixin disable-outline {
-  outline: none;
+  &:focus:not(.focus-visible) {
+    outline: none;
+  }
 
   &::-moz-focus-inner {
     border: 0;
@@ -16,23 +18,21 @@
   }
 }
 
-/**
- *  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 {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+@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;
 }
@@ -51,7 +51,30 @@
   -ms-hyphens: auto;
   -moz-hyphens: auto;
   hyphens: auto;
-  text-align: justify;
+}
+
+@mixin apply-svg-color ($color) {
+  /deep/ svg {
+    path[fill="#000000"],
+    g[fill="#000000"],
+    rect[fill="#000000"],
+    circle[fill="#000000"],
+    polygon[fill="#000000"] {
+      fill: $color;
+    }
+
+    path[stroke="#000000"],
+    g[stroke="#000000"],
+    rect[stroke="#000000"],
+    circle[stroke="#000000"],
+    polygon[stroke="#000000"] {
+      stroke: $color;
+    }
+
+    stop[stop-color="#000000"] {
+      stop-color: $color;
+    }
+  }
 }
 
 @mixin peertube-input-text($width) {
@@ -63,10 +86,15 @@
   border-radius: 3px;
   padding-left: 15px;
   padding-right: 15px;
+  font-size: 15px;
 
   &::placeholder {
     color: var(--inputPlaceholderColor);
   }
+
+  @media screen and (max-width: $width) {
+    width: 100%;
+  }
 }
 
 @mixin peertube-input-group($width) {
@@ -105,22 +133,30 @@
     color: #fff;
     background-color: #C6C6C6;
   }
+
+  my-global-icon {
+    @include apply-svg-color(#fff)
+  }
 }
 
 @mixin grey-button {
   &, &:active, &:focus {
-    background-color: $grey-color;
-    color: #585858;
+    background-color: $grey-background-color;
+    color: $grey-foreground-color;
   }
 
   &:hover, &:active, &:focus, &[disabled], &.disabled {
-    color: #585858;
-    background-color: $grey-hoover-color;
+    color: $grey-foreground-color;
+    background-color: $grey-background-hover-color;
   }
 
   &[disabled], &.disabled {
     cursor: default;
   }
+
+  my-global-icon {
+    @include apply-svg-color($grey-foreground-color)
+  }
 }
 
 @mixin peertube-button {
@@ -143,6 +179,15 @@
   @include peertube-button;
 }
 
+@mixin button-with-icon($width: 20px, $margin-right: 3px, $top: -1px) {
+  my-global-icon {
+    position: relative;
+    width: $width;
+    margin-right: $margin-right;
+    top: $top;
+  }
+}
+
 @mixin peertube-button-file ($width) {
   position: relative;
   overflow: hidden;
@@ -190,6 +235,10 @@
   position: relative;
   font-size: 15px;
 
+  @media screen and (max-width: $width) {
+    width: 100%;
+  }
+
   &:after {
     top: 50%;
     right: calc(0% + 15px);
@@ -216,6 +265,7 @@
     cursor: pointer;
     height: $button-height;
     text-overflow: ellipsis;
+    color: var(--mainForegroundColor);
 
     &:focus {
       outline: none;
@@ -225,6 +275,10 @@
       color: transparent;
       text-shadow: 0 0 0 #000;
     }
+
+    option {
+      color: #000;
+    }
   }
 }
 
@@ -277,7 +331,12 @@
 }
 
 @mixin peertube-checkbox ($border-width) {
-  display: none;
+  opacity: 0;
+  position: absolute;
+
+  &:focus + span {
+    outline: 1px solid #1e5180;
+  }
 
   & + span {
     position: relative;
@@ -297,8 +356,8 @@
       height: 12px;
       opacity: 0;
       transform: rotate(45deg) scale(0);
-      border-right: 2px solid var(--mainForegroundColor);
-      border-bottom: 2px solid var(--mainForegroundColor);
+      border-right: 2px solid var(--mainBackgroundColor);
+      border-bottom: 2px solid var(--mainBackgroundColor);
     }
   }
 
@@ -392,7 +451,7 @@
   height: 160px;
   display: flex;
   flex-direction: column;
-  align-items: start;
+  align-items: flex-start;
 
   .actor {
     display: flex;
@@ -449,18 +508,10 @@
   }
 }
 
-@mixin create-button ($imageUrl) {
+@mixin create-button {
   @include peertube-button-link;
   @include orange-button;
-
-  .icon.icon-add {
-    @include icon(20px);
-
-    position: relative;
-    top: -1px;
-    margin-right: 5px;
-    background-image: url($imageUrl);
-  }
+  @include button-with-icon(20px, 5px, -1px);
 }
 
 @mixin row-blocks {
@@ -473,36 +524,18 @@
   @media screen and (max-width: 800px) {
     flex-direction: column;
     height: auto;
-    text-align: center;
     align-items: center;
   }
 }
 
-@mixin video-miniature-small-screen {
-  text-align: center;
-
-  /deep/ .video-miniature {
-    padding-right: 0;
-    height: auto;
-    width: 100%;
-    margin-bottom: 20px;
+@mixin dropdown-with-icon-item {
+  padding: 6px 24px;
 
-    .video-miniature-information {
-      width: 100% !important;
-
-      span {
-        width: 100%;
-      }
-    }
+  my-global-icon {
+    width: 24px;
 
-    .video-thumbnail {
-      width: 100%;
-      height: auto;
-
-      img {
-        width: 100%;
-        height: auto;
-      }
-    }
+    margin-right: 10px;
+    position: relative;
+    top: -2px;
   }
-}
\ No newline at end of file
+}