From 60d5aabd146cf9679d13b40fa9e340dc8392a92c Mon Sep 17 00:00:00 2001
From: Jamie Peabody <jpeabody@axway.com>
Date: Thu, 30 Dec 2021 20:47:05 +0000
Subject: [PATCH] chore: tidy styles

---
 src/mergely.css | 158 +++++++++++++++++++++++-------------------------
 1 file changed, 74 insertions(+), 84 deletions(-)

diff --git a/src/mergely.css b/src/mergely.css
index 1842c4b..13ad19f 100644
--- a/src/mergely.css
+++ b/src/mergely.css
@@ -1,4 +1,3 @@
-/* FIXME: needed? */
 .mergely-editor .CodeMirror {
 	line-height: 18px;
 }
@@ -25,11 +24,13 @@
 }
 
 /* resizeable */
+/* FIXME: needed? */
 .mergely-resizer {
 	width: 100%;
 	height: 100%;
 }
 
+/* FIXME: needed? */
 .mergely-full-screen-0 {
 	position: absolute;
 	top: 0;
@@ -39,6 +40,7 @@
 	overflow: hidden;
 }
 
+/* FIXME: needed? */
 .mergely-full-screen-8 {
 	position: absolute;
 	top: 8px;
@@ -48,122 +50,62 @@
 	overflow: hidden;
 }
 
-/* style configuration */
-.mergely-editor .mergely-column {
-	border: 1px solid #ccc;
-}
-
-.mergely-editor .mergely-active {
-	border: 1px solid #a3d1ff;
-}
-
-.mergely-editor .mergely.a,
-.mergely-editor .mergely.d,
-.mergely-editor .mergely.c {
-	color: #000;
-}
-
 .mergely-editor .mergely.a.rhs.start {
-	border-top: 1px solid #a3d1ff;
+	border-top-width: 1px;
+	border-top-style: solid;
 }
 
 .mergely-editor .mergely.a.lhs.start.end,
 .mergely-editor .mergely.a.rhs.end {
-	border-bottom: 1px solid #a3d1ff;
-}
-
-.mergely-editor .mergely.a.rhs {
-	background-color: #ddeeff;
-}
-
-.mergely-editor .mergely.a.lhs.start.end.first {
-	border-bottom-width: 0;
-	border-top: 1px solid #a3d1ff;
-}
-
-.mergely-editor .mergely.d.lhs {
-	background-color: #ffe9e9;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	border-top-width: 0px;
 }
 
 .mergely-editor .mergely.d.lhs.end,
 .mergely-editor .mergely.d.rhs.start.end {
-	border-bottom: 1px solid #ff7f7f;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	border-top-width: 0;
 }
 
 .mergely-editor .mergely.d.rhs.start.end.first {
 	border-bottom-width: 0;
-	border-top: 1px solid #ff7f7f;
+	border-top-width: 1px;
+	border-top-style: solid;
 }
 
 .mergely-editor .mergely.d.lhs.start {
-	border-top: 1px solid #ff7f7f;
-}
-
-.mergely-editor .mergely.c.lhs,
-.mergely-editor .mergely.c.rhs {
-	background-color: #fafafa;
+	border-top-width: 1px;
+	border-top-style: solid;
 }
 
 .mergely-editor .mergely.c.lhs.start,
 .mergely-editor .mergely.c.rhs.start {
-	border-top: 1px solid #a3a3a3;
+	border-top-width: 1px;
+	border-top-style: solid;
 }
 
 .mergely-editor .mergely.c.lhs.end,
 .mergely-editor .mergely.c.rhs.end {
-	border-bottom: 1px solid #a3a3a3;
-}
-
-.mergely-editor .mergely.ch.a.rhs {
-	background-color: #ddeeff;
-}
-
-.mergely-editor .mergely.ch.d.lhs {
-	background-color: #ffe9e9;
-	text-decoration: line-through;
-	color: red !important;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
 }
 
 .mergely-editor .mergely.current.start {
-	border-top: 1px solid #000 !important;
+	border-top-width: 1px;
+	border-top-style: solid;
 }
 
 .mergely-editor .mergely.current.end {
-	border-bottom: 1px solid #000 !important;
-}
-
-.mergely-editor .mergely.current.lhs.a.start.end,
-.mergely-editor .mergely.current.rhs.d.start.end {
-	border-top-width: 0 !important;
-}
-
-.mergely-editor .mergely.current.lhs.a.start.end.empty,
-.mergely-editor .mergely.current.rhs.d.start.end.empty {
-	border-top-width: 1px !important;
-	border-bottom-width: 0px !important;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
 }
 
 .mergely-editor .CodeMirror-linenumber {
 	cursor: pointer;
 }
 
-.mergely-editor .CodeMirror-code {
-	color: #717171;
-}
-
-.mergely-editor .mergely.current.CodeMirror-gutter-background {
-	background-color: #777;
-}
-
-.mergely-editor .mergely.current .CodeMirror-linenumber {
-	color: #F9F9F9;
-	font-weight: bold;
-}
-
-.mergely-editor span.CodeMirror-selectedtext {
-	/* background: none !important; */
-}
-
 .mergely-splash {
 	position: absolute;
 	z-index: 100;
@@ -186,6 +128,7 @@
 	width: 36px;
 	height: 36px;
 }
+
 .mergely-splash span.mergely-icon {
 	float: left;
 	padding-right: 10px;
@@ -194,14 +137,61 @@
 .mergely-editor .merge-button {
 	opacity: 0.6;
 	height: 18px;
-	background-color: #bfbfbf;
 	cursor: pointer;
-	color: #eee;
 	width: 27px;
 	padding-left: 3px;
 }
 
 .mergely-editor .merge-button:hover {
-	color: #fff;
 	opacity: 1;
 }
+
+/* ---------------------------------------------------------------------- */
+.mergely-editor .CodeMirror-code {
+	color: #717171;
+}
+.mergely-editor .mergely.current.CodeMirror-gutter-background {
+	background-color: #777;
+}
+.mergely-editor .mergely.current .CodeMirror-linenumber {
+	color: #F9F9F9;
+	font-weight: bold;
+}
+.mergely-editor .merge-button {
+	background-color: #bfbfbf;
+	color: #eee;
+}
+.mergely-editor .merge-button:hover {
+	color: #fff;
+}
+.mergely-editor .mergely-column {
+	border: 1px solid #ccc;
+}
+.mergely-editor .mergely.a {
+	border-color: #a3d1ff;
+}
+.mergely-editor .mergely.a.rhs {
+	background-color: #ddeeff;
+}
+.mergely-editor .mergely.d {
+	border-color: #ff7f7f;
+}
+.mergely-editor .mergely.d.lhs {
+	background-color: #ffe9e9;
+}
+.mergely-editor .mergely.c {
+	border-color: #a3a3a3;
+}
+.mergely-editor .mergely.c.lhs,
+.mergely-editor .mergely.c.rhs {
+	background-color: #fafafa;
+}
+.mergely-editor .mergely.ch.d.lhs {
+	text-decoration: line-through;
+	color: #ff0000;
+	background-color: transparent;
+}
+.mergely-editor .mergely.current {
+	border-color: #000;
+}
+/* ---------------------------------------------------------------------- */