raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5aaadceef20c8bf1ea6cfb2701012c2f0805d365
commit 5aaadceef20c8bf1ea6cfb2701012c2f0805d365 Author: Carsten Haitzler <[email protected]> Date: Sun Oct 17 21:18:41 2021 +0100 elm theme - more cc --- data/elementary/themes/colorclasses.edc | 101 ++++++++++++++++++++++++++++++-- data/elementary/themes/fonts.edc | 92 ++++++++++++++--------------- 2 files changed, 143 insertions(+), 50 deletions(-) diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc index 6fe9354a1c..66469e1fe7 100644 --- a/data/elementary/themes/colorclasses.edc +++ b/data/elementary/themes/colorclasses.edc @@ -380,8 +380,6 @@ color_classes { /////////////////////////////////////////////////////////////////////////////// color_class { name: "/fg/normal/text-heading"; color: 255 255 255 255; } - color_class { name: "/fg/disabled/text-heading"; - color: 160 160 160 255; } color_class { name: "/fg/normal/text-heading-sub"; color: 255 255 255 255; } color_class { name: "/fg/normal/text-hilight"; @@ -390,16 +388,111 @@ color_classes { // color: 160 160 160 255; } color_class { name: "/fg/normal/text-subtle"; color: 0 0 0 64; } + 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"; color: 25 76 128 255; } - color_class { name: "/fg/normal/text-urgent"; - color: 255 51 51 255; } color_class { name: "/fg/normal/text-link"; color: 51 153 255 255; } color_class { name: "/fg/disabled/text-link"; color: 96 112 128 255; } + color_class { name: "/fg/normal/text-preedit"; + color: 51 153 255 255; } + color_class { name: "/fg/disabled/text-preedit"; + color: 96 112 128 255; } + color_class { name: "/fg/normal/text-preedit-sel"; + color: 0 0 0 255; } + color_class { name: "/fg/disabled/text-preedit-sel"; + color: 32 32 32 255; } + color_class { name: "/bg/normal/text-preedit-sel"; + color: 220 220 220 255; } + color_class { name: "/bg/disabled/text-preedit-sel"; + color: 80 80 80 255; } + color_class { name: "/fg/normal/text-name"; + color: 96 96 96 255; } + color_class { name: "/fg/disabled/text-name"; + color: 80 80 80 255; } + color_class { name: "/fg/normal/text-val"; + color: 220 220 220 255; } + color_class { name: "/fg/disabled/text-val"; + color: 80 80 80 255; } + color_class { name: "/fg/normal/text-info"; + color: 51 153 255 255; } + color_class { name: "/fg/disabled/text-info"; + color: 96 112 128 255; } + color_class { name: "/fg/normal/text-success"; + color: 51 255 51 255; } + color_class { name: "/fg/disabled/text-success"; + color: 51 153 51 255; } + color_class { name: "/fg/normal/text-warning"; + color: 255 153 51 255; } + color_class { name: "/fg/disabled/text-warning"; + color: 153 51 34 255; } + color_class { name: "/fg/normal/text-failure"; + color: 255 51 51 255; } + color_class { name: "/fg/disabled/text-failure"; + color: 153 34 34 255; } + color_class { name: "/fg/normal/text-code"; + color: 255 255 255 255; } + color_class { name: "/fg/disabled/text-code"; + color: 128 128 128 255; } + color_class { name: "/fg/normal/text-comment"; + color: 51 153 153 255; } + color_class { name: "/fg/disabled/text-comment"; + color: 51 96 96 255; } + color_class { name: "/fg/normal/text-string"; + color: 51 255 153 255; } + color_class { name: "/fg/disabled/text-string"; + color: 96 128 112 255; } + color_class { name: "/fg/normal/text-number"; + color: 220 220 48 255; } + color_class { name: "/fg/disabled/text-number"; + color: 96 96 32 255; } + color_class { name: "/fg/normal/text-brace"; + color: 128 128 128 255; } + color_class { name: "/fg/disabled/text-brace"; + color: 80 80 80 255; } + color_class { name: "/fg/normal/text-type"; + color: 51 153 255 255; } + color_class { name: "/fg/disabled/text-type"; + color: 96 112 128 255; } + color_class { name: "/fg/normal/text-class"; + color: 119 170 221 255; } + color_class { name: "/fg/disabled/text-class"; + color: 59 85 110 255; } + color_class { name: "/fg/normal/text-function"; + color: 153 51 255 255; } + color_class { name: "/fg/disabled/text-function"; + color: 76 25 127 255; } + color_class { name: "/fg/normal/text-param"; + color: 220 220 220 255; } + color_class { name: "/fg/disabled/text-param"; + color: 96 96 96 255; } + color_class { name: "/fg/normal/text-keyword"; + color: 255 153 153 255; } + color_class { name: "/fg/disabled/text-keyword"; + color: 128 80 80 255; } + color_class { name: "/fg/normal/text-preprocessor"; + color: 153 51 255 255; } + color_class { name: "/fg/disabled/text-preprocessor"; + color: 128 37 128 255; } + color_class { name: "/fg/normal/text-line-added"; + color: 153 255 51 255; } + color_class { name: "/fg/disabled/text-line-added"; + color: 76 128 25 255; } + color_class { name: "/fg/normal/text-line-removed"; + color: 255 51 51 255; } + color_class { name: "/fg/disabled/text-line-removed"; + color: 128 25 25 255; } + color_class { name: "/fg/normal/text-line-changed"; + color: 255 153 51 255; } + color_class { name: "/fg/disabled/text-line-changed"; + color: 128 76 25 255; } /////////////////////////////////////////////////////////////////////////////// color_class { name: "/bg/normal/flipselector/down"; color: 96 96 96 255; } diff --git a/data/elementary/themes/fonts.edc b/data/elementary/themes/fonts.edc index 988c5f1eef..9159a86882 100644 --- a/data/elementary/themes/fonts.edc +++ b/data/elementary/themes/fonts.edc @@ -20,65 +20,65 @@ tag: "hilight" "+ font_weight=Bold color=cc:/fg/normal/text-standout"; \ tag: "heading" "+ font_weight=Bold color=cc:/fg/normal/text-heading font_size=11"; \ tag: "link" "+ color=cc:/fg/normal/text-link underline=on underline_color=cc:/fg/normal/text-link"; \ - tag: "preedit" "+ underline=on underline_color=#3399ff"; \ - tag: "preedit_sel" "+ backing=on backing_color=#000000 color=#ffffff"; \ + tag: "preedit" "+ underline=on underline_color=cc:/fg/normal/text-preedit"; \ + tag: "preedit_sel" "+ backing=on backing_color=cc:/bg/normal/text-preedit-sel color=cc:/fg/normal/text-preedit-sel"; \ tag: "title" "+ font_size=26"; \ tag: "subtitle" "+ font_size=18"; \ tag: "bigger" "+ font_size=12"; \ tag: "big" "+ font_size=11"; \ tag: "small" "+ font_size=8"; \ tag: "smaller" "+ font_size=7"; \ - tag: "name" "+ color=#888888 font_weight=Bold"; \ - tag: "val" "+ color=#ffffff"; \ - tag: "info" "+ color=#3399ff"; \ - tag: "success" "+ color=#00ff00"; \ - tag: "warning" "+ color=#ff7c00"; \ - tag: "failure" "+ color=#ff0000"; \ - tag: "code" "+ font=Mono color=#ffffff"; \ - tag: "comment" "+ color=#00B000"; \ - tag: "string" "+ color=#ff3a35"; \ - tag: "number" "+ color=#D4D42A font_weight=Bold"; \ - tag: "brace" "+ color=#656565"; \ - tag: "type" "+ color=#3399ff"; \ - tag: "class" "+ color=#72AAD4 font_weight=Bold"; \ - tag: "function" "+ color=#72AAD4 font_weight=Bold"; \ - tag: "param" "+ color=#ffffff"; \ - tag: "keyword" "+ color=#ff9900 font_weight=Bold"; \ - tag: "preprocessor" "+ color=#3399ff font_weight=Bold"; \ - tag: "line_added" "+ color=#00B000"; \ - tag: "line_removed" "+ color=#ff3a35"; \ - tag: "line_changed" "+ color=#ff9900"; + tag: "name" "+ color=cc:/fg/normal/text-name font_weight=Bold"; \ + tag: "val" "+ color=cc:/fg/normal/text-val"; \ + tag: "info" "+ color=cc:/fg/normal/text-info"; \ + tag: "success" "+ color=cc:/fg/normal/text-success"; \ + tag: "warning" "+ color=cc:/fg/normal/text-warning"; \ + tag: "failure" "+ color=cc:/fg/normal/text-failure"; \ + tag: "code" "+ font=Mono color=cc:/fg/normal/text-code"; \ + tag: "comment" "+ color=cc:/fg/normal/text-comment"; \ + tag: "string" "+ color=cc:/fg/normal/text-string"; \ + tag: "number" "+ color=cc:/fg/normal/text-number font_weight=Bold"; \ + tag: "brace" "+ color=cc:/fg/normal/text-brace"; \ + tag: "type" "+ color=cc:/fg/normal/text-type"; \ + tag: "class" "+ color=cc:/fg/normal/text-class font_weight=Bold"; \ + tag: "function" "+ color=cc:/fg/normal/text-function font_weight=Bold"; \ + tag: "param" "+ color=cc:/fg/normal/text-param"; \ + tag: "keyword" "+ color=cc:/fg/normal/text-keyword font_weight=Bold"; \ + tag: "preprocessor" "+ color=cc:/fg/normal/text-preprocessor font_weight=Bold"; \ + tag: "line_added" "+ color=cc:/fg/normal/text-line-added"; \ + tag: "line_removed" "+ color=cc:/fg/normal/text-line-removed"; \ + tag: "line_changed" "+ color=cc:/fg/normal/text-line-changed"; #define DISABLED_TEXTBLOCK_TAGS \ tag: "em" "+ font_style=Oblique"; \ tag: "hilight" "+ font_weight=Bold color=cc:/fg/disabled/text-standout"; \ - tag: "heading" "+ font_weight=Bold color=cc:/fg/disabled/text-heading font_size=11"; \ - tag: "link" "+ color=cc:/fg/disabled/text-link underline=on underline_color=cc:/fg/disabled/text-link"; \ - tag: "preedit" "+ underline=on underline_color=#3399ff88"; \ - tag: "preedit_sel" "+ backing=on backing_color=#000000 color=#888888"; \ + tag: "heading" "+ font_weight=Bold color=cc:/fg/disabled/text-heading font_size=11"; \ + tag: "link" "+ color=cc:/fg/disabled/text-link underline=on underline_color=cc:/fg/disabled/text-link"; \ + tag: "preedit" "+ underline=on underline_color=cc:/fg/normal/text-preedit"; \ + tag: "preedit_sel" "+ backing=on backing_color=cc:/bg/disabled/text-preedit-sel color=cc:/fg/disabled/text-preedit-sel"; \ tag: "title" "+ font_size=26"; \ tag: "subtitle" "+ font_size=18"; \ tag: "bigger" "+ font_size=12"; \ tag: "big" "+ font_size=11"; \ tag: "small" "+ font_size=8"; \ tag: "smaller" "+ font_size=7"; \ - tag: "name" "+ color=#151515 font_weight=Bold"; \ - tag: "val" "+ color=#151515"; \ - tag: "info" "+ color=#3399ff60"; \ - tag: "success" "+ color=#00ff0060"; \ - tag: "warning" "+ color=#ff7c0060"; \ - tag: "failure" "+ color=#ff000060"; \ - tag: "code" "+ font=Mono color=#505050"; \ - tag: "comment" "+ color=#002800"; \ - tag: "string" "+ color=#300504"; \ - tag: "number" "+ color=#202008 font_weight=Bold"; \ - tag: "brace" "+ color=#000000"; \ - tag: "type" "+ color=#101820"; \ - tag: "class" "+ color=#121c20 font_weight=Bold"; \ - tag: "function" "+ color=#121c20 font_weight=Bold"; \ - tag: "param" "+ color=#151515"; \ - tag: "keyword" "+ color=#201200 font_weight=Bold"; \ - tag: "preprocessor" "+ color=#101820 font_weight=Bold"; \ - tag: "line_added" "+ color=#002800"; \ - tag: "line_removed" "+ color=#300504"; \ - tag: "line_changed" "+ color=#201200"; + tag: "name" "+ color=cc:/fg/disabled/text-name font_weight=Bold"; \ + tag: "val" "+ color=cc:/fg/disabled/text-val"; \ + tag: "info" "+ color=cc:/fg/disabled/text-info"; \ + tag: "success" "+ color=cc:/fg/disabled/text-success"; \ + tag: "warning" "+ color=cc:/fg/disabled/text-warning"; \ + tag: "failure" "+ color=cc:/fg/disabled/text-failure"; \ + tag: "code" "+ font=Mono color=cc:/fg/disabled/text-code"; \ + tag: "comment" "+ color=cc:/fg/disabled/text-comment"; \ + tag: "string" "+ color=cc:/fg/disabled/text-string"; \ + tag: "number" "+ color=cc:/fg/disabled/text-number font_weight=Bold"; \ + tag: "brace" "+ color=cc:/fg/disabled/text-brace"; \ + tag: "type" "+ color=cc:/fg/disabled/text-type"; \ + tag: "class" "+ color=cc:/fg/disabled/text-type font_weight=Bold"; \ + tag: "function" "+ color=cc:/fg/disabled/text-function font_weight=Bold"; \ + tag: "param" "+ color=cc:/fg/disabled/text-param"; \ + tag: "keyword" "+ color=cc:/fg/disabled/text-keyword font_weight=Bold"; \ + tag: "preprocessor" "+ color=cc:/fg/disabled/text-preprocessor font_weight=Bold"; \ + tag: "line_added" "+ color=cc:/fg/disabled/text-line-added"; \ + tag: "line_removed" "+ color=cc:/fg/disabled/text-line-removed"; \ + tag: "line_changed" "+ color=cc:/fg/disabled/text-line-changed"; --
