Merge pull request #232 from pryley/fix/rainbow-folders

Fix/rainbow folders
AnubisNekhet · Oct 29, 2023 · dc54144 · dc54144
2 parents 88dc95e + aa85ba3
commit dc54144
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 27 deletions.
diff --git a/src/modules/Core/style-settings.scss b/src/modules/Core/style-settings.scss
@@ -2222,17 +2222,13 @@ settings:
     title: Enable title recolor
     type: class-toggle
   -
-    id: anp-simple-rainbow-icon-folder-toggle
-    title: Enable icon recolor (For icon folder users)
+    id: anp-simple-rainbow-collapse-icon-toggle
+    title: Enable collapse icon recolor
     type: class-toggle
   -
     id: anp-simple-rainbow-indentation-toggle
     title: Enable collapse indent recolor
     type: class-toggle
-  -
-    id: anp-simple-rainbow-collapse-toggle
-    title: Enable collapse indicator
-    type: class-toggle
   -
     id: anp-simple-rainbow-icon-toggle
     title: Enable circular file

diff --git a/src/modules/Features/Rainbow-File-Browser/fullrainbow.scss b/src/modules/Features/Rainbow-File-Browser/fullrainbow.scss
@@ -5,6 +5,7 @@
 	// Apply styling to folders
 	.nav-folder.mod-root > .nav-folder-children > .nav-folder .nav-folder-title,
 	.nav-folder.mod-root > .nav-folder-children > .nav-folder .nav-file-title,
+	.nav-folder.mod-root .collapse-icon svg.svg-icon,
 	.tree-item-self .tree-item-icon {
 		color: var(--anp-full-rainbow-text-inverted, var(--background-primary));
 	}

diff --git a/src/modules/Features/Rainbow-File-Browser/simplerainbow.scss b/src/modules/Features/Rainbow-File-Browser/simplerainbow.scss
@@ -5,11 +5,7 @@
 	// Apply styling to titles
 	&.anp-simple-rainbow-title-toggle {
 		.nav-folder.mod-root > .nav-folder-children > .nav-folder .nav-folder-title,
-		[data-type="bookmarks"]
-			> .view-content
-			> div
-			> .tree-item
-			.tree-item-inner {
+		[data-type="bookmarks"] .tree-item .tree-item-inner {
 			transition: color 0.4s;
 			color: rgba(
 				var(--rainbow-folder-color),
@@ -21,41 +17,37 @@
 	}
 	// Circle icon indicator
 	&.anp-simple-rainbow-icon-toggle {
-		.nav-folder.mod-root
-			> .nav-folder-children
-			> .nav-folder
-			.nav-folder-title:after,
-		[data-type="bookmarks"]
-			> .view-content
-			> div
-			> .tree-item
-			.tree-item-inner:after {
+		.nav-folder.mod-root > .nav-folder-children > .nav-folder .nav-folder-title:after,
+		[data-type="bookmarks"] .tree-item .tree-item-inner:after {
 			transition: color 0.4s;
 			color: rgba(
 				var(--rainbow-folder-color),
 				var(--anp-simple-rainbow-opacity, 1)
 			);
 			content: "⬤";
+			font-size: 10px;
 			position: relative;
 			margin-left: 4px;
-			top: 1px;
 			opacity: 0.5;
+			top: -0.5px
+		}
+		[data-type="bookmarks"] .tree-item .tree-item-inner {
+		    align-items: center;
+		    display: flex;
+		    flex-grow: 1;
+		    justify-content: space-between;
 		}
 	}
 	// Color indents
 	&.anp-simple-rainbow-indentation-toggle {
 		.nav-folder.mod-root .nav-folder > .nav-folder-children,
-		[data-type="bookmarks"]
-			> .view-content
-			> div
-			> .tree-item
-			.tree-item-children {
+		[data-type="bookmarks"] .tree-item .tree-item-children {
 			transition: color 0.4s;
 			border-color: rgba(var(--rainbow-folder-color), 0.5);
 		}
 	}
 	// Color Collapse Indicators
-	&.anp-simple-rainbow-collapse-toggle {
+	&.anp-simple-rainbow-collapse-icon-toggle {
 		.tree-item-self .tree-item-icon {
 			--icon-color: rgba(
 				var(--rainbow-folder-color),