raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=434fddacdb90b558056dac582ac50ec890125cdf
commit 434fddacdb90b558056dac582ac50ec890125cdf
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Tue May 25 16:20:59 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc | 13 +++++++++
data/elementary/themes/edc/battery.edc | 52 +++++++++++++--------------------
2 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index ed3d5dd94d..a238050487 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -182,6 +182,19 @@ color_classes {
color: 64 64 64 255; }
color_class { name: "/fg/normal/gadgets/backlight/filament/on";
color: 255 220 160 255; }
+///////////////////////////////////////////////////////////////////////////////
+ color_class { name: "/fg/normal/gadgets/battery/text/info";
+ color: 255 255 255 0; }
+ color_class { name: "/fg/selected/gadgets/battery/text/info";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/gadgets/battery/level/discharge";
+ color: 160 160 160 255; }
+ color_class { name: "/fg/normal/gadgets/battery/level/charge";
+ color: 51 153 255 255; }
+ color_class { name: "/fg/normal/gadgets/battery/text/reading";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/gadgets/battery/text/time";
+ color: 255 255 255 255; }
diff --git a/data/elementary/themes/edc/battery.edc
b/data/elementary/themes/edc/battery.edc
index 8a3c4cd36d..7d49a25609 100644
--- a/data/elementary/themes/edc/battery.edc
+++ b/data/elementary/themes/edc/battery.edc
@@ -35,21 +35,11 @@ group { name: "e/modules/battery/main";
}
description { state: "faded" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 128;
- }
- }
- part { name: "fill_clip_dim"; type: RECT;
- clip_to: "pulse_clip";
- description { state: "default" 0.0;
- rel.to: "bg";
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- color: 160 160 160 255;
+ color: 255 255 255 128; // no cc
}
}
part { name: "fill_clip"; type: RECT;
- clip_to: "fill_clip_dim";
+ clip_to: "pulse_clip";
description { state: "default" 0.0;
rel.to: "bg";
}
@@ -57,11 +47,11 @@ group { name: "e/modules/battery/main";
part { name: "info_clip"; type: RECT;
description { state: "default" 0.0;
rel.to: "bg";
- color: 255 255 255 0;
+ color_class: "/fg/normal/gadgets/battery/text/info";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/selected/gadgets/battery/text/info";
}
}
part { name: "bg";
@@ -69,7 +59,7 @@ group { name: "e/modules/battery/main";
description { state: "default" 0.0;
aspect: 1.0 1.0; aspect_preference: BOTH;
image.normal: "bat_base.png";
- color: 32 32 32 255;
+ color_class: "/bg-dark/normal/gadgets/battery/base";
}
}
part { name: "fill";
@@ -77,11 +67,11 @@ group { name: "e/modules/battery/main";
description { state: "default" 0.0;
rel.to: "bg";
image.normal: "bat_base.png";
- color: 160 160 160 255;
+ color_class: "/fg/normal/gadgets/battery/level/discharge";
}
description { state: "charging" 0.0;
inherit: "default" 0.0;
- color: 51 153 255 255;
+ color_class: "/fg/normal/gadgets/battery/level/charge";
}
}
part { name: "e.text.reading"; type: TEXT; mouse_events: 0;
@@ -92,8 +82,8 @@ group { name: "e/modules/battery/main";
rel.to: "bg";
rel1.relative: 0.25 0.15;
rel2.relative: 0.75 0.53;
- color: 255 255 255 255;
- text { font: "Sans"; size: 8;
+ color_class: "/fg/normal/gadgets/battery/text/reading";
+ text { font: FN; size: 8;
min: 0 1;
fit: 1 1;
ellipsis: -1;
@@ -110,8 +100,8 @@ group { name: "e/modules/battery/main";
rel.to: "bg";
rel1.relative: 0.25 0.47;
rel2.relative: 0.75 0.85;
- color: 255 255 255 255;
- text { font: "Sans"; size: 8;
+ color_class: "/fg/normal/gadgets/battery/text/time";
+ text { font: FN; size: 8;
min: 0 1;
fit: 1 1;
ellipsis: -1;
@@ -122,7 +112,7 @@ group { name: "e/modules/battery/main";
}
part { name: "over"; type: RECT;
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
}
}
}
@@ -178,25 +168,23 @@ group { name: "e/modules/battery/main";
action: STATE_SET "visible" 0.0;
transition: SINUSOIDAL 0.3;
target: "info_clip";
- target: "fill_clip_dim";
}
program { signal: "mouse,out"; source: "over";
action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 0.3;
target: "info_clip";
- target: "fill_clip_dim";
}
}
}
group { name: "e/modules/battery/popup";
- min: 320 60;
+ min: 320 80;
parts {
part { name: "e.swallow.battery"; type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
- aspect: 1.0 1.0; aspect_preference: VERTICAL;
- min: 1 1;
- max: 240 160;
+ min: 80 80;
+ max: 80 80;
align: 0.0 0.5;
}
}
@@ -206,8 +194,8 @@ group { name: "e/modules/battery/popup";
rel1.relative: 1.0 0.0;
rel1.to_x: "e.swallow.battery";
rel2.relative: 1.0 0.5;
- color: 160 160 160 255;
- text { font: "Sans:style=Bold"; size: 10;
+ color_class: "/fg/normal/gadgets/battery/popup/title";
+ text { font: FNBD; size: 10;
text: "Your battery is low!";
min: 1 1;
ellipsis: -1;
@@ -220,8 +208,8 @@ group { name: "e/modules/battery/popup";
description { state: "default" 0.0;
rel1.relative: 1.0 0.5;
rel1.to_x: "e.swallow.battery";
- color: 160 160 160 255;
- text { font: "Sans"; size: 10;
+ color_class: "/fg/normal/gadgets/battery/popup/text";
+ text { font: FN; size: 10;
text: "AC power is recommended.";
min: 1 1;
ellipsis: -1;
--
