From 9ef86222c8fe33a2fef9f7a145ebb22113ec51d1 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Sat, 14 Aug 2021 21:33:04 +0100 Subject: [PATCH] elm theme - more cc --- data/elementary/themes/colorclasses.edc | 11 +++++ data/elementary/themes/edc/elm/index.edc | 57 +++++++++++++----------- 2 files changed, 41 insertions(+), 27 deletions(-) diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc index c3c30c267d..d807a8450d 100644 --- a/data/elementary/themes/colorclasses.edc +++ b/data/elementary/themes/colorclasses.edc @@ -33,6 +33,8 @@ color_tree { "/fg/normal/gadgets/bluez/off"; "/fg/normal/gadgets/clock/digital/separator"; "/fg/normal/gadgets/clock/analog/hands/hours"; + "/fg/normal/index/item/text"; + "/fg-alt"; } ":selected" { "/bg/selected"; @@ -121,6 +123,12 @@ color_classes { color: 0 0 0 200; } color_class { name: "/dim/disabled"; color: 0 0 0 80; } + color_class { name: "/dim-alt"; + color: 0 0 0 160; } + color_class { name: "/dim-alt/pressed"; + color: 0 0 0 200; } + color_class { name: "/dim-alt/disabled"; + color: 0 0 0 80; } /////////////////////////////////////////////////////////////////////////////// color_class { name: "/bg/normal/popup"; color: 48 48 48 255; } @@ -174,6 +182,9 @@ color_classes { /////////////////////////////////////////////////////////////////////////////// color_class { name: "/fg/normal/color/cursor"; color: 255 255 255 192; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/fg/normal/index/base/text"; + color: 51 153 255 255; } /////////////////////////////////////////////////////////////////////////////// // color_class { name: "/fg/normal/panes/flush"; // color: 51 163 255 255; } diff --git a/data/elementary/themes/edc/elm/index.edc b/data/elementary/themes/edc/elm/index.edc index 903fe2a663..a71260522d 100644 --- a/data/elementary/themes/edc/elm/index.edc +++ b/data/elementary/themes/edc/elm/index.edc @@ -3,28 +3,28 @@ group { name: "elm/index/base/vertical/default"; part { name: "bg"; type: RECT; description { state: "default" 0.0; rel.to: "elm.swallow.index.0"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } part { name: "clip"; type: RECT; mouse_events: 0; description { state: "default" 0.0; visible: 0; - color: 255 255 255 0; + color: 255 255 255 0; // no cc } description { state: "active" 0.0; visible: 1; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } } part { name: "clip2"; type: RECT; mouse_events: 0; clip_to: "clip"; description { state: "default" 0.0; visible: 0; - color: 255 255 255 0; + color: 255 255 255 0; // no cc } description { state: "active" 0.0; visible: 1; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } } part { name: "elm.swallow.index.0"; type: SWALLOW; @@ -60,7 +60,7 @@ group { name: "elm/index/base/vertical/default"; relative: 0.0 0.5; offset: -48 -1; } - color: 51 153 255 255; + color_class: "/fg/normal/index/base/text"; text { font: FNBD; size: 20; min: 1 1; ellipsis: -1; @@ -97,7 +97,7 @@ group { name: "elm/index/base/vertical/default"; repeat_events: 1; description { state: "default" 0.0; rel.to:"elm.swallow.event.0"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } } @@ -131,12 +131,12 @@ group { name: "elm/index/item/vertical/default"; part { name: "base"; type: RECT; mouse_events: 0; scale: 1; description { state: "default" 0.0; - color: 0 0 0 128; + color_class: "/dim/normal/index/item"; offscale; } description { state: "active" 0.0; inherit: "default" 0.0; - rel1.offset: -16 0; + color_class: "/dim/selected/index/item"; } } part { name: "elm.text"; type: TEXT; mouse_events: 0; @@ -147,7 +147,7 @@ group { name: "elm/index/item/vertical/default"; rel1.offset: 4 4; rel2.relative: 0.5 1.0; rel2.offset: -5 -5; - color: 160 160 160 255; + color_class: "/fg/normal/index/item/text"; text { font: FNBD; size: 10; min: 1 1; ellipsis: -1; @@ -157,7 +157,7 @@ group { name: "elm/index/item/vertical/default"; } description { state: "active" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/selected/index/item/text"; } } } @@ -192,11 +192,12 @@ group { name: "elm/index/item_odd/vertical/default"; part { name: "base"; type: RECT; mouse_events: 0; scale: 1; description { state: "default" 0.0; - color: 0 0 0 128; + color_class: "/dim-alt/normal/index/item"; offscale; } description { state: "active" 0.0; inherit: "default" 0.0; + color_class: "/dim-alt/selected/index/item"; rel1.offset: -16 0; } } @@ -208,7 +209,7 @@ group { name: "elm/index/item_odd/vertical/default"; rel1.offset: 4 4; rel2.relative: 0.5 1.0; rel2.offset: -5 -5; - color: 160 160 160 255; + color_class: "/fg-alt/normal/index/item/text"; text { font: FNBD; size: 10; min: 1 1; ellipsis: -1; @@ -218,7 +219,7 @@ group { name: "elm/index/item_odd/vertical/default"; } description { state: "active" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg-alt/selected/index/item/text"; } } } @@ -255,28 +256,28 @@ group { name: "elm/index/base/horizontal/default"; part { name: "bg"; type: RECT; description { state: "default" 0.0; rel.to: "elm.swallow.index.0"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } part { name: "clip"; type: RECT; mouse_events: 0; description { state: "default" 0.0; visible: 0; - color: 255 255 255 0; + color: 255 255 255 0; // no cc } description { state: "active" 0.0; visible: 1; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } } part { name: "clip2"; type: RECT; mouse_events: 0; clip_to: "clip"; description { state: "default" 0.0; visible: 0; - color: 255 255 255 0; + color: 255 255 255 0; // no cc } description { state: "active" 0.0; visible: 1; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } } part { name: "elm.swallow.index.0"; type: SWALLOW; @@ -312,7 +313,7 @@ group { name: "elm/index/base/horizontal/default"; relative: 0.5 0.0; offset: -1 -48; } - color: 51 153 255 255; + color_class: "/fg/normal/index/base/text"; text { font: FNBD; size: 20; min: 1 1; ellipsis: -1; @@ -349,7 +350,7 @@ group { name: "elm/index/base/horizontal/default"; repeat_events: 1; description { state: "default" 0.0; rel.to:"elm.swallow.event.0"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } } @@ -383,11 +384,12 @@ group { name: "elm/index/item/horizontal/default"; part { name: "base"; type: RECT; mouse_events: 0; scale: 1; description { state: "default" 0.0; - color: 0 0 0 128; + color_class: "/dim/normal/index/item"; offscale; } description { state: "active" 0.0; inherit: "default" 0.0; + color_class: "/dim/selected/index/item"; rel1.offset: 0 -16; } } @@ -399,7 +401,7 @@ group { name: "elm/index/item/horizontal/default"; rel1.offset: 4 4; rel2.relative: 1.0 0.0; rel2.offset: -5 4; - color: 160 160 160 255; + color_class: "/fg/normal/index/item/text"; align: 0.5 0.0; text { font: FNBD; size: 10; min: 1 1; @@ -411,7 +413,7 @@ group { name: "elm/index/item/horizontal/default"; } description { state: "active" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/selected/index/item/text"; } } } @@ -446,11 +448,12 @@ group { name: "elm/index/item_odd/horizontal/default"; part { name: "base"; type: RECT; mouse_events: 0; scale: 1; description { state: "default" 0.0; - color: 0 0 0 128; + color_class: "/dim-alt/normal/index/item"; offscale; } description { state: "active" 0.0; inherit: "default" 0.0; + color_class: "/dim-alt/selected/index/item"; rel1.offset: 0 -16; } } @@ -462,7 +465,7 @@ group { name: "elm/index/item_odd/horizontal/default"; rel1.offset: 4 4; rel2.relative: 1.0 0.0; rel2.offset: -5 4; - color: 160 160 160 255; + color_class: "/fg-alt/normal/index/item/text"; align: 0.5 0.0; text { font: FNBD; size: 10; min: 1 1; @@ -474,7 +477,7 @@ group { name: "elm/index/item_odd/horizontal/default"; } description { state: "active" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg-alt/selected/index/item/text"; } } }