Merge branch 'feature/themes/flat' into devs/hermet/lottie

This commit is contained in:
Hermet Park 2020-03-17 09:39:11 +09:00
commit 466471e5e8
4 changed files with 10 additions and 4 deletions

View File

@ -492,7 +492,6 @@ group { name: "elm/toolbar/item/default";
rel1.offset: 4 0;
rel2.relative: 1.0 0.0;
rel2.offset: -5 -5;
fixed: 1 1;
}
description { state: "icononly" 0.0;
inherit: "default" 0.0;
@ -532,7 +531,6 @@ group { name: "elm/toolbar/item/default";
rel1.offset: 4 0;
rel2.relative: 1.0 0.0;
rel2.offset: -5 0;
fixed: 1 1;
}
description { state: "icononly" 0.0;
inherit: "default" 0.0;
@ -583,7 +581,7 @@ group { name: "elm/toolbar/item/default";
description { state: "noicon" 0.0;
inherit: "default" 0.0;
rel1.offset: 4 -5;
rel1.relative: 0.0 0.0;
rel1.relative: 0.0 1.0;
}
description { state: "noicon_disabled" 0.0;
inherit: "noicon" 0.0;
@ -636,7 +634,7 @@ group { name: "elm/toolbar/item/default";
description { state: "noicon" 0.0;
inherit: "default" 0.0;
rel1.offset: 4 -5;
rel1.relative: 0.0 0.0;
rel1.relative: 0.0 1.0;
}
description { state: "noicon_disabled" 0.0;
inherit: "noicon" 0.0;

View File

@ -1,4 +1,9 @@
group { name: "e/init/splash";
sounds {
sample { name: "splash" LOSSY 256;
source: "splash.wav";
}
}
set { name: "logo_mono";
image { image: "logo.png" COMP; size: 601 601 99999 99999; }
image { image: "logo2.png" COMP; size: 301 301 600 600; }
@ -132,6 +137,9 @@ group { name: "e/init/splash";
transition: SINUSOIDAL 0.8;
after: "ready";
}
program { signal: "show"; source: "";
action: PLAY_SAMPLE "splash" 1.0 EFFECT;
}
program { name: "ready";
script {
new val;

Binary file not shown.

Binary file not shown.