elm theme - final cc work for elm code cc's

1 files changed, 64 insertions, 47 deletions

diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc
index 47b1860fdb..a7f1986928 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -380,19 +380,26 @@ color_classes {
 ///////////////////////////////////////////////////////////////////////////////
    color_class { name: "/fg/normal/text-heading";
       color: 255 255 255 255; }
+   color_class { name: "/fg/disabled/text-heading";
+      color: 128 128 128 255; }
    color_class { name: "/fg/normal/text-heading-sub";
       color: 255 255 255 255; }
+   color_class { name: "/fg/disabled/text-heading-sub";
+      color: 128 128 128 255; }
    color_class { name: "/fg/normal/text-hilight";
       color: 255 255 255 255; }
-//   color_class { name: "/fg/normal/text-overlay";
-//      color: 160 160 160 255; }
+   color_class { name: "/fg/disabled/text-hilight";
+      color: 128 128 128 255; }
+   color_class { name: "/fg/normal/text-overlay";
+      color: 220 220 220 255; }
+   color_class { name: "/fg/disabled/text-overlay";
+      color: 128 128 128 255; }
    color_class { name: "/fg/normal/text-subtle";
       color:   0   0   0  64; }
+   color_class { name: "/fg/disabled/text-subtle";
+      color:   0   0   0  48; }
    color_class { name: "/fg/normal/text-urgent";
       color: 255  51  51 255; }
-   color_class { name: "/fg/disabled/text-heading";
-      color: 160 160 160 255; }
-
    color_class { name: "/fg/normal/text-standout";
       color:  51 153 255 255; }
    color_class { name: "/fg/disabled/text-standout";
@@ -437,6 +444,14 @@ color_classes {
       color: 255  51  51 255; }
    color_class { name: "/fg/disabled/text-failure";
       color: 153  34  34 255; }
+   color_class { name: "/fg/normal/text-error";
+      color: 255  51  51 255; }
+   color_class { name: "/fg/disabled/text-error";
+      color: 153  34  34 255; }
+   color_class { name: "/fg/normal/text-fatal";
+      color: 255  51  51 255; }
+   color_class { name: "/fg/disabled/text-fatal";
+      color: 153  34  34 255; }
    color_class { name: "/fg/normal/text-code";
       color: 255 255 255 255; }
    color_class { name: "/fg/disabled/text-code";
@@ -493,48 +508,50 @@ color_classes {
       color: 255 153  51 255; }
    color_class { name: "/fg/disabled/text-line-changed";
       color: 128  76  25 255; }
-
-///////////////////////////////////////////////////////////////////////////////
-// XXX: need to find a bette way to deal with these? put missing ones from
-// below into the above and then move elm code to use these new cc's
-// look at elm_code_widget.c _elm_code_widget_setup_palette(0
-    color_class { name: "elm/code/status/default"; color: 48 48 48 255; }
-    color_class { name: "elm/code/status/current"; color: 32 32 32 255; }
-    color_class { name: "elm/code/status/ignored"; color: 36 36 36 255; }
-    color_class { name: "elm/code/status/note"; color: 160 80 17 255;  }
-    color_class { name: "elm/code/status/warning"; color: 160 80 17 255; }
-    color_class { name: "elm/code/status/error"; color: 160 32 17 255; }
-    color_class { name: "elm/code/status/fatal"; color: 160 32 17 255; }
-    color_class { name: "elm/code/status/added"; color: 36 96 36 255; }
-    color_class { name: "elm/code/status/removed"; color: 96 36 36 255; }
-    color_class { name: "elm/code/status/changed"; color: 36 36 96 255; }
-    color_class { name: "elm/code/status/passed"; color: 54 96 54 255; }
-    color_class { name: "elm/code/status/failed"; color: 96 54 54 255; }
-    color_class { name: "elm/code/status/todo"; color: 48 80 160 255; }
-
-    color_class { name: "elm/code/token/default"; color: 160 160 160 255; }
-    color_class { name: "elm/code/token/comment"; color: 255 255 255 48; }
-    color_class { name: "elm/code/token/string"; color: 255 136 119 255; }
-    color_class { name: "elm/code/token/number"; color: 170 153 34 255; }
-    color_class { name: "elm/code/token/brace"; color: 170 102 170 255; }
-    color_class { name: "elm/code/token/type"; color: 255 255 255 255; }
-    color_class { name: "elm/code/token/class"; color: 255 255 255 255; }
-    color_class { name: "elm/code/token/function"; color: 255 255 255 255; }
-    color_class { name: "elm/code/token/param"; color: 187 187 187 255; }
-    color_class { name: "elm/code/token/keyword"; color: 68 136 204 255; }
-    color_class { name: "elm/code/token/preprocessor"; color: 102 255 85 255; }
-    color_class { name: "elm/code/token/added"; color: 54 255 54 255; }
-    color_class { name: "elm/code/token/removed"; color: 255 54 54 255; }
-    color_class { name: "elm/code/token/changed"; color: 54 54 255 255; }
-    color_class { name: "elm/code/token/match"; color: 187 187 51 128; }
-
-    color_class { name: "elm/code/widget/color/selection"; color: 51 153 255 128; }
-    color_class { name: "elm/code/widget/color/gutter/bg"; color: 64 64 64 255; }
-    color_class { name: "elm/code/widget/color/gutter/fg"; color: 128 128 128 255; }
-    color_class { name: "elm/code/widget/color/gutter/scope/bg"; color: 54 54 54 255; }
-    color_class { name: "elm/code/widget/color/whitespace"; color: 96 96 96 255; }
-///////////////////////////////////////////////////////////////////////////////
-
+   color_class { name: "/fg/normal/text-status";
+      color:  48  48  49 255; }
+   color_class { name: "/fg/disabled/text-status";
+      color:  56  56  56 255; }
+   color_class { name: "/fg/normal/text-match";
+      color: 187 187  51 255; }
+   color_class { name: "/fg/disabled/text-match";
+      color:  96  96  25 255; }
+   color_class { name: "/fg/normal/text-current";
+      color:  32  32  32 255; }
+   color_class { name: "/fg/disabled/text-current";
+      color:  48  48  48 255; }
+   color_class { name: "/fg/normal/text-ignored";
+      color:  36  36  36 255; }
+   color_class { name: "/fg/disabled/text-ignored";
+      color:  44  44  44 255; }
+   color_class { name: "/fg/normal/text-note";
+      color:  160 80  17 255; }
+   color_class { name: "/fg/disabled/text-note";
+      color:  80  40   8 255; }
+   color_class { name: "/fg/normal/text-todo";
+      color:  40  80 160 255; }
+   color_class { name: "/fg/disabled/text-todo";
+      color:  20  40  80 255; }
+   color_class { name: "/fg/normal/text-gutter";
+      color: 128 128 128 255; }
+   color_class { name: "/fg/disabled/text-gutter";
+      color:  80  80  80 255; }
+   color_class { name: "/bg/normal/text-gutter";
+      color:  64  64  64 255; }
+   color_class { name: "/bg/disabled/text-gutter";
+      color:  64  64  64 255; }
+   color_class { name: "/bg/normal/text-scope";
+      color:  54  54  54 255; }
+   color_class { name: "/bg/disabled/text-scope";
+      color:  58  58  58 255; }
+   color_class { name: "/bg/normal/text-whitespace";
+      color:  96  96  96 255; }
+   color_class { name: "/bg/disabled/text-whitespace";
+      color:  80  80  80 255; }
+   color_class { name: "/bg/normal/text-selection";
+      color:  51 153 255 128; }
+   color_class { name: "/bg/disabled/text-selection";
+      color:  25  76 128 128; }
 ///////////////////////////////////////////////////////////////////////////////
    color_class { name: "/bg/normal/flipselector/down";
       color:  96  96  96 255; }