Merge branch 'release/2.1.0' into develop

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

diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index ebd3c0cc4d76955ad6932b72e7dc1a34a735fd5e..317781e0e9755ad077db1f27d205a1f1a6e3cd1a 100644 (file)
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -44,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;
@@ -77,11 +77,17 @@
   }
 }
 
+@mixin button-focus-visible-shadow($color) {
+  &.focus-visible {
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 4px $color;
+  }
+}
+
 @mixin peertube-input-text($width) {
   display: inline-block;
   height: $button-height;
   width: $width;
-  background: var(--inputColor);
+  background: var(--inputBackgroundColor);
   border: 1px solid #C6C6C6;
   border-radius: 3px;
   padding-left: 15px;
@@ -99,7 +105,7 @@
 
 @mixin peertube-input-group($width) {
   width: $width;
-  height: $button-height;
+  min-height: $button-height;
   padding-top: 0;
   padding-bottom: 0;
 
@@ -118,6 +124,8 @@
 }
 
 @mixin orange-button {
+  @include button-focus-visible-shadow(var(--mainHoverColor));
+
   &, &:active, &:focus {
     color: #fff;
     background-color: var(--mainColor);
@@ -169,7 +177,6 @@
   text-align: center;
   padding: 0 17px 0 13px;
   cursor: pointer;
-  outline: 0;
 }
 
 @mixin peertube-button-link {
@@ -179,6 +186,15 @@
   @include peertube-button;
 }
 
+@mixin peertube-button-outline {
+  display: inline-block;
+
+  @include disable-default-a-behaviour;
+  @include peertube-button;
+
+  border: 1px solid;
+}
+
 @mixin button-with-icon($width: 20px, $margin-right: 3px, $top: -1px) {
   my-global-icon {
     position: relative;
@@ -245,7 +261,7 @@
   width: $width;
   border-radius: 3px;
   overflow: hidden;
-  background: var(--inputColor);
+  background: var(--inputBackgroundColor);
   position: relative;
   font-size: 15px;
 
@@ -337,7 +353,7 @@
   position: absolute;
 
   &:focus + span {
-    outline: 1px solid #1e5180;
+    box-shadow: 0 0 0 .1rem rgba(87, 85, 217, .2);
   }
 
   & + span {
@@ -345,7 +361,7 @@
     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;
@@ -359,14 +375,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 {
@@ -396,6 +412,8 @@
   border-radius: 50%;
   width: $size;
   height: $size;
+  min-width: $size;
+  min-height: $size;
 }
 
 @mixin chevron ($size, $border-width) {
@@ -451,7 +469,7 @@
 }
 
 @mixin sub-menu-with-actor {
-  height: 160px;
+  height: max-content;
   display: flex;
   flex-direction: column;
   align-items: flex-start;
@@ -507,6 +525,8 @@
     a {
       margin-top: 0;
       margin-bottom: 0;
+      text-transform: uppercase;
+      font-weight: 600;
     }
   }
 }
@@ -532,10 +552,11 @@
 }
 
 @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;