raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=653bf2d6f755e42ca0c0c9a28cbf06a6242da562
commit 653bf2d6f755e42ca0c0c9a28cbf06a6242da562 Author: Carsten Haitzler <[email protected]> Date: Mon Oct 11 11:21:59 2021 +0100 elm theme - more cc --- data/elementary/themes/colorclasses.edc | 3 +++ data/elementary/themes/edc/efl/calendar.edc | 12 ++++++------ data/elementary/themes/edc/efl/navigation_bar.edc | 4 ++-- data/elementary/themes/edc/efl/tags.edc | 4 ++-- data/elementary/themes/edc/efl/textpath.edc | 5 ++--- data/elementary/themes/edc/efl/tooltip.edc | 6 +++--- data/elementary/themes/edc/elm/multibuttonentry.edc | 2 +- data/elementary/themes/edc/elm/popup.edc | 6 +++--- data/elementary/themes/edc/elm/textpath.edc | 2 +- data/elementary/themes/edc/evrything.edc | 2 +- data/elementary/themes/edc/randr.edc | 6 +++--- data/elementary/themes/edc/textblock.edc | 6 +++--- 12 files changed, 30 insertions(+), 28 deletions(-) diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc index d8e554b99e..3c438af78b 100644 --- a/data/elementary/themes/colorclasses.edc +++ b/data/elementary/themes/colorclasses.edc @@ -110,6 +110,9 @@ color_classes { color: 255 255 255 255; } color_class { name: "/fg-alt/selected-pressed"; color: 255 255 255 255; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/fg/normal/navigation/title"; + color: 255 255 255 255; } /////////////////////////////////////////////////////////////////////////////// color_class { name: "/shadow"; color: 0 0 0 128; } diff --git a/data/elementary/themes/edc/efl/calendar.edc b/data/elementary/themes/edc/efl/calendar.edc index a00cfb81ff..11e84ff060 100644 --- a/data/elementary/themes/edc/efl/calendar.edc +++ b/data/elementary/themes/edc/efl/calendar.edc @@ -1,21 +1,21 @@ #define CIT_STYLES\ style { name: "efl_ui_calendar_date_style";\ - base: "font="FN" font_size=10 color=#a0a0a0 align=center text_class=calendar_day_text";\ + base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day align=center text_class=calendar_day_text";\ }\ style { name: "efl_ui_calendar_date_holiday_style";\ - base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_holiday";\ + base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day/holiday align=center text_class=calendar_day_text_holiday";\ }\ style { name: "efl_ui_calendar_date_today_style";\ - base: "font="FN" font_size=10 color=#ffffff align=center text_class=calendar_day_text_today";\ + base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day/today align=center text_class=calendar_day_text_today";\ }\ style { name: "efl_ui_calendar_date_disabled_style";\ - base: "font="FN" font_size=10 color=#282828 align=center text_class=calendar_day_text_disabled";\ + base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day/disabled align=center text_class=calendar_day_text_disabled";\ }\ style { name: "efl_ui_calendar_date_weekend1_style";\ - base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_weekend1";\ + base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day/weekend1 align=center text_class=calendar_day_text_weekend1";\ }\ style { name: "efl_ui_calendar_date_weekend2_style";\ - base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_weekend2";\ + base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day/weekend2 align=center text_class=calendar_day_text_weekend2";\ }\ #define CAL_SPIN(_sufix, _text, _relative)\ diff --git a/data/elementary/themes/edc/efl/navigation_bar.edc b/data/elementary/themes/edc/efl/navigation_bar.edc index c9b095c56c..3e7db6ce60 100644 --- a/data/elementary/themes/edc/efl/navigation_bar.edc +++ b/data/elementary/themes/edc/efl/navigation_bar.edc @@ -3,11 +3,11 @@ group { "efl/navigation_bar"; data.item: "version" "123"; styles { style { name: "navigation_bar_text"; - base: "font="FNBD" font_size=10 text_class=label align=center color=#fff ellipsis=1.0 wrap=mixed"; + base: "font="FNBD" font_size=10 text_class=label align=center color=cc:/fg/normal/navigation/title ellipsis=1.0 wrap=mixed"; tag: "br" "\n"; tag: "hilight" "+ font="FNBD" text_class=label_light"; tag: "b" "+ font="FNBD" text_class=label_light"; - tag: "whitecolor" "+ color=#fff"; + tag: "whitecolor" "+ color=#fff"; // no cc tag: "tab" "\t"; } } diff --git a/data/elementary/themes/edc/efl/tags.edc b/data/elementary/themes/edc/efl/tags.edc index 6996a38d4f..bff084cacf 100644 --- a/data/elementary/themes/edc/efl/tags.edc +++ b/data/elementary/themes/edc/efl/tags.edc @@ -49,10 +49,10 @@ group { "efl/tags/btn"; styles { style { name: "efl_tags_textblock_style"; - base: "font="FN" align=0.5 font_size=10 color=#fff text_class=tags_item ellipsis=1.0"; + base: "font="FN" align=0.5 font_size=10 color=#fff text_class=tags_item ellipsis=1.0"; // no cc tag: "br" "\n"; tag: "ps" "ps"; - tag: "hilight" "+ color=#ffffff font="FNBD; + tag: "hilight" "+ font="FNBD; // no cc tag: "b" "+ font="FNBD; tag: "tab" "\t"; } diff --git a/data/elementary/themes/edc/efl/textpath.edc b/data/elementary/themes/edc/efl/textpath.edc index dd020325e0..07a082a776 100644 --- a/data/elementary/themes/edc/efl/textpath.edc +++ b/data/elementary/themes/edc/efl/textpath.edc @@ -2,15 +2,14 @@ group { name: "efl/textpath"; data.item: "version" "123"; styles { style { name: "textpath_style2"; - base: "font="FN" font_size=10 text_class=tb_plain wrap=none align=left color=#a0a0a0"; + base: "font="FN" font_size=10 text_class=tb_plain wrap=none align=left color=cc:/fg/normal/text"; tag: "br" "\n"; tag: "b" "+ font="FNBD" text_class=tb_light"; ENABLED_TEXTBLOCK_TAGS } } parts { - part { name: "efl.text"; - type: TEXTBLOCK; + part { name: "efl.text"; type: TEXTBLOCK; scale: 1; description { state: "default" 0.0; align: 0.0 0.0; diff --git a/data/elementary/themes/edc/efl/tooltip.edc b/data/elementary/themes/edc/efl/tooltip.edc index c6646d5fa6..1e46e942fc 100644 --- a/data/elementary/themes/edc/efl/tooltip.edc +++ b/data/elementary/themes/edc/efl/tooltip.edc @@ -4,10 +4,10 @@ group { name: "efl/label/tooltip"; alias: "efl/label/base/tooltip/transparent"; styles { style { name: "tooltip_style2"; - base: "font="FNBD" font_size=10 color=#ffffff text_class=bubble align=0.5"; + base: "font="FNBD" font_size=10 color=cc:/fg/normal/tooltip/text text_class=bubble align=0.5"; tag: "br" "\n"; - tag: "hilight" "+ font="FNBD" text_class=bubble color=#ff9933"; - tag: "b" "+ font="FNBD" text_class=bubble color=#3399ff"; + tag: "hilight" "+ font="FNBD" text_class=bubble color=cc:/fg/normal/toolip/text/hilight"; + tag: "b" "+ font="FNBD" text_class=bubble"; tag: "tab" "\t"; } } diff --git a/data/elementary/themes/edc/elm/multibuttonentry.edc b/data/elementary/themes/edc/elm/multibuttonentry.edc index b3aebad83c..1faaaa9a7a 100644 --- a/data/elementary/themes/edc/elm/multibuttonentry.edc +++ b/data/elementary/themes/edc/elm/multibuttonentry.edc @@ -252,7 +252,7 @@ group { name: "elm/multibuttonentry/btn/default"; group { name: "elm/multibuttonentry/closedbutton/default"; styles { style { name: "textblock_style_multibuttonentry_default"; - base: "font="FNBD" font_size=10 text_class=multibuttonentry_closed color=#fff align=center wrap=char"; + base: "font="FNBD" font_size=10 text_class=multibuttonentry_closed color=#fff align=center wrap=char"; /// no cc for color tag: "br" "\n"; tag: "ps" "ps"; tag: "hilight" "+ font="FNBD; diff --git a/data/elementary/themes/edc/elm/popup.edc b/data/elementary/themes/edc/elm/popup.edc index aef9134e6a..cae5f35613 100644 --- a/data/elementary/themes/edc/elm/popup.edc +++ b/data/elementary/themes/edc/elm/popup.edc @@ -144,7 +144,7 @@ group { name: "elm/label/base/popup/default"; tag: "br" "\n"; tag: "hilight" "+ font="FNBD" text_class=label_light"; tag: "b" "+ font="FNBD" text_class=label_light"; - tag: "whitecolor" "+ color=#fff"; + tag: "whitecolor" "+ color=#fff"; // no cc tag: "tab" "\t"; } style { name: "popup_title_style_ellipsis"; @@ -152,7 +152,7 @@ group { name: "elm/label/base/popup/default"; tag: "br" "\n"; tag: "hilight" "+ font="FNBD" text_class=label_light"; tag: "b" "+ font="FNBD" text_class=label_light"; - tag: "whitecolor" "+ color=#fff"; + tag: "whitecolor" "+ color=#fff"; // no cc tag: "tab" "\t"; } } @@ -188,7 +188,7 @@ group { name: "elm/popup/base/default"; tag: "br" "\n"; tag: "hilight" "+ font="FNBD" text_class=label_light"; tag: "b" "+ font="FNBD" text_class=label_light"; - tag: "whitecolor" "+ color=#fff"; + tag: "whitecolor" "+ color=#fff"; // no cc tag: "tab" "\t"; } } diff --git a/data/elementary/themes/edc/elm/textpath.edc b/data/elementary/themes/edc/elm/textpath.edc index 17c2baa4f9..bc5612eb1f 100644 --- a/data/elementary/themes/edc/elm/textpath.edc +++ b/data/elementary/themes/edc/elm/textpath.edc @@ -1,7 +1,7 @@ group { name: "elm/textpath/base/default"; styles { style { name: "textpath_style"; - base: "font="FN" font_size=16 text_class=tb_plain wrap=none align=left color=#ffffffff style=shadow,bottom shadow_color=#00000080"; + base: "font="FN" font_size=16 text_class=tb_plain wrap=none align=left color=cc:/fg/normal/text"; tag: "br" "\n"; tag: "b" "+ font="FNBD" text_class=tb_light"; ENABLED_TEXTBLOCK_TAGS diff --git a/data/elementary/themes/edc/evrything.edc b/data/elementary/themes/edc/evrything.edc index dd7e065303..c90fa654ce 100644 --- a/data/elementary/themes/edc/evrything.edc +++ b/data/elementary/themes/edc/evrything.edc @@ -1433,7 +1433,7 @@ group { name: "e/modules/everything/textblock"; tag: "b" "+ font="FNBD""; tag: "hilight" "+ font="FNBD" text_class=tb_light"; tag: "urgent" "+ font="FNBD" color=cc:/fg/normal/text-urgent"; - tag: "title" "+ font="FNBD" color=cc:/fg/normal/text-heading font_size=16 underline=on underline_color=#fff"; + tag: "title" "+ font="FNBD" color=cc:/fg/normal/text-heading font_size=16 underline=on underline_color=cc:/fg/normal/text-heading"; } } parts { diff --git a/data/elementary/themes/edc/randr.edc b/data/elementary/themes/edc/randr.edc index d74322ebfe..9f7763f256 100644 --- a/data/elementary/themes/edc/randr.edc +++ b/data/elementary/themes/edc/randr.edc @@ -61,17 +61,17 @@ group { name: "e/conf/randr/main/monitor"; group { name: "e/conf/randr/main/frame"; styles { style { name: "randr_name_style"; - base: "font="FNBD" font_size=10 text_class=randr_monitor align=center color=#fff wrap=word"; + base: "font="FNBD" font_size=10 text_class=randr_monitor align=center color=cc:/fg/normal/text wrap=word"; tag: "br" "\n"; tag: "hilight" "+ font="FNBD""; } style { name: "randr_resolution_style"; - base: "font="FN" font_size=10 text_class=randr_resolution align=center color=#ff9933 wrap=mixed align=center"; + base: "font="FN" font_size=10 text_class=randr_resolution align=center color=cc:/fg/normal/tex wrap=mixed align=center"; tag: "br" "\n"; tag: "hilight" "+ font="FNBD""; } style { name: "randr_position_style"; - base: "font="FN" font_size=10 text_class=randr_position align=center color=#3399ff wrap=mixed align=center"; + base: "font="FN" font_size=10 text_class=randr_position align=center color=cc:/fg/normal/tex wrap=mixed align=center"; tag: "br" "\n"; tag: "hilight" "+ font="FNBD""; } diff --git a/data/elementary/themes/edc/textblock.edc b/data/elementary/themes/edc/textblock.edc index bd71338add..479d03e27e 100644 --- a/data/elementary/themes/edc/textblock.edc +++ b/data/elementary/themes/edc/textblock.edc @@ -1,12 +1,12 @@ group { name: "e/widgets/textblock"; styles { style { name: "textblock_style"; - base: "font="FN" font_size=10 text_class=tb_plain align=left color=#a0a0a0 wrap=word"; + base: "font="FN" font_size=10 text_class=tb_plain align=left color=cc:/fg/normal wrap=word"; tag: "br" "\n"; tag: "b" "+ font="FNBD""; tag: "hilight" "+ font="FNBD" text_class=tb_light"; - tag: "urgent" "+ font="FNBD" color=#f40f"; - tag: "title" "+ font="FNBD" font_size=16 underline=on underline_color=#3399ff"; + tag: "urgent" "+ font="FNBD" color=cc:/fg/normal/text-urgent"; + tag: "title" "+ font="FNBD" font_size=16 underline=on underline_color=cc:/fg/normal/text"; } } parts { --
