refactor error and warning entries

7 files changed, 251 insertions, 136 deletions

diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css
index 97a18fa..133a9be 100644
--- a/common/gtk-3.0/3.16/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-dark.css
@@ -196,32 +196,30 @@ GtkTextView {
     border-left-style: none; }
     .linked > .entry:last-child:dir(rtl) {
       border-left-style: solid; }
-  .entry.error {
-    color: white;
-    border-color: #FC4138;
-    background-image: linear-gradient(to bottom, #d6423d); }
-    .entry.error:focus {
-      background-image: linear-gradient(to bottom, #FC4138);
-      color: white; }
-    .entry.error:selected, .entry.error:selected:focus {
-      background-color: white;
-      color: #FC4138; }
   .entry.warning {
-    color: white;
-    border-color: #F27835;
-    background-image: linear-gradient(to bottom, #ce6e3b); }
+    color: #ffffff;
+    border-color: #2b2e39;
+    background-image: linear-gradient(to bottom, #ab6441); }
     .entry.warning:focus {
+      color: #ffffff;
       background-image: linear-gradient(to bottom, #F27835);
-      color: white; }
+      box-shadow: none; }
     .entry.warning:selected, .entry.warning:selected:focus {
-      background-color: white;
+      background-color: #ffffff;
       color: #F27835; }
+  .entry.error {
+    color: #ffffff;
+    border-color: #2b2e39;
+    background-image: linear-gradient(to bottom, #b14342); }
+    .entry.error:focus {
+      color: #ffffff;
+      background-image: linear-gradient(to bottom, #FC4138);
+      box-shadow: none; }
+    .entry.error:selected, .entry.error:selected:focus {
+      background-color: #ffffff;
+      color: #FC4138; }
   .entry.image {
     color: #b6bcc6; }
-    .entry.image:hover {
-      color: #D3DAE3; }
-    .entry.image:active {
-      color: #5294E2; }
   .linked.vertical > .entry {
     border-bottom-color: #3a3e4a;
     box-shadow: none; }
@@ -1057,6 +1055,26 @@ GtkComboBox {
     border-color: #5294E2;
     background-image: none;
     background-color: transparent; }
+  .primary-toolbar .entry.warning, .header-bar .entry.warning {
+    color: #ffffff;
+    border-color: rgba(21, 23, 28, 0.37);
+    background-image: linear-gradient(to bottom, rgba(167, 94, 57, 0.988)); }
+    .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus {
+      color: #ffffff;
+      background-image: linear-gradient(to bottom, #F27835); }
+    .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus {
+      background-color: #ffffff;
+      color: #F27835; }
+  .primary-toolbar .entry.error, .header-bar .entry.error {
+    color: #ffffff;
+    border-color: rgba(21, 23, 28, 0.37);
+    background-image: linear-gradient(to bottom, rgba(173, 60, 59, 0.988)); }
+    .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus {
+      color: #ffffff;
+      background-image: linear-gradient(to bottom, #FC4138); }
+    .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus {
+      background-color: #ffffff;
+      color: #FC4138; }
 
 .primary-toolbar .button, .header-bar .button {
   color: rgba(207, 218, 231, 0.8);
diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css
index 306b6ba..b3f5b83 100644
--- a/common/gtk-3.0/3.16/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-darker.css
@@ -195,32 +195,30 @@ GtkTextView {
     border-left-style: none; }
     .linked > .entry:last-child:dir(rtl) {
       border-left-style: solid; }
-  .entry.error {
-    color: white;
-    border-color: #FC4138;
-    background-image: linear-gradient(to bottom, #fd6760); }
-    .entry.error:focus {
-      background-image: linear-gradient(to bottom, #FC4138);
-      color: white; }
-    .entry.error:selected, .entry.error:selected:focus {
-      background-color: white;
-      color: #FC4138; }
   .entry.warning {
-    color: white;
+    color: #ffffff;
     border-color: #F27835;
-    background-image: linear-gradient(to bottom, #f5935d); }
+    background-image: linear-gradient(to bottom, #f7ae86); }
     .entry.warning:focus {
+      color: #ffffff;
       background-image: linear-gradient(to bottom, #F27835);
-      color: white; }
+      box-shadow: none; }
     .entry.warning:selected, .entry.warning:selected:focus {
-      background-color: white;
+      background-color: #ffffff;
       color: #F27835; }
+  .entry.error {
+    color: #ffffff;
+    border-color: #FC4138;
+    background-image: linear-gradient(to bottom, #fd8d88); }
+    .entry.error:focus {
+      color: #ffffff;
+      background-image: linear-gradient(to bottom, #FC4138);
+      box-shadow: none; }
+    .entry.error:selected, .entry.error:selected:focus {
+      background-color: #ffffff;
+      color: #FC4138; }
   .entry.image {
     color: #7d8189; }
-    .entry.image:hover {
-      color: #5c616c; }
-    .entry.image:active {
-      color: #5294E2; }
   .linked.vertical > .entry {
     border-bottom-color: #f4f5f6;
     box-shadow: none; }
@@ -1060,6 +1058,26 @@ GtkComboBox {
     border-color: #5294E2;
     background-image: none;
     background-color: transparent; }
+  .primary-toolbar .entry.warning, .header-bar .entry.warning {
+    color: #ffffff;
+    border-color: rgba(21, 23, 28, 0.37);
+    background-image: linear-gradient(to bottom, rgba(167, 94, 57, 0.988)); }
+    .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus {
+      color: #ffffff;
+      background-image: linear-gradient(to bottom, #F27835); }
+    .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus {
+      background-color: #ffffff;
+      color: #F27835; }
+  .primary-toolbar .entry.error, .header-bar .entry.error {
+    color: #ffffff;
+    border-color: rgba(21, 23, 28, 0.37);
+    background-image: linear-gradient(to bottom, rgba(173, 60, 59, 0.988)); }
+    .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus {
+      color: #ffffff;
+      background-image: linear-gradient(to bottom, #FC4138); }
+    .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus {
+      background-color: #ffffff;
+      color: #FC4138; }
 
 .primary-toolbar .button, .header-bar .button {
   color: rgba(207, 218, 231, 0.8);
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
index 1284db6..d0c7802 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
@@ -196,32 +196,30 @@ GtkTextView {
     border-left-style: none; }
     .linked > .entry:last-child:dir(rtl) {
       border-left-style: solid; }
-  .entry.error {
-    color: white;
-    border-color: #FC4138;
-    background-image: linear-gradient(to bottom, #d6423d); }
-    .entry.error:focus {
-      background-image: linear-gradient(to bottom, #FC4138);
-      color: white; }
-    .entry.error:selected, .entry.error:selected:focus {
-      background-color: white;
-      color: #FC4138; }
   .entry.warning {
-    color: white;
-    border-color: #F27835;
-    background-image: linear-gradient(to bottom, #ce6e3b); }
+    color: #ffffff;
+    border-color: #2b2e39;
+    background-image: linear-gradient(to bottom, #ab6441); }
     .entry.warning:focus {
+      color: #ffffff;
       background-image: linear-gradient(to bottom, #F27835);
-      color: white; }
+      box-shadow: none; }
     .entry.warning:selected, .entry.warning:selected:focus {
-      background-color: white;
+      background-color: #ffffff;
       color: #F27835; }
+  .entry.error {
+    color: #ffffff;
+    border-color: #2b2e39;
+    background-image: linear-gradient(to bottom, #b14342); }
+    .entry.error:focus {
+      color: #ffffff;
+      background-image: linear-gradient(to bottom, #FC4138);
+      box-shadow: none; }
+    .entry.error:selected, .entry.error:selected:focus {
+      background-color: #ffffff;
+      color: #FC4138; }
   .entry.image {
     color: #b6bcc6; }
-    .entry.image:hover {
-      color: #D3DAE3; }
-    .entry.image:active {
-      color: #5294E2; }
   .linked.vertical > .entry {
     border-bottom-color: #3a3e4a;
     box-shadow: none; }
@@ -1057,6 +1055,26 @@ GtkComboBox {
     border-color: #5294E2;
     background-image: none;
     background-color: transparent; }
+  .primary-toolbar .entry.warning, .header-bar .entry.warning {
+    color: #ffffff;
+    border-color: rgba(21, 23, 28, 0.4);
+    background-image: linear-gradient(to bottom, #a45d39); }
+    .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus {
+      color: #ffffff;
+      background-image: linear-gradient(to bottom, #F27835); }
+    .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus {
+      background-color: #ffffff;
+      color: #F27835; }
+  .primary-toolbar .entry.error, .header-bar .entry.error {
+    color: #ffffff;
+    border-color: rgba(21, 23, 28, 0.4);
+    background-image: linear-gradient(to bottom, #aa3c3b); }
+    .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus {
+      color: #ffffff;
+      background-image: linear-gradient(to bottom, #FC4138); }
+    .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus {
+      background-color: #ffffff;
+      color: #FC4138; }
 
 .primary-toolbar .button, .header-bar .button {
   color: rgba(207, 218, 231, 0.8);
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
index 5fc94d4..e12335c 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
@@ -195,32 +195,30 @@ GtkTextView {
     border-left-style: none; }
     .linked > .entry:last-child:dir(rtl) {
       border-left-style: solid; }
-  .entry.error {
-    color: white;
-    border-color: #FC4138;
-    background-image: linear-gradient(to bottom, #fd6760); }
-    .entry.error:focus {
-      background-image: linear-gradient(to bottom, #FC4138);
-      color: white; }
-    .entry.error:selected, .entry.error:selected:focus {
-      background-color: white;
-      color: #FC4138; }
   .entry.warning {
-    color: white;
+    color: #ffffff;
     border-color: #F27835;
-    background-image: linear-gradient(to bottom, #f5935d); }
+    background-image: linear-gradient(to bottom, #f7ae86); }
     .entry.warning:focus {
+      color: #ffffff;
       background-image: linear-gradient(to bottom, #F27835);
-      color: white; }
+      box-shadow: none; }
     .entry.warning:selected, .entry.warning:selected:focus {
-      background-color: white;
+      background-color: #ffffff;
       color: #F27835; }
+  .entry.error {
+    color: #ffffff;
+    border-color: #FC4138;
+    background-image: linear-gradient(to bottom, #fd8d88); }
+    .entry.error:focus {
+      color: #ffffff;
+      background-image: linear-gradient(to bottom, #FC4138);
+      box-shadow: none; }
+    .entry.error:selected, .entry.error:selected:focus {
+      background-color: #ffffff;
+      color: #FC4138; }
   .entry.image {
     color: #7d8189; }
-    .entry.image:hover {
-      color: #5c616c; }
-    .entry.image:active {
-      color: #5294E2; }
   .linked.vertical > .entry {
     border-bottom-color: #f4f5f6;
     box-shadow: none; }
@@ -1060,6 +1058,26 @@ GtkComboBox {
     border-color: #5294E2;
     background-image: none;
     background-color: transparent; }
+  .primary-toolbar .entry.warning, .header-bar .entry.warning {
+    color: #ffffff;
+    border-color: rgba(21, 23, 28, 0.4);
+    background-image: linear-gradient(to bottom, #a45d39); }
+    .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus {
+      color: #ffffff;
+      background-image: linear-gradient(to bottom, #F27835); }
+    .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus {
+      background-color: #ffffff;
+      color: #F27835; }
+  .primary-toolbar .entry.error, .header-bar .entry.error {
+    color: #ffffff;
+    border-color: rgba(21, 23, 28, 0.4);
+    background-image: linear-gradient(to bottom, #aa3c3b); }
+    .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus {
+      color: #ffffff;
+      background-image: linear-gradient(to bottom, #FC4138); }
+    .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus {
+      background-color: #ffffff;
+      color: #FC4138; }
 
 .primary-toolbar .button, .header-bar .button {
   color: rgba(207, 218, 231, 0.8);
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css
index 1b44d4b..0f0a74e 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid.css
@@ -195,32 +195,30 @@ GtkTextView {
     border-left-style: none; }
     .linked > .entry:last-child:dir(rtl) {
       border-left-style: solid; }
-  .entry.error {
-    color: white;
-    border-color: #FC4138;
-    background-image: linear-gradient(to bottom, #fd6760); }
-    .entry.error:focus {
-      background-image: linear-gradient(to bottom, #FC4138);
-      color: white; }
-    .entry.error:selected, .entry.error:selected:focus {
-      background-color: white;
-      color: #FC4138; }
   .entry.warning {
-    color: white;
+    color: #ffffff;
     border-color: #F27835;
-    background-image: linear-gradient(to bottom, #f5935d); }
+    background-image: linear-gradient(to bottom, #f7ae86); }
     .entry.warning:focus {
+      color: #ffffff;
       background-image: linear-gradient(to bottom, #F27835);
-      color: white; }
+      box-shadow: none; }
     .entry.warning:selected, .entry.warning:selected:focus {
-      background-color: white;
+      background-color: #ffffff;
       color: #F27835; }
+  .entry.error {
+    color: #ffffff;
+    border-color: #FC4138;
+    background-image: linear-gradient(to bottom, #fd8d88); }
+    .entry.error:focus {
+      color: #ffffff;
+      background-image: linear-gradient(to bottom, #FC4138);
+      box-shadow: none; }
+    .entry.error:selected, .entry.error:selected:focus {
+      background-color: #ffffff;
+      color: #FC4138; }
   .entry.image {
     color: #7d8189; }
-    .entry.image:hover {
-      color: #5c616c; }
-    .entry.image:active {
-      color: #5294E2; }
   .linked.vertical > .entry {
     border-bottom-color: #f4f5f6;
     box-shadow: none; }
@@ -1060,6 +1058,26 @@ GtkComboBox {
     border-color: #5294E2;
     background-image: none;
     background-color: transparent; }
+  .primary-toolbar .entry.warning, .header-bar .entry.warning {
+    color: #ffffff;
+    border-color: #F27835;
+    background-image: linear-gradient(to bottom, #eea57e); }
+    .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus {
+      color: #ffffff;
+      background-image: linear-gradient(to bottom, #F27835); }
+    .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus {
+      background-color: #ffffff;
+      color: #F27835; }
+  .primary-toolbar .entry.error, .header-bar .entry.error {
+    color: #ffffff;
+    border-color: #FC4138;
+    background-image: linear-gradient(to bottom, #f48480); }
+    .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus {
+      color: #ffffff;
+      background-image: linear-gradient(to bottom, #FC4138); }
+    .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus {
+      background-color: #ffffff;
+      color: #FC4138; }
 
 .primary-toolbar .button, .header-bar .button {
   color: rgba(82, 93, 118, 0.8);
diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css
index 5be879f..8bd1c54 100644
--- a/common/gtk-3.0/3.16/gtk-contained.css
+++ b/common/gtk-3.0/3.16/gtk-contained.css
@@ -195,32 +195,30 @@ GtkTextView {
     border-left-style: none; }
     .linked > .entry:last-child:dir(rtl) {
       border-left-style: solid; }
-  .entry.error {
-    color: white;
-    border-color: #FC4138;
-    background-image: linear-gradient(to bottom, #fd6760); }
-    .entry.error:focus {
-      background-image: linear-gradient(to bottom, #FC4138);
-      color: white; }
-    .entry.error:selected, .entry.error:selected:focus {
-      background-color: white;
-      color: #FC4138; }
   .entry.warning {
-    color: white;
+    color: #ffffff;
     border-color: #F27835;
-    background-image: linear-gradient(to bottom, #f5935d); }
+    background-image: linear-gradient(to bottom, #f7ae86); }
     .entry.warning:focus {
+      color: #ffffff;
       background-image: linear-gradient(to bottom, #F27835);
-      color: white; }
+      box-shadow: none; }
     .entry.warning:selected, .entry.warning:selected:focus {
-      background-color: white;
+      background-color: #ffffff;
       color: #F27835; }
+  .entry.error {
+    color: #ffffff;
+    border-color: #FC4138;
+    background-image: linear-gradient(to bottom, #fd8d88); }
+    .entry.error:focus {
+      color: #ffffff;
+      background-image: linear-gradient(to bottom, #FC4138);
+      box-shadow: none; }
+    .entry.error:selected, .entry.error:selected:focus {
+      background-color: #ffffff;
+      color: #FC4138; }
   .entry.image {
     color: #7d8189; }
-    .entry.image:hover {
-      color: #5c616c; }
-    .entry.image:active {
-      color: #5294E2; }
   .linked.vertical > .entry {
     border-bottom-color: #f4f5f6;
     box-shadow: none; }
@@ -1060,6 +1058,26 @@ GtkComboBox {
     border-color: #5294E2;
     background-image: none;
     background-color: transparent; }
+  .primary-toolbar .entry.warning, .header-bar .entry.warning {
+    color: #ffffff;
+    border-color: #F27835;
+    background-image: linear-gradient(to bottom, rgba(238, 162, 121, 0.98)); }
+    .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus {
+      color: #ffffff;
+      background-image: linear-gradient(to bottom, #F27835); }
+    .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus {
+      background-color: #ffffff;
+      color: #F27835; }
+  .primary-toolbar .entry.error, .header-bar .entry.error {
+    color: #ffffff;
+    border-color: #FC4138;
+    background-image: linear-gradient(to bottom, rgba(244, 128, 123, 0.98)); }
+    .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus {
+      color: #ffffff;
+      background-image: linear-gradient(to bottom, #FC4138); }
+    .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus {
+      background-color: #ffffff;
+      color: #FC4138; }
 
 .primary-toolbar .button, .header-bar .button {
   color: rgba(82, 93, 118, 0.8);
diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss
index 90c6063..0728848 100644
--- a/common/gtk-3.0/3.16/sass/_common.scss
+++ b/common/gtk-3.0/3.16/sass/_common.scss
@@ -270,38 +270,27 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
     }
   }
 
-  &.error {
-    color: white;
-    border-color: $error_color;
-    background-image: linear-gradient(to bottom, mix($error_color, $base_color, 80%));
-    &:focus {
-      background-image: linear-gradient(to bottom, $error_color);
-      color: white;
-    }
-    &:selected, &:selected:focus {
-      background-color: white;
-      color: $error_color;
-    }
-  }
+  @each $e_type, $e_color in (warning, $warning_color),
+                             (error, $error_color) {
+    &.#{$e_type} {
+      color: $selected_fg_color;
+      border-color: if($variant=='light', $e_color, $entry_border);
+      background-image: linear-gradient(to bottom, mix($e_color, $base_color, 60%));
 
-  &.warning {
-    color: white;
-    border-color: $warning_color;
-    background-image: linear-gradient(to bottom, mix($warning_color, $base_color, 80%));
-    &:focus {
-      background-image: linear-gradient(to bottom, $warning_color);
-      color: white;
-    }
-    &:selected, &:selected:focus {
-      background-color: white;
-      color: $warning_color;
+      &:focus {
+        color: $selected_fg_color;
+        background-image: linear-gradient(to bottom, $e_color);
+        box-shadow: none;
+      }
+      &:selected, &:selected:focus {
+        background-color: $selected_fg_color;
+        color: $e_color;
+      }
     }
   }
 
   &.image { // entry icons colors
     color: mix($fg_color,$base_color,80%);
-    &:hover { color: $fg_color; }
-    &:active { color: $selected_bg_color; }
   }
 
   .linked.vertical > & { //FIXME comment stuff and make the whole thing smarter.
@@ -1225,6 +1214,24 @@ GtkComboBox {
       background-image: none;
       background-color: transparent;
     }
+
+    @each $e_type, $e_color in (warning, $warning_color),
+                               (error, $error_color) {
+      &.#{$e_type} {
+        color: $selected_fg_color;
+        border-color: if($darker=='false' and $variant=='light', $e_color, $header_entry_border);
+        background-image: linear-gradient(to bottom, mix($e_color, $header_bg, 60%));
+
+        &:focus {
+          color: $selected_fg_color;
+          background-image: linear-gradient(to bottom, $e_color);
+        }
+        &:selected, &:selected:focus {
+          background-color: $selected_fg_color;
+          color: $e_color;
+        }
+      }
+    }
   }
 
   // Header-bar Buttons