elementary Stylesheet

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

  1. greeter-styles
  2. Merge into 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
1=== modified file 'gtk-3.0/apps.css'
2--- gtk-3.0/apps.css 2016-06-08 23:09:05 +0000
3+++ gtk-3.0/apps.css 2016-06-13 03:12:49 +0000
4@@ -186,7 +186,7 @@
5 * Greeter *
6 **********/
7
8-PantheonGreeter .avatar {
9+.greeter .avatar {
10 border-color: alpha (#000, 0.25);
11
12 box-shadow: inset 0 0 0 1px alpha (#fff, 0.05),
13@@ -196,8 +196,8 @@
14 0 2px 6px alpha (#000, 0.10);
15 }
16
17-PantheonGreeter .entry,
18-PantheonGreeter .entry:focus {
19+.greeter .entry,
20+.greeter .entry:focus {
21 border-radius: 3.5px;
22 padding: 6px 3px;
23 background-image: linear-gradient(to bottom,
24@@ -210,8 +210,9 @@
25 0 1px 0 alpha (#fff, 0.15);
26 }
27
28-PantheonGreeter .button.flat,
29-PantheonGreeter .h2 {
30+.greeter .button.flat,
31+.greeter .h2,
32+.greeter .time {
33 color: #fff;
34 text-shadow: 0 0 2px alpha (#000, 0.3),
35 0 1px 2px alpha (#000, 0.6);
36@@ -219,11 +220,21 @@
37 0 1px 2px alpha (#000, 0.6);
38 }
39
40-PantheonGreeter .h2 {
41+.greeter .h2 {
42 font-size: 24px;
43 }
44
45-PantheonGreeter .button.text-button.suggested-action {
46+.greeter .time {
47+ font-size: 72px;
48+ font-family: Raleway;
49+ font-weight: 100;
50+}
51+
52+.greeter .pm {
53+ font-size: 48px;
54+}
55+
56+.greeter .button.text-button.suggested-action {
57 padding: 6px 32px;
58 border-radius: 3.5px;
59 border-color: rgba(0, 0, 0, 0.10);
60@@ -233,7 +244,7 @@
61 0 1px 0 0 alpha (#fff, 0.15);
62 }
63
64-PantheonGreeter .button.text-button.suggested-action:active {
65+.greeter .button.text-button.suggested-action:active {
66 box-shadow: inset 0 0 0 1px alpha (#000, 0.05),
67 0 1px 0 0 alpha (#fff, 0.15);
68 }

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: