Merge lp:~philip.scott/egtk/pulse-animations into lp:~elementary-design/egtk/trunk

Proposed by Felipe Escoto
Status: Merged
Approved by: Danielle Foré
Approved revision: 682
Merged at revision: 682
Proposed branch: lp:~philip.scott/egtk/pulse-animations
Merge into: lp:~elementary-design/egtk/trunk
Diff against target: 74 lines (+47/-0)
3 files modified
gtk-3.0/animate.css (+44/-0)
gtk-3.0/gtk-dark.css (+2/-0)
gtk-3.0/gtk.css (+1/-0)
To merge this branch: bzr merge lp:~philip.scott/egtk/pulse-animations
Reviewer Review Type Date Requested Status
Danielle Foré Needs Fixing
Review via email: mp+301574@code.launchpad.net

Commit message

Pulse animations added

Description of the change

Adds pulsing animations for Success, error and warning.

Success will be used as feedback on Audience whenever something get's added to the playlist, and the error pulse could be used for the sound indicator when muted, and the power indicator when the battery is low.

To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) wrote :

A few diff comments.

Instead of doing .pulse-foo it's better to do .pulse.foo

don't mix success and attention. There is already a success_color

review: Needs Fixing
Revision history for this message
Danielle Foré (danrabbit) wrote :

I think the animation duration is a bit too long. At 1s, it will only play once before the seekbar hides in Audience and it starts blue so it's really easy to miss. Maybe something shorter like 500 or 600ms

682. By Felipe Escoto

Add pulse animations

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'gtk-3.0/animate.css'
2--- gtk-3.0/animate.css 1970-01-01 00:00:00 +0000
3+++ gtk-3.0/animate.css 2016-08-01 19:02:07 +0000
4@@ -0,0 +1,44 @@
5+/* Copyright 2016 elementary LLC.
6+*
7+* This file is part of the elementary GTK theme.
8+*
9+* The elementary GTK theme is free software: you can redistribute it
10+* and/or modify it under the terms of the GNU General Public License as
11+* published by the Free Software Foundation, either version 3 of the
12+* License, or (at your option) any later version.
13+*
14+* The elementary GTK theme is distributed in the hope that it will be
15+* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
16+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
17+* Public License for more details.
18+*
19+* You should have received a copy of the GNU General Public License along
20+* with the elementary GTK theme. If not, see http://www.gnu.org/licenses/.
21+*/
22+
23+.pulse {
24+ animation: pulse 500ms infinite;
25+ animation-direction: alternate;
26+}
27+
28+.pulse.attention {
29+ color: @attention_color;
30+}
31+
32+.pulse.success {
33+ color: @success_color;
34+}
35+
36+.pulse.warning {
37+ color: @warning_color;
38+}
39+
40+.pulse.error {
41+ color: @error_color;
42+}
43+
44+@keyframes pulse {
45+ 0% {
46+ color: inherit;
47+ }
48+}
49
50=== modified file 'gtk-3.0/gtk-dark.css'
51--- gtk-3.0/gtk-dark.css 2016-04-17 15:28:06 +0000
52+++ gtk-3.0/gtk-dark.css 2016-08-01 19:02:07 +0000
53@@ -61,6 +61,7 @@
54 @define-color theme_selected_bg_color @selected_bg_color;
55 @define-color theme_selected_fg_color @selected_fg_color;
56
57+@define-color attention_color #3d9bda;
58 @define-color link_color #08C;
59 @define-color frame_color #8a9580;
60 @define-color inactive_frame_color #c7ccc1;
61@@ -86,3 +87,4 @@
62 @import url("gtk-widgets-dark.css");
63 @import url("granite-widgets.css");
64 @import url("apps.css");
65+@import url("animate.css");
66
67=== modified file 'gtk-3.0/gtk.css'
68--- gtk-3.0/gtk.css 2016-04-17 15:28:06 +0000
69+++ gtk-3.0/gtk.css 2016-08-01 19:02:07 +0000
70@@ -78,3 +78,4 @@
71 @import url("gtk-widgets.css");
72 @import url("granite-widgets.css");
73 @import url("apps.css");
74+@import url("animate.css");

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: