Browse Source

Merge branch 'polishing' of github.com:Musare/MusareNode into polishing

Jonathan 4 years ago
parent
commit
052cf211b5

+ 6 - 2
frontend/src/components/ui/PlaylistItem.vue

@@ -50,8 +50,12 @@ export default {
 @import "../../styles/global.scss";
 
 .night-mode {
-	.playlist p {
-		color: $night-mode-text !important;
+	.playlist {
+		background-color: $dark-grey-2 !important;
+		border: 0 !important;
+		p {
+			color: $night-mode-text !important;
+		}
 	}
 }
 

+ 5 - 0
frontend/src/pages/Station/components/AddToPlaylistDropdown.vue

@@ -153,6 +153,7 @@ export default {
 .night-mode {
 	.nav-dropdown-items {
 		background-color: $dark-grey-2;
+		border: 0 !important;
 
 		.nav-item {
 			background-color: $dark-grey;
@@ -164,6 +165,10 @@ export default {
 			p {
 				color: #fff;
 			}
+
+			.checkbox-control label span {
+				background-color: $dark-grey-2;
+			}
 		}
 	}
 }

+ 7 - 0
frontend/src/pages/Station/components/Sidebar/Queue/QueueItem.vue

@@ -135,6 +135,13 @@ export default {
 <style lang="scss" scoped>
 @import "../../../../../styles/global.scss";
 
+.night-mode {
+	.queue-item {
+		background-color: $dark-grey-2 !important;
+		border: 0 !important;
+	}
+}
+
 .queue-item {
 	display: flex;
 	flex-direction: row;

+ 2 - 0
frontend/src/pages/Station/components/Sidebar/Users.vue

@@ -61,6 +61,8 @@ export default {
 
 	a {
 		color: $night-mode-text;
+		background-color: $dark-grey-2 !important;
+		border: 0 !important;
 	}
 }
 

+ 9 - 2
frontend/src/pages/Station/components/Sidebar/index.vue

@@ -88,6 +88,13 @@ export default {
 <style lang="scss" scoped>
 @import "../../../../styles/global.scss";
 
+.night-mode {
+	#tab-selection .button {
+		background: $dark-grey;
+		color: #fff;
+	}
+}
+
 #tabs-container .tab {
 	width: 100%;
 	height: calc(100% - 36px);
@@ -114,8 +121,8 @@ export default {
 	}
 
 	.selected {
-		background-color: $night-mode-bg-secondary;
-		color: #fff;
+		background-color: $night-mode-bg-secondary !important;
+		color: #fff !important;
 	}
 }
 

+ 4 - 4
frontend/src/pages/Station/index.vue

@@ -1630,7 +1630,9 @@ export default {
 	}
 
 	#video-container,
-	#control-bar-container {
+	#control-bar-container,
+	.quadrant:not(#sidebar-container),
+	.player-container {
 		border: 0 !important;
 	}
 
@@ -1639,7 +1641,7 @@ export default {
 	}
 
 	#dropdown-toggle {
-		background-color: $dark-grey !important;
+		background-color: $dark-grey-2 !important;
 		border: 0;
 
 		i {
@@ -1756,8 +1758,6 @@ export default {
 			flex-grow: 1;
 
 			&.nothing-here-text {
-				border: 1px solid $light-grey-2;
-				border-radius: 5px;
 				margin: 10px;
 			}