From 8a875670d95733fcaeac71cd8f96d93403d3466a Mon Sep 17 00:00:00 2001
From: djmaze <djmaze@djmaze.lan>
Date: Tue, 9 Mar 2021 11:14:15 +0100
Subject: [PATCH] Merged some light and dark theme mode style rules

---
 dev/Styles/Attachmnets.less                   | 17 +++++++-------
 dev/Styles/Languages.less                     |  9 ++++----
 dev/Styles/MessageList.less                   | 15 +++++-------
 dev/Styles/SettingsThemes.less                | 10 +++-----
 .../v/0.0.0/themes/SquaresDark/styles.less    | 23 ++-----------------
 5 files changed, 25 insertions(+), 49 deletions(-)

diff --git a/dev/Styles/Attachmnets.less b/dev/Styles/Attachmnets.less
index 9b2262def..247010ba8 100644
--- a/dev/Styles/Attachmnets.less
+++ b/dev/Styles/Attachmnets.less
@@ -10,8 +10,7 @@
 	list-style: none;
 	line-height: 24px;
 	border: 0;
-	background-color: #fff;
-	color: #333;
+	background-color: rgba(128, 128, 128, 0.1);
 
 	box-shadow: 0 1px 4px #ccc;
 	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.2);
@@ -34,8 +33,6 @@
 		top: 0;
 		right: 0;
 		padding: 1px 4px 0 5px;
-		background: #FAFAFA;
-		border: 0 solid #CCC;
 		cursor: pointer;
 	}
 
@@ -57,6 +54,14 @@
 		width: 60px;
 		text-align: center;
 
+		.iconPreview, .iconBG, .iconMain, .iconProgress {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+		}
+
 		.iconProgress {
 			background: #eee;
 			width: 0%;
@@ -64,7 +69,6 @@
 
 		.iconBG {
 			font-size: 18px;
-			color: #999;
 			font-weight: bold;
 			line-height: 55px;
 			text-shadow: 0 1px 0 rgba(255, 255, 255, 0.8);
@@ -72,9 +76,6 @@
 
 		.iconPreview {
 			display: none;
-			background: rgba(0, 0, 0, .5) !important;
-			color: #fff;
-			text-shadow: 0 1px 0 #000;
 		}
 	}
 
diff --git a/dev/Styles/Languages.less b/dev/Styles/Languages.less
index 2ca18a290..ca88ccadf 100644
--- a/dev/Styles/Languages.less
+++ b/dev/Styles/Languages.less
@@ -9,18 +9,19 @@
 		padding: 5px 15px;
 		margin: 2px 5px;
 		width: 180px;
-		background-color: #fff;
+		background-color: rgba(128, 128, 128, 0.1);
 		text-align: left;
 		border: 1px solid transparent;
 		border-radius: 3px;
 		position: relative;
+		cursor: pointer;
 
 		&.user {
-			background-color: #ffd;
+			background-color: rgba(255, 255, 64, .15);
 			border-color: #ff5;
 		}
 		&.selected {
-			background-color: #efe;
+			background-color: rgba(64, 255, 64, 0.2);
 			border-color: #9c9;
 		}
 		&.selected::after {
@@ -31,7 +32,7 @@
 			font-family: snappymail;
 		}
 		&:hover {
-			background-color: #eee;
+			background-color: rgba(128, 128, 128, 0.2);
 			border-color: #ccc;
 		}
 	}
diff --git a/dev/Styles/MessageList.less b/dev/Styles/MessageList.less
index 4f99c602a..adae5b399 100644
--- a/dev/Styles/MessageList.less
+++ b/dev/Styles/MessageList.less
@@ -218,10 +218,8 @@ html.rl-no-preview-pane {
 
 		z-index: 100;
 
-		background-color: #f9f9f9;
-
 		&.focused {
-			background-color: #f5f5f5;
+			background-color: rgba(128, 128, 128, 0.1);
 			border-left-color: #ccc;
 		}
 
@@ -336,8 +334,7 @@ html.rl-no-preview-pane {
 			.threads-len-data {
 
 				border-radius: 6px;
-				padding: 2px 0 1px 6px;
-				margin-right: 2px;
+				padding: 2px 0 1px 4px;
 				border: 1px solid #ccc;
 
 				&:hover {
@@ -376,7 +373,7 @@ html.rl-no-preview-pane {
 		}
 
 		&.hasUnseenSubMessage {
-			background-color: #FFFFD9;
+			background-color: rgba(255, 255, 64, 0.15);
 			border-left-color: lighten(orange, 30%);
 			&.focused {
 				border-left-color: darken(orange, 10%);
@@ -384,7 +381,7 @@ html.rl-no-preview-pane {
 		}
 
 		&.unseen {
-			background-color: #FFFFD9;
+			background-color: rgba(255, 255, 64, 0.15);
 			border-left-color: orange;
 			.sender, .subjectParent {
 				font-weight: bold;
@@ -439,7 +436,7 @@ html.rl-no-preview-pane {
 
 /* desktop-large */
 @media screen and (min-width: 1401px) {
-	.messageList .b-content .messageListItem {
+	.messageList .messageListItem {
 		font-size: 13px;
 		time {
 			font-size: 13px;
@@ -490,7 +487,7 @@ html .messageList .line-loading {
 		}
 
 		.senderParent {
-			flex: 1 0 50%;
+			flex: 1 0 45%;
 		}
 
 		.flagParent {
diff --git a/dev/Styles/SettingsThemes.less b/dev/Styles/SettingsThemes.less
index 6cc1c48a2..8042f6686 100644
--- a/dev/Styles/SettingsThemes.less
+++ b/dev/Styles/SettingsThemes.less
@@ -6,25 +6,21 @@
 		display: inline-block;
 		border: 2px solid transparent;
 		cursor: pointer;
-
-		color: #000;
-		background-color: #fff;
 		padding: 16px;
 		margin: 5px;
 
 		&:hover {
-			border: 2px solid grey;
+			border-color: grey;
 		}
 
 		&.selected {
-			background-color: #eee;
-			border: 2px solid #000;
+			background-color: rgba(64, 255, 64, 0.2);
+			border-color: #000;
 		}
 
 		.e-image {
 			width: 100px;
 			height: 100px;
-			border: 1px solid #ddd;
 		}
 	}
 }
diff --git a/snappymail/v/0.0.0/themes/SquaresDark/styles.less b/snappymail/v/0.0.0/themes/SquaresDark/styles.less
index 3d90dcd1a..fbae0a253 100644
--- a/snappymail/v/0.0.0/themes/SquaresDark/styles.less
+++ b/snappymail/v/0.0.0/themes/SquaresDark/styles.less
@@ -98,8 +98,7 @@
 }
 
 .b-compose .b-header,
-.squire-toolbar,
-.b-themes-list .e-item {
+.squire-toolbar {
 	background-color: #222;
 	color: #fff;
 }
@@ -122,33 +121,15 @@
 }
 
 .messageList .messageListItem {
-	background-color: #111;
 	border-left-color: #111;
     color: #EEE;
 }
 
-.messageList .messageListItem.focused,
-#rl-popups .b-languages-content .lang-item {
-	background-color: #222;
-}
-
 .table-hover tbody tr:hover td,
-.table-hover tbody tr:hover th,
-#rl-popups .b-languages-content .lang-item:hover {
+.table-hover tbody tr:hover th {
 	background-color: #333;
 }
 
-.messageList .messageListItem.hasUnseenSubMessage,
-.messageList .messageListItem.unseen,
-#rl-popups .b-languages-content .lang-item.user {
-    background-color: #220;
-}
-
-.b-themes-list .e-item.selected,
-#rl-popups .b-languages-content .lang-item.selected {
-	background-color: #020;
-}
-
 .table-striped tbody tr:nth-child(2n+1) td,
 .table-striped tbody tr:nth-child(2n+1) th {
 	background-color: #111;