Fixed tests and improved app-navigation-caption

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

2 files changed, 29 insertions, 16 deletions

diff --git a/core/css/apps.scss b/core/css/apps.scss
index ed582b02bb0..822a27cc197 100644
--- a/core/css/apps.scss
+++ b/core/css/apps.scss
@@ -174,6 +174,23 @@ kbd {
 				}
 			}
 
+			&.app-navigation-caption {
+				font-weight: bold;
+				line-height: 44px;
+				padding: 0 44px;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+				// !important to overwrite specific hover and focus
+				opacity: .7;
+				box-shadow: none !important;
+				user-select: none;
+				pointer-events:none;
+
+				&:not(:first-child) {
+					margin-top: 22px;
+				}
+			}
+
 			/* Second level nesting for lists */
 			> ul {
 				flex: 0 1 auto;
diff --git a/core/css/variables.scss b/core/css/variables.scss
index e9ba208f483..43e3c6b97bb 100644
--- a/core/css/variables.scss
+++ b/core/css/variables.scss
@@ -1,14 +1,10 @@
 // SCSS darken/lighten function override
-// if no exists
-@if function-exists(nc-darken) == false {
-	@function nc-darken($color, $value) {
-		@return darken($color, $value);
-	}
+@function nc-darken($color, $value) {
+	@return darken($color, $value);
 }
-@if function-exists(nc-lighten) == false {
-	@function nc-lighten($color, $value) {
-		@return lighten($color, $value);
-	}
+
+@function nc-lighten($color, $value) {
+	@return lighten($color, $value);
 }
 
 // SCSS variables
@@ -22,11 +18,11 @@ $color-background-darker: nc-darken($color-main-background, 14%) !default;
 
 $color-primary: #0082c9;
 $color-primary-text: #ffffff;
-// do not use nc-darken in case of overriding because
+// do not use nc-darken/lighten in case of overriding because
 // primary-text is independent of color-main-text
 $color-primary-text-dark: darken($color-primary-text, 7%) !default;
 $color-primary-element: $color-primary !default;
-$color-primary-element-light: nc-lighten($color-primary-element, 15%) !default;
+$color-primary-element-light: lighten($color-primary-element, 15%) !default;
 
 $color-error: #e9322d;
 $color-warning: #eca700;
@@ -35,9 +31,9 @@ $color-success: #46ba61;
 // rgb(118, 118, 118) / #767676
 // min. color contrast for normal text on white background according to WCAG AA
 // (Works as well: color: #000; opacity: 0.57;)
-$color-text-maxcontrast: nc-lighten($color-main-text, 46.2%);
-$color-text-light: nc-lighten($color-main-text, 15%);
-$color-text-lighter: nc-lighten($color-main-text, 30%);
+$color-text-maxcontrast: nc-lighten($color-main-text, 46.2%) !default;
+$color-text-light: nc-lighten($color-main-text, 15%) !default;
+$color-text-lighter: nc-lighten($color-main-text, 30%) !default;
 
 $image-logo: url('../img/logo.svg?v=1');
 $image-login-background: url('../img/background.png?v=2');
@@ -48,9 +44,9 @@ $color-loading-dark: #777 !default;
 $color-box-shadow: rgba(nc-darken($color-main-background, 70%), 0.75) !default;
 
 // light border like file table or app-content list
-$color-border: nc-darken($color-main-background, 7%);
+$color-border: nc-darken($color-main-background, 7%) !default;
 // darker border like inputs or very visible elements
-$color-border-dark: nc-darken($color-main-background, 14%);
+$color-border-dark: nc-darken($color-main-background, 14%) !default;
 $border-radius: 3px !default;
 
 $font-face: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif !default;