Merge lp:~larsu/ubuntu-themes/unity-greeter-pw-entry into lp:ubuntu-themes

Proposed by Lars Karlitski
Status: Merged
Approved by: Dmitry Shachnev
Approved revision: 416
Merged at revision: 415
Proposed branch: lp:~larsu/ubuntu-themes/unity-greeter-pw-entry
Merge into: lp:ubuntu-themes
Diff against target: 148 lines (+109/-0)
5 files modified
Ambiance/gtk-3.0/apps/unity-greeter.css (+9/-0)
Ambiance/gtk-3.0/apps/unity.css (+11/-0)
Radiance/gtk-3.0/apps/unity-greeter.css (+78/-0)
Radiance/gtk-3.0/apps/unity.css (+10/-0)
Radiance/gtk-3.0/gtk-main.css (+1/-0)
To merge this branch: bzr merge lp:~larsu/ubuntu-themes/unity-greeter-pw-entry
Reviewer Review Type Date Requested Status
Dmitry Shachnev Approve
PS Jenkins bot (community) continuous-integration Approve
Dmitry Pending
Review via email: mp+247771@code.launchpad.net

Commit message

Set and animate spinner icon for password entry in unity-greeter and sound menu's playback item.

Description of the change

unity: set and animate spinner icons for various unity widgets

To post a comment you must log in.
416. By Lars Karlitski

unity panel: set and animate spinner icon for sound menu's playback item

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

You added wrong Dmitry to reviewers :)

Anyway, LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Ambiance/gtk-3.0/apps/unity-greeter.css'
2--- Ambiance/gtk-3.0/apps/unity-greeter.css 2015-01-15 13:15:40 +0000
3+++ Ambiance/gtk-3.0/apps/unity-greeter.css 2015-01-27 21:19:15 +0000
4@@ -67,3 +67,12 @@
5 .lightdm.entry:selected {
6 background-color: alpha (white, 0.2);
7 }
8+
9+@keyframes dashentry_spinner {
10+ to { -gtk-icon-transform: rotate(1turn); }
11+}
12+
13+.lightdm.entry:active {
14+ -gtk-icon-source: -gtk-icontheme("process-working-symbolic");
15+ animation: dashentry_spinner 1s infinite linear;
16+}
17
18=== modified file 'Ambiance/gtk-3.0/apps/unity.css'
19--- Ambiance/gtk-3.0/apps/unity.css 2014-03-31 20:51:28 +0000
20+++ Ambiance/gtk-3.0/apps/unity.css 2015-01-27 21:19:15 +0000
21@@ -120,3 +120,14 @@
22 from (shade (@dark_bg_color, 1.5)),
23 to (shade (@dark_bg_color, 1.11)));
24 }
25+
26+
27+@keyframes playbackmenuitem_spinner {
28+ to { -gtk-icon-transform: rotate(1turn); }
29+}
30+
31+.menu IdoPlaybackMenuItem.menuitem:active {
32+ -gtk-icon-source: -gtk-icontheme("process-working-symbolic");
33+ animation: playbackmenuitem_spinner 1s infinite linear;
34+ color: @selected_bg_color;
35+}
36
37=== added file 'Radiance/gtk-3.0/apps/unity-greeter.css'
38--- Radiance/gtk-3.0/apps/unity-greeter.css 1970-01-01 00:00:00 +0000
39+++ Radiance/gtk-3.0/apps/unity-greeter.css 2015-01-27 21:19:15 +0000
40@@ -0,0 +1,78 @@
41+.lightdm.menu {
42+ background-image: none;
43+ background-color: alpha (black, 0.6);
44+ border-color: alpha (white, 0.2);
45+ border-radius: 4px;
46+ padding: 1px;
47+
48+ color: white;
49+}
50+
51+.lightdm-combo .menu {
52+ background-color: shade (@dark_bg_color, 1.08);
53+ border-radius: 0px;
54+ padding: 0px;
55+
56+ color: white;
57+}
58+
59+.lightdm.menu .menuitem *,
60+.lightdm.menu .menuitem.check:active,
61+.lightdm.menu .menuitem.radio:active {
62+ color: white;
63+}
64+
65+.lightdm.menubar {
66+ background-image: none;
67+ background-color: alpha (black, 0.5);
68+}
69+
70+.lightdm-combo.combobox-entry .button,
71+.lightdm-combo .cell,
72+.lightdm-combo .button,
73+.lightdm-combo .entry,
74+.lightdm.button,
75+.lightdm.entry {
76+ background-image: none;
77+ background-color: alpha (black, 0.3);
78+ border-color: alpha (white, 0.6);
79+ border-radius: 5px;
80+ padding: 7px;
81+
82+ color: white;
83+ text-shadow: none;
84+}
85+
86+.lightdm.button,
87+.lightdm.button:hover,
88+.lightdm.button:active,
89+.lightdm.button:active:focused,
90+.lightdm.entry,
91+.lightdm.entry:hover,
92+.lightdm.entry:active,
93+.lightdm.entry:active:focused {
94+ background-image: none;
95+ border-image: none;
96+}
97+
98+.lightdm.button:focused,
99+.lightdm.entry:focused {
100+ border-color: alpha (white, 0.9);
101+ border-width: 1px;
102+ border-style: solid;
103+
104+ color: white;
105+}
106+
107+.lightdm.entry:selected {
108+ background-color: alpha (white, 0.2);
109+}
110+
111+@keyframes dashentry_spinner {
112+ to { -gtk-icon-transform: rotate(1turn); }
113+}
114+
115+.lightdm.entry:active {
116+ -gtk-icon-source: -gtk-icontheme("process-working-symbolic");
117+ animation: dashentry_spinner 1s infinite linear;
118+}
119
120=== modified file 'Radiance/gtk-3.0/apps/unity.css'
121--- Radiance/gtk-3.0/apps/unity.css 2014-03-31 20:51:28 +0000
122+++ Radiance/gtk-3.0/apps/unity.css 2015-01-27 21:19:15 +0000
123@@ -119,3 +119,13 @@
124 from (shade (@dark_bg_color, 1.5)),
125 to (shade (@dark_bg_color, 1.02)));
126 }
127+
128+@keyframes playbackmenuitem_spinner {
129+ to { -gtk-icon-transform: rotate(1turn); }
130+}
131+
132+.menu IdoPlaybackMenuItem.menuitem:active {
133+ -gtk-icon-source: -gtk-icontheme("process-working-symbolic");
134+ animation: playbackmenuitem_spinner 1s infinite linear;
135+ color: @selected_bg_color;
136+}
137
138=== modified file 'Radiance/gtk-3.0/gtk-main.css'
139--- Radiance/gtk-3.0/gtk-main.css 2015-01-15 13:15:40 +0000
140+++ Radiance/gtk-3.0/gtk-main.css 2015-01-27 21:19:15 +0000
141@@ -46,6 +46,7 @@
142 @import url("gtk-widgets.css");
143 @import url("gtk-widgets-radiance.css");
144 @import url("apps/unity.css");
145+@import url("apps/unity-greeter.css");
146 @import url("apps/baobab.css");
147 @import url("apps/gedit.css");
148 @import url("apps/nautilus.css");

Subscribers

People subscribed via source and target branches