From fa984fd03c189bcacb82a9cb97ac0c1b2f25bebb Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Fri, 30 Aug 2019 02:32:59 -0400
Subject: [PATCH] Fixes some styling issues on welcome & settings

---
 src/webviews/apps/scss/main.scss     | 54 ++++++++++++++++++++++++++----------
 src/webviews/apps/welcome/index.html |  2 +-
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/src/webviews/apps/scss/main.scss b/src/webviews/apps/scss/main.scss
index 5aff8c4..ee040e9 100644
--- a/src/webviews/apps/scss/main.scss
+++ b/src/webviews/apps/scss/main.scss
@@ -10,6 +10,10 @@ body {
 	height: 100%;
 	line-height: 1.4;
 	font-size: 100% !important;
+
+	&.vscode-light {
+		background-color: var(--color-background--darken-075);
+	}
 }
 
 // canvas.snow {
@@ -154,14 +158,14 @@ input:not([type]) {
 	padding: 4px;
 	width: 100%;
 
-	.vscode-light & {
-		border: 1px solid rgba(0, 0, 0, 0.3);
-	}
-
 	.vscode-dark & {
 		border: 1px solid rgba(255, 255, 255, 0.3);
 	}
 
+	.vscode-light & {
+		border: 1px solid rgba(0, 0, 0, 0.3);
+	}
+
 	&:focus {
 		outline-color: var(--color-focus-border);
 
@@ -327,16 +331,17 @@ ul {
 	transition: background-color 250ms, border-color 250ms, color 250ms;
 
 	&:hover {
-		.vscode-light & {
-			background-color: var(--color-button-background--darken-30);
-			border-color: var(--color-button-background--darken-30);
-			color: white !important;
-		}
 		.vscode-dark & {
 			background-color: white;
 			border-color: white;
 			color: black !important;
 		}
+
+		.vscode-light & {
+			background-color: var(--color-button-background--darken-30);
+			border-color: var(--color-button-background--darken-30);
+			color: white !important;
+		}
 	}
 
 	.preload & {
@@ -353,6 +358,10 @@ ul {
 	b {
 		color: var(--color-foreground--85);
 	}
+
+	.vscode-light & {
+		color: var(--color-foreground--75);
+	}
 }
 
 .command {
@@ -378,14 +387,14 @@ ul {
 	grid-area: content;
 	font-size: 1.4rem;
 
-	.vscode-light & {
-		background-color: var(--color-background--darken-05);
-	}
-
 	.vscode-dark & {
 		background-color: var(--color-background--lighten-05);
 	}
 
+	.vscode-light & {
+		background-color: var(--color-background);
+	}
+
 	@media all and (max-width: 768px) {
 		grid-column: span 1;
 	}
@@ -485,6 +494,10 @@ ul {
 	top: -1px;
 	z-index: 1;
 	grid-column: span 1;
+
+	.vscode-light & {
+		background: var(--color-background--darken-075);
+	}
 }
 
 .hero__row {
@@ -652,11 +665,15 @@ section {
 	}
 
 	.vscode-light & {
-		background: var(--color-background--darken-075);
+		background: var(--color-background--darken-05);
 	}
 }
 
 .section--collapsible {
+	.vscode-light & {
+		background: var(--color-background);
+	}
+
 	.section__header {
 		cursor: pointer;
 		flex: 1 0 100%;
@@ -818,10 +835,17 @@ section {
 }
 
 .section__title--break {
-	border-top: 1px solid var(--color-background--lighten-30);
 	margin: 0.3em 15% 0 15%;
 	padding-top: 1em;
 	justify-content: center;
+
+	.vscode-dark & {
+		border-top: 1px solid var(--color-background--lighten-30);
+	}
+
+	.vscode-light & {
+		border-top: 1px solid var(--color-background--darken-30);
+	}
 }
 
 .setting {
diff --git a/src/webviews/apps/welcome/index.html b/src/webviews/apps/welcome/index.html
index 5320efb..af593a3 100644
--- a/src/webviews/apps/welcome/index.html
+++ b/src/webviews/apps/welcome/index.html
@@ -86,7 +86,7 @@
 					<h2 class="section__title section__title--break">
 						Quick Setup
 					</h2>
-					<p class="section__hint center">
+					<p class="section__hint mt-0 center">
 						<i class="icon icon__info"></i> For more options, use the interactive
 						<a class="command" title="Open GitLens Settings" href="command:gitlens.showSettingsPage"
 							>GitLens Settings</a