Migrate to @peertube/videojs-contextmenu

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

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 51c21107bc6b816ca2f3bca42c158693f47ecaba..e0e8fc8285c129aae44df6d87b8b17f700fc193c 100644 (file)
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -1,16 +1,21 @@
 $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
 
-@use '_bootstrap-variables';
-@use '_variables';
-@use '_mixins';
+@use 'sass:math';
+
+@use '_variables' as *;
+@use '_mixins' as *;
 
 @use '_fonts';
 
-@use './bootstrap';
-@use './primeng-custom';
+@use './classes';
+
+@use './custom-markup';
+
 @use './ng-select';
 
-@use './classes';
+// Needs an import because we extends glyphicon icons in primeng
+@import './bootstrap';
+@import './primeng-custom';
 
 [hidden] {
   display: none !important;
@@ -120,12 +125,16 @@ code {
   vertical-align: middle;
 }
 
-.form-error {
+.form-error,
+.form-warning {
   display: block;
-  color: $red;
   margin-top: 5px;
 }
 
+.form-error {
+  color: $red;
+}
+
 .input-error,
 my-input-toggle-hidden ::ng-deep input {
   border-color: $red !important;
@@ -346,11 +355,11 @@ ngx-loading-bar {
 
 @media screen and (max-width: #{breakpoint(xxl)}) {
   .main-col {
-    --horizontalMarginContent: #{$not-expanded-horizontal-margins / 2};
+    --horizontalMarginContent: #{math.div($not-expanded-horizontal-margins, 2)};
     --videosHorizontalMarginContent: 30px;
 
     &.expanded {
-      --horizontalMarginContent: #{$expanded-horizontal-margins / 2};
+      --horizontalMarginContent: #{math.div($expanded-horizontal-margins, 2)};
     }
   }
 }
@@ -363,7 +372,7 @@ ngx-loading-bar {
   /* the following applies from 500px to 900px and is partially overriden from 500px to 800px by changes below to $small-view */
   .main-col,
   .main-col.expanded {
-    --horizontalMarginContent: #{$expanded-horizontal-margins / 3};
+    --horizontalMarginContent: #{math.div($expanded-horizontal-margins, 3)};
 
     .sub-menu {
       padding: 0 50px;