[EGIT] [core/efl] master 01/02: elm theme - more cc
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7fcf5a4f177dfd57087d4fcbed1dc56f7d30d884 commit 7fcf5a4f177dfd57087d4fcbed1dc56f7d30d884 Author: Carsten Haitzler (Rasterman) Date: Wed Jun 16 17:34:22 2021 +0100 elm theme - more cc --- data/elementary/themes/colorclasses.edc | 31 ++ data/elementary/themes/edc/comp_compat.edc | 87 - data/elementary/themes/edc/comp_effects.edc | 8 +-- data/elementary/themes/edc/connman.edc | 65 ++--- 4 files changed, 103 insertions(+), 88 deletions(-) diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc index 2870295217..2f5b482897 100644 --- a/data/elementary/themes/colorclasses.edc +++ b/data/elementary/themes/colorclasses.edc @@ -304,6 +304,37 @@ color_classes { color: 255 255 255 255; } color_class { name: "/fg/normal/gadgets/battery/text/time"; color: 255 255 255 255; } +/// + color_class { name: "/fg/disabled/gadgets/connman/eth/cable"; + color: 160 160 160 128; } + color_class { name: "/fg/normal/gadgets/connman/eth/cable"; + color: 160 160 160 255; } + color_class { name: "/fg/selected/gadgets/connman/eth/cable"; + color: 51 153 255 255; } + color_class { name: "/fg/disabled/gadgets/connman/eth/connector"; + color: 160 160 160 128; } + color_class { name: "/fg/normal/gadgets/connman/eth/connector"; + color: 160 160 160 255; } + color_class { name: "/fg/selected/gadgets/connman/eth/connector"; + color: 160 160 160 255; } + color_class { name: "/fg/disabled/gadgets/connman/wifi/connected"; + color: 160 160 160 255; } + color_class { name: "/fg/normal/gadgets/connman/wifi/connected"; + color: 160 160 160 255; } + color_class { name: "/fg/selected/gadgets/connman/wifi/connected"; + color: 51 153 255 255; } + color_class { name: "/fg/normal/gadgets/connman/wifi/signal"; + color: 160 160 160 255; } + color_class { name: "/fg/normal/gadgets/connman/bt/base"; + color: 160 160 160 255; } + color_class { name: "/fg/normal/gadgets/connman/bt/signal"; + color: 160 160 160 255; } + color_class { name: "/fg/normal/gadgets/connman/cell/base"; + color: 160 160 160 255; } + color_class { name: "/fg/normal/gadgets/connman/cell/signal"; + color: 160 160 160 255; } + color_class { name: "/fg/normal/gadgets/connman/security"; + color: 160 160 160 255; } /// color_class { name: "/fg/normal/gadgets/bluez/off"; color: 160 160 160 128; } diff --git a/data/elementary/themes/edc/comp_compat.edc b/data/elementary/themes/edc/comp_compat.edc index c9646aa5d0..e1b2f18607 100644 --- a/data/elementary/themes/edc/comp_compat.edc +++ b/data/elementary/themes/edc/comp_compat.edc @@ -8,12 +8,12 @@ group { name: "e/comp/border/default"; rel1.offset: - -; rel2.relative: 2.0 2.0; rel2.offset: ; -color: 255 255 255 0; +color: 255 255 255 0; // no cc visible: 0; } description { state: "visible" 0.0; inherit: "default" 0.0; -color: 255 255 255 255; +color: 255 255 255 255; // no cc visible: 1; } } @@ -27,7 +27,18 @@ group { name: "e/comp/border/default"; visible: 0; } } - WIN_SHAD("e.swallow.content", "shadow", "win_shad_flat.png", 21, 21, 14, 28, 0.5) + part { name: "focus-shadow"; type: RECT; + clip_to: "shadow"; + description { state: "default" 0.0; +rel.to: "clipper"; +color_class: "/shadow/normal/comp/win"; + } + description { state: "focused" 0.0; +inherit; +color_class: "/shadow/selected/comp/win"; + } + } + WIN_SHAD("e.swallow.content", "focus-shadow", "win_shad_flat.png", 21, 21, 14, 28, 0.5) part { name: "shower"; type: SPACER; description { state: "default" 0.0; rel1.relative: 0.05 0.05; @@ -51,10 +62,11 @@ group { name: "e/comp/border/default"; mouse_events: 0; description { state: "default" 0.0; rel.to: "clipper"; +color_class: "/bg/normal/comp/win"; } description { state: "focused" 0.0; inherit: "default" 0.0; -color: 255 255 255 255; +color_class: "/bg/selected/comp/win"; } } part { name: "e.swallow.content"; type: SWALLOW; @@ -65,19 +77,15 @@ group { name: "e/comp/border/default"; } } programs { - program { - signal: "e,state,shadow,on"; source: "e"; + program { signal: "e,state,shadow,on"; source: "e"; action: STATE_SET "default"
[EGIT] [core/efl] master 02/02: elm theme - more cc
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=dc621dc6ca23c851b4ba15660f195d7f35a01c6c commit dc621dc6ca23c851b4ba15660f195d7f35a01c6c Author: Carsten Haitzler (Rasterman) Date: Wed Jun 16 20:00:21 2021 +0100 elm theme - more cc --- data/elementary/themes/colorclasses.edc| 13 ++ data/elementary/themes/edc/clock.edc | 20 +-- data/elementary/themes/edc/cpufreq.edc | 99 +-- data/elementary/themes/img/cpu_clip_1-040.png | Bin 0 -> 779 bytes data/elementary/themes/img/cpu_clip_1-080.png | Bin 0 -> 1612 bytes data/elementary/themes/img/cpu_clip_1-160.png | Bin 0 -> 3530 bytes data/elementary/themes/img/cpu_clip_2-040.png | Bin 0 -> 697 bytes data/elementary/themes/img/cpu_clip_2-080.png | Bin 0 -> 1395 bytes data/elementary/themes/img/cpu_clip_2-160.png | Bin 0 -> 2865 bytes data/elementary/themes/img/cpu_clip_3-040.png | Bin 0 -> 556 bytes data/elementary/themes/img/cpu_clip_3-080.png | Bin 0 -> 1084 bytes data/elementary/themes/img/cpu_clip_3-160.png | Bin 0 -> 2309 bytes data/elementary/themes/img/cpu_detail-040.png | Bin 0 -> 200 bytes data/elementary/themes/img/cpu_detail-080.png | Bin 0 -> 275 bytes data/elementary/themes/img/cpu_detail-160.png | Bin 0 -> 474 bytes data/elementary/themes/img/cpu_markers-040.png | Bin 0 -> 235 bytes data/elementary/themes/img/cpu_markers-080.png | Bin 0 -> 398 bytes data/elementary/themes/img/cpu_markers-160.png | Bin 0 -> 742 bytes data/elementary/themes/img/svg/cpufreq.svg | 165 + 19 files changed, 251 insertions(+), 46 deletions(-) diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc index 2f5b482897..de6788c216 100644 --- a/data/elementary/themes/colorclasses.edc +++ b/data/elementary/themes/colorclasses.edc @@ -365,6 +365,19 @@ color_classes { color: 255 255 255 255; } color_class { name: "/fg/normal/gadgets/clock/cal/daydate-sep"; color: 255 255 255 32; } +/// + color_class { name: "/bg/normal/gadgets/cpufreq/base"; + color: 32 32 32 255; } + color_class { name: "/bg/normal/gadgets/cpufreq/detail"; + color: 56 56 56 255; } + color_class { name: "/fg/normal/gadgets/cpufreq/text"; + color: 255 255 255 255; } + color_class { name: "/fg/normal/gadgets/cpufreq/hands/min"; + color: 51 153 255 255; } + color_class { name: "/fg/normal/gadgets/cpufreq/hands/max"; + color: 255 51 153 255; } + color_class { name: "/fg/normal/gadgets/cpufreq/hands/average"; + color: 255 153 51 255; } diff --git a/data/elementary/themes/edc/clock.edc b/data/elementary/themes/edc/clock.edc index 27812d64aa..bfd77c642f 100644 --- a/data/elementary/themes/edc/clock.edc +++ b/data/elementary/themes/edc/clock.edc @@ -516,29 +516,29 @@ group { name: "e/modules/clock/digital"; group { name: "e/modules/clock/main"; set { name: "clock_base"; - image { image: "clock_base-040.png" COMP; size: 81 81 9 9; } + image { image: "clock_base-160.png" COMP; size: 81 81 9 9; } image { image: "clock_base-080.png" COMP; size: 41 41 80 80; } - image { image: "clock_base-160.png" COMP; size: 0 0 40 40; } + image { image: "clock_base-040.png" COMP; size: 0 0 40 40; } } set { name: "clock_base_digits"; - image { image: "clock_base_digits-040.png" COMP; size: 81 81 9 9; } + image { image: "clock_base_digits-160.png" COMP; size: 81 81 9 9; } image { image: "clock_base_digits-080.png" COMP; size: 41 41 80 80; } - image { image: "clock_base_digits-160.png" COMP; size: 0 0 40 40; } + image { image: "clock_base_digits-040.png" COMP; size: 0 0 40 40; } } set { name: "clock_hand_secs"; - image { image: "clock_hand_secs-040.png" COMP; size: 81 81 9 9; } + image { image: "clock_hand_secs-160.png" COMP; size: 81 81 9 9; } image { image: "clock_hand_secs-080.png" COMP; size: 41 41 80 80; } - image { image: "clock_hand_secs-160.png" COMP; size: 0 0 40 40; } + image { image: "clock_hand_secs-040.png" COMP; size: 0 0 40 40; } } set { name: "clock_hand_mins"; - image { image: "clock_hand_mins-040.png" COMP; size: 81 81 9 9; } + image { image: "clock_hand_mins-160.png" COMP; size: 81 81 9 9; } image { image: "clock_hand_mins-080.png" COMP; size: 41 41 80 80; } - image { image: "clock_hand_mins-160.png" COMP; size: 0 0 40 40; } + image { image: "clock_hand_mins-040.png" COMP; size: 0 0 40 40; } } set { name: "clock_hand_hours"; - image { image: "clock_hand_hours-040.png" COMP; size: 81 81 9 9; } + image { image: "clock_hand_hours-160.png" COMP; size: 81 81 9 9; } image { image: "clock_hand_hours-080.png" COMP; size: 41 41 80 80; } - image {