Fixes to theme templates.

2 files changed, 37 insertions, 6 deletions

diff --git a/templates/@theme-base/_dark_mode.scss b/templates/@theme-base/_dark_mode.scss
index 700f569..869adb5 100644
--- a/templates/@theme-base/_dark_mode.scss
+++ b/templates/@theme-base/_dark_mode.scss
@@ -65,6 +65,10 @@ body {
     background: $base;
   }
 
+  .composer-body-container textarea {
+    background: $base;
+  }
+
   // Email tags present in new message window
   .autocompleteEmails-item {
     background-color: darken($base, 2%);
@@ -88,7 +92,7 @@ body {
   .is-disabled.pm-button--error, .is-disabled.pm-button--error.pm-button--info, .is-disabled.pm-button--error.pm-button--redborder, .is-disabled.pm-button--primary, .is-disabled.pm-button--primary.pm-button--info, .is-disabled.pm-button--primary.pm-button--redborder, .is-disabled.pm-button--warning, .is-disabled.pm-button--warning.pm-button--info, .is-disabled.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info[disabled], .pm-button--error.pm-button--redborder[disabled], .pm-button--error[disabled], .pm-button--primary.pm-button--info[disabled], .pm-button--primary.pm-button--redborder[disabled], .pm-button--primary[disabled], .pm-button--warning.pm-button--info[disabled], .pm-button--warning.pm-button--redborder[disabled], .pm-button--warning[disabled], .pm-button-blue.is-disabled, .pm-button-blue.is-disabled.pm-button--info, .pm-button-blue.is-disabled.pm-button--redborder, .pm-button-blue.pm-button--info[disabled], .pm-button-blue.pm-button--redborder[disabled], .pm-button-blue[disabled], .pm-button.is-disabled.pm-button--error, .pm-button.is-disabled.pm-button--primary, .pm-button.is-disabled.pm-button--warning, .pm-button.pm-button--error[disabled], .pm-button.pm-button--primary[disabled], .pm-button.pm-button--warning[disabled], .pm-button.pm-button-blue.is-disabled, .pm-button.pm-button-blue[disabled] {
     background-color: darken($base, 2%);
     border-color: lighten($base, 10%);
-    color: darken($base, 10%);
+    color: darken($text_color, 10%);
   }
 
   .pm-button:not(.pm-button-blue):not(.pv-button-green):not(.pm-button--primary):not(.pm-button--primaryborderEvenInDarkMode):not(.pm-button--link):not(.pm-button--error):not(.pm-button--warning):not(.pm-button--redborder):not(.pm-button--primaryborder), .pm-button--info {
@@ -97,6 +101,10 @@ body {
     border-color: lighten($base, 10%);
   }
 
+  .pm-group-buttons > .pm-group-button.pm-button--primary {
+    border-color: lighten($base, 10%);
+  }
+
   .pm-button-blueborder {
     border-color: $highlight;
     color: $highlight;
@@ -224,6 +232,10 @@ body {
   }
 
   // Current message panel
+  .composer-container {
+    background: lighten($base, 5%);
+  }
+
   .message-header {
     background-color: lighten($base, 5%);
   }
@@ -301,11 +313,15 @@ body {
   .pm-button--info:focus, .pm-button--info:focus-within,
   .pm-button--info:hover, .pm-button--redborder:focus,
   .pm-button--redborder:focus-within, .pm-button--redborder:hover,
-  .pm-button.is-hover, .pm-button:focus, 
-  .pm-button:focus-within, .pm-button:hover:not(.pm-button--primary) {
+  .pm-button.is-hover, .pm-button:focus-within, 
+  .pm-button:hover:not(.pm-button--primary) {
     color: $highlight;
   }
 
+  .pm-button:focus {
+    color: $text_color;
+  }
+
   .is-disabled.pm-button--info,
   .is-disabled.pm-button--redborder,
   .pm-button--info[disabled],
@@ -451,6 +467,10 @@ body {
     background-color: darken($base, 1%);
   }
 
+  .scrollshadow-static {
+    background: $base;
+  }
+
   // Input fields
   .pm-field, .pm-field-icon-container,
   .focus.pm-field-icon-container, .pm-field-icon-container:focus,
@@ -550,7 +570,6 @@ body {
   // Forms
   .pm-checkbox-fakecheck,
   .pm-radio-fakeradio {
-    border-color: $highlight;
     background: transparent;
   }
 
diff --git a/templates/@theme-base/_styles.scss b/templates/@theme-base/_styles.scss
index aa0ab4b..cac79a4 100644
--- a/templates/@theme-base/_styles.scss
+++ b/templates/@theme-base/_styles.scss
@@ -20,7 +20,7 @@ $boxshadow-main: none;
 // Theme template styles ->
 
 // Loading state
-body {
+html:not(.editor-squire-iframe) body {
   background: $base;
   color: $text_color;
 }
@@ -329,6 +329,10 @@ a:active, a:focus, a:hover,
   background: transparent;
 }
 
+.pm-group-buttons > .pm-group-button.pm-button--primary {
+  border-color: darken($highlight, 10%);
+}
+
 .bg-pm-blue-gradient {
   .pm-button--transparent:hover {
     color: $text_color;
@@ -344,6 +348,14 @@ a:active, a:focus, a:hover,
 
 // Message panel
 
+.composer-title-bar {
+  background: $base;
+}
+
+.color-global-light {
+  color: $text_color;
+}
+
 .angular-squire-iframe body {
   a {
     color: $highlight;
@@ -383,7 +395,7 @@ a:active, a:focus, a:hover,
   border-color: $base;
 
   [class*="icon-"] {
-    fill: $base;
+    fill: $highlight;
   }
 }