Mixin scss icon api

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

6 files changed, 13 insertions, 16 deletions

diff --git a/apps/accessibility/css/themedark.scss b/apps/accessibility/css/themedark.scss
index 685a226f102..ecde4ec4c8a 100644
--- a/apps/accessibility/css/themedark.scss
+++ b/apps/accessibility/css/themedark.scss
@@ -17,10 +17,6 @@ $color-box-shadow: rgba(darken($color-main-background, 70%), 0.5);
 $color-border: lighten($color-main-background, 7%);
 $color-border-dark: lighten($color-main-background, 14%);
 
-// invert svg icons colors
-$color-white: #000;
-$color-black: #fff;
-
 #app-navigation > ul > li > a:first-child,
 #app-navigation > ul > li > ul > li > a:first-child,
 #expanddiv a {
@@ -53,4 +49,4 @@ $color-black: #fff;
 	[class^='icon-'], [class*=' icon-'] {
 		filter: invert(100%);
 	}
-}
\ No newline at end of file
+}
diff --git a/apps/accessibility/lib/Controller/AccessibilityController.php b/apps/accessibility/lib/Controller/AccessibilityController.php
index ea4de77d7a0..f5ec1b8fab1 100644
--- a/apps/accessibility/lib/Controller/AccessibilityController.php
+++ b/apps/accessibility/lib/Controller/AccessibilityController.php
@@ -36,6 +36,7 @@ use OCP\IRequest;
 use OCP\IURLGenerator;
 use OCP\IUserManager;
 use OCP\IUserSession;
+use OC\Template\SCSSCacher;
 
 class AccessibilityController extends Controller {
 
diff --git a/apps/encryption/css/settings-personal.scss b/apps/encryption/css/settings-personal.scss
index 29e81a99683..d9846cc77f6 100644
--- a/apps/encryption/css/settings-personal.scss
+++ b/apps/encryption/css/settings-personal.scss
@@ -11,5 +11,5 @@
 
 /* icons for sidebar */
 .nav-icon-basic-encryption-module {
-	background-image: icon-color('app', 'encryption', $color-black);
+	@include icon-color('app', 'encryption', $color-black);
 }
\ No newline at end of file
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss
index a408776a302..6dcdec0711c 100644
--- a/apps/files/css/files.scss
+++ b/apps/files/css/files.scss
@@ -84,26 +84,26 @@
 
 /* icons for sidebar */
 .nav-icon-files {
-	background-image: icon-color(folder, 'files', $color-black);
+	@include icon-color(folder, 'files', $color-black);
 }
 .nav-icon-recent {
-	background-image: icon-color(recent, 'files', $color-black);
+	@include icon-color(recent, 'files', $color-black);
 }
 .nav-icon-favorites {
-	background-image: icon-color(star, 'files', $color-black);
+	@include icon-color(star, 'files', $color-black);
 }
 .nav-icon-sharingin,
 .nav-icon-sharingout {
-	background-image: icon-color(share, 'files', $color-black);
+	@include icon-color(share, 'files', $color-black);
 }
 .nav-icon-sharinglinks {
-	background-image: icon-color(public, 'files', $color-black);
+	@include icon-color(public, 'files', $color-black);
 }
 .nav-icon-extstoragemounts {
-	background-image: icon-color(external, 'files', $color-black);
+	@include icon-color(external, 'files', $color-black);
 }
 .nav-icon-trashbin {
-	background-image: icon-color(delete, 'files', $color-black);
+	@include icon-color(delete, 'files', $color-black);
 }
 .nav-icon-deletedshares {
 	background-image: url('../img/unshare.svg?v=1');
@@ -667,7 +667,7 @@ table.dragshadow td.size {
 		background-image: none;
 	}
 	& .icon-starred {
-		background-image: url('../../../core/img/actions/starred.svg?v=1');
+		@include icon-color('star-dark', 'actions', 'FC0', true);
 	}
 }
 
diff --git a/apps/files/lib/Activity/Filter/FileChanges.php b/apps/files/lib/Activity/Filter/FileChanges.php
index 122dc4250f9..c828755a659 100644
--- a/apps/files/lib/Activity/Filter/FileChanges.php
+++ b/apps/files/lib/Activity/Filter/FileChanges.php
@@ -74,7 +74,7 @@ class FileChanges implements IFilter {
 	 * @since 11.0.0
 	 */
 	public function getIcon() {
-		return $this->url->getAbsoluteURL($this->url->imagePath('core', 'places/files-dark.svg'));
+		return $this->url->getAbsoluteURL($this->url->imagePath('core', 'places/files.svg'));
 	}
 
 	/**
diff --git a/apps/files_external/css/settings.scss b/apps/files_external/css/settings.scss
index 7784134bcd9..04ecfc41620 100644
--- a/apps/files_external/css/settings.scss
+++ b/apps/files_external/css/settings.scss
@@ -122,5 +122,5 @@ td.mountPoint, td.backend { width:160px; }
 }
 
 .nav-icon-external-storage {
-	background-image: icon-color('app-dark', 'files_external', $color-black);
+	@include icon-color('app-dark', 'files_external', $color-black);
 }