From 44e8b64d82e7f784df31199f624f4b2d33f34b5a Mon Sep 17 00:00:00 2001
From: Garrick Aden-Buie <gadenbuie@mail.usf.edu>
Date: Fri, 27 Dec 2019 09:00:45 -0500
Subject: [PATCH] Update comment and invisible colors of Solarized

https://github.com/gadenbuie/rsthemes/issues/3#issuecomment-569245085

* Make comments italicized
* Fix colors of comments in solarized dark
* Adjust colors of invisible characters
---
 inst/templates/solarized-dark.scss  | 12 ++++++++----
 inst/templates/solarized-light.scss | 10 +++++++---
 inst/themes/solarized-dark.rstheme  | 10 +++++++---
 inst/themes/solarized-light.rstheme |  8 ++++++--
 4 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/inst/templates/solarized-dark.scss b/inst/templates/solarized-dark.scss
index dbfc788..2ec5dab 100644
--- a/inst/templates/solarized-dark.scss
+++ b/inst/templates/solarized-dark.scss
@@ -20,8 +20,8 @@ $ui-line-active-gutter    : $base01;
 $ui-line-active-selection : $base01;
 $ui-line-find             : $base0;
 $ui-bracket               : $base00;
-$ui-invisible             : $base00;
-$ui-indent-guide          : $base01;
+$ui-invisible             : transparentize($base01, 0.66);
+$ui-indent-guide          : transparentize($base01, 0.66);
 $ui-debug-background      : lighten($ui-background, 10%);
 $ui-fold-arrows-background: $violet;
 $ui-fold-arrows-color     : $ui-foreground;
@@ -43,7 +43,7 @@ $ui-rstudio-scrollbar-background: $ui-background;
 $ui-rstudio-scrollbar-handle    : $base02;
 
 // R language colors
-$rlang-comment  : $base0;
+$rlang-comment  : $base01;
 $rlang-string   : $cyan;
 $rlang-function : $blue;
 $rlang-reserved : $green;
@@ -57,4 +57,8 @@ $rlang-namespace-font-style: italic;
 
 $other-tag: $rlang-variable;
 
-@import "rstudio/_rstudio-dark", "rstudio/_terminal";
\ No newline at end of file
+.ace_comment {
+  font-style: italic;
+}
+
+@import "rstudio/_rstudio-dark", "rstudio/_terminal";
diff --git a/inst/templates/solarized-light.scss b/inst/templates/solarized-light.scss
index 29cd793..df433b2 100644
--- a/inst/templates/solarized-light.scss
+++ b/inst/templates/solarized-light.scss
@@ -20,8 +20,8 @@ $ui-line-active-gutter    : $ui-gutter-color;
 $ui-line-active-selection : $base1;
 $ui-line-find             : $base00;
 $ui-bracket               : transparentize($ui-cursor, 0.6);
-$ui-invisible             : $base2;
-$ui-indent-guide          : $base2;
+$ui-invisible             : transparentize($base1, 0.66);
+$ui-indent-guide          : transparentize($base1, 0.66);
 $ui-debug-background      : lighten($ui-background, 10%);
 $ui-fold-arrows-background: $violet;
 $ui-fold-arrows-color     : $ui-foreground;
@@ -57,4 +57,8 @@ $rlang-namespace-font-style: italic;
 
 $other-tag: $rlang-variable;
 
-@import "rstudio/_rstudio-light", "rstudio/_terminal";
\ No newline at end of file
+.ace_comment {
+  font-style: italic;
+}
+
+@import "rstudio/_rstudio-light", "rstudio/_terminal";
diff --git a/inst/themes/solarized-dark.rstheme b/inst/themes/solarized-dark.rstheme
index f5e21f0..e409e0c 100644
--- a/inst/themes/solarized-dark.rstheme
+++ b/inst/themes/solarized-dark.rstheme
@@ -1,6 +1,10 @@
 /* rs-theme-name: Solarized Dark {rsthemes} */
 /* rs-theme-is-dark: TRUE */
 /* https://ethanschoonover.com/solarized */
+.ace_comment {
+  font-style: italic;
+}
+
 .ace_gutter {
   background: #002b36;
   color: #839496;
@@ -98,7 +102,7 @@
 }
 
 .ace_indent-guide {
-  border-right: 1px solid #586e75;
+  border-right: 1px solid rgba(88, 110, 117, 0.34);
   margin-right: -1px;
 }
 
@@ -179,11 +183,11 @@
 }
 
 .ace_comment {
-  color: #839496;
+  color: #586e75;
 }
 
 .ace_invisible {
-  color: #657b83;
+  color: rgba(88, 110, 117, 0.34);
 }
 
 .ace_variable {
diff --git a/inst/themes/solarized-light.rstheme b/inst/themes/solarized-light.rstheme
index b5881bf..d03dce2 100644
--- a/inst/themes/solarized-light.rstheme
+++ b/inst/themes/solarized-light.rstheme
@@ -1,6 +1,10 @@
 /* rs-theme-name: Solarized Light {rsthemes} */
 /* rs-theme-is-dark: FALSE */
 /* https://ethanschoonover.com/solarized */
+.ace_comment {
+  font-style: italic;
+}
+
 .ace_gutter {
   background: #eee8d5;
   color: #93a1a1;
@@ -99,7 +103,7 @@
 }
 
 .ace_indent-guide {
-  border-right: 1px solid #eee8d5;
+  border-right: 1px solid rgba(147, 161, 161, 0.34);
   margin-right: -1px;
 }
 
@@ -184,7 +188,7 @@
 }
 
 .ace_invisible {
-  color: #eee8d5;
+  color: rgba(147, 161, 161, 0.34);
 }
 
 .ace_variable {