Merge lp:~elementary-design/egtk/greeter-styles into lp:~elementary-design/egtk/trunk

Proposed by Danielle Foré
Status: Merged
Approved by: Danielle Foré
Approved revision: 671
Merged at revision: 672
Proposed branch: lp:~elementary-design/egtk/greeter-styles
Merge into: lp:~elementary-design/egtk/trunk
Diff against target: 68 lines (+19/-8)
1 file modified
gtk-3.0/apps.css (+19/-8)
To merge this branch: bzr merge lp:~elementary-design/egtk/greeter-styles
Reviewer Review Type Date Requested Status
elementary UX Pending
Review via email: mp+297145@code.launchpad.net

Commit message

use greeter class instead of PantheonGreeter

Description of the change

Should be merged at the same time as the greeter time branch

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

Approving since Felipe approved the greeter branch

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'gtk-3.0/apps.css'
--- gtk-3.0/apps.css 2016-06-08 23:09:05 +0000
+++ gtk-3.0/apps.css 2016-06-13 03:12:49 +0000
@@ -186,7 +186,7 @@
186* Greeter *186* Greeter *
187**********/187**********/
188188
189PantheonGreeter .avatar {189.greeter .avatar {
190 border-color: alpha (#000, 0.25);190 border-color: alpha (#000, 0.25);
191191
192 box-shadow: inset 0 0 0 1px alpha (#fff, 0.05),192 box-shadow: inset 0 0 0 1px alpha (#fff, 0.05),
@@ -196,8 +196,8 @@
196 0 2px 6px alpha (#000, 0.10);196 0 2px 6px alpha (#000, 0.10);
197}197}
198198
199PantheonGreeter .entry,199.greeter .entry,
200PantheonGreeter .entry:focus {200.greeter .entry:focus {
201 border-radius: 3.5px;201 border-radius: 3.5px;
202 padding: 6px 3px;202 padding: 6px 3px;
203 background-image: linear-gradient(to bottom,203 background-image: linear-gradient(to bottom,
@@ -210,8 +210,9 @@
210 0 1px 0 alpha (#fff, 0.15);210 0 1px 0 alpha (#fff, 0.15);
211}211}
212212
213PantheonGreeter .button.flat,213.greeter .button.flat,
214PantheonGreeter .h2 {214.greeter .h2,
215.greeter .time {
215 color: #fff;216 color: #fff;
216 text-shadow: 0 0 2px alpha (#000, 0.3),217 text-shadow: 0 0 2px alpha (#000, 0.3),
217 0 1px 2px alpha (#000, 0.6);218 0 1px 2px alpha (#000, 0.6);
@@ -219,11 +220,21 @@
219 0 1px 2px alpha (#000, 0.6);220 0 1px 2px alpha (#000, 0.6);
220}221}
221222
222PantheonGreeter .h2 {223.greeter .h2 {
223 font-size: 24px;224 font-size: 24px;
224}225}
225226
226PantheonGreeter .button.text-button.suggested-action {227.greeter .time {
228 font-size: 72px;
229 font-family: Raleway;
230 font-weight: 100;
231}
232
233.greeter .pm {
234 font-size: 48px;
235}
236
237.greeter .button.text-button.suggested-action {
227 padding: 6px 32px;238 padding: 6px 32px;
228 border-radius: 3.5px;239 border-radius: 3.5px;
229 border-color: rgba(0, 0, 0, 0.10);240 border-color: rgba(0, 0, 0, 0.10);
@@ -233,7 +244,7 @@
233 0 1px 0 0 alpha (#fff, 0.15);244 0 1px 0 0 alpha (#fff, 0.15);
234}245}
235246
236PantheonGreeter .button.text-button.suggested-action:active {247.greeter .button.text-button.suggested-action:active {
237 box-shadow: inset 0 0 0 1px alpha (#000, 0.05),248 box-shadow: inset 0 0 0 1px alpha (#000, 0.05),
238 0 1px 0 0 alpha (#fff, 0.15);249 0 1px 0 0 alpha (#fff, 0.15);
239}250}

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: