Merge pull request #3251 from nextcloud/bugfix/3227/use-primary-element-color

skjnldsv · web-flow · commit edd1e1843a7a · 2020-04-03T12:36:02.000+02:00
Use the primary element color in case it primary color is too bright
diff --git a/src/components/LeftSidebar/ConversationsList/AppContentListItem/AppContentListItem.vue b/src/components/LeftSidebar/ConversationsList/AppContentListItem/AppContentListItem.vue
@@ -167,7 +167,7 @@ export default {
 	&.active,
 	&:active,
 	&:active ~ .app-navigation-entry__utils {
-		background-color: var(--color-primary-light);
+		background-color: var(--color-primary-element-light);
 	}
 
 	&__content {
diff --git a/src/components/LeftSidebar/ConversationsList/Conversation.vue b/src/components/LeftSidebar/ConversationsList/Conversation.vue
@@ -386,6 +386,6 @@ export default {
 }
 
 .forced-active {
-	box-shadow: inset 4px 0 var(--color-primary);
+	box-shadow: inset 4px 0 var(--color-primary-element);
 }
 </style>
diff --git a/src/views/RoomSelector.vue b/src/views/RoomSelector.vue
@@ -75,7 +75,7 @@
 		background-color: var(--color-background-dark);
 	}
 	li.selected {
-		box-shadow: inset 4px 0 var(--color-primary);
+		box-shadow: inset 4px 0 var(--color-primary-element);
 	}
 	.avatar.icon {
 		border-radius: 50%;

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ export default {`
`167`	`167`	`&.active,`
`168`	`168`	`&:active,`
`169`	`169`	`&:active ~ .app-navigation-entry__utils {`
`170`		`- background-color: var(--color-primary-light);`
	`170`	`+ background-color: var(--color-primary-element-light);`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`&__content {`
Original file line number	Diff line number	Diff line change
`@@ -386,6 +386,6 @@ export default {`
`386`	`386`	`}`
`387`	`387`
`388`	`388`	`.forced-active {`
`389`		`- box-shadow: inset 4px 0 var(--color-primary);`
	`389`	`+ box-shadow: inset 4px 0 var(--color-primary-element);`
`390`	`390`	`}`
`391`	`391`	`</style>`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@`
`75`	`75`	`background-color: var(--color-background-dark);`
`76`	`76`	`}`
`77`	`77`	`li.selected {`
`78`		`- box-shadow: inset 4px 0 var(--color-primary);`
	`78`	`+ box-shadow: inset 4px 0 var(--color-primary-element);`
`79`	`79`	`}`
`80`	`80`	`.avatar.icon {`
`81`	`81`	`border-radius: 50%;`