Merge lp:~ochosi/lightdm-gtk-greeter/fix-panel-adwaita into lp:~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk

Proposed by Simon Steinbeiß on 2018-03-05
Status: Merged
Merged at revision: 420
Proposed branch: lp:~ochosi/lightdm-gtk-greeter/fix-panel-adwaita
Merge into: lp:~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk
Diff against target: 47 lines (+9/-0)
2 files modified
src/lightdm-gtk-greeter-fallback.css (+5/-0)
src/lightdm-gtk-greeter.glade (+4/-0)
To merge this branch: bzr merge lp:~ochosi/lightdm-gtk-greeter/fix-panel-adwaita
Reviewer Review Type Date Requested Status
Sean Davis 2018-03-05 Pending
Review via email: mp+340773@code.launchpad.net

Description of the change

This is a very simple change that adds the osd (overlay screen display) class to the greeter's panel, making it look as it should in Adwaita.

Note that the semi-transparency could lead to readability issues on certain backgrounds, but these things are up to the themes anyway...

To post a comment you must log in.
414. By Simon Steinbeiß on 2018-03-06

Add some padding to hostname

415. By Simon Steinbeiß on 2018-03-06

Make sure the separators don't alter the panel background

416. By Simon Steinbeiß on 2018-03-08

Add keycap class to login window for rounded corners

417. By Simon Steinbeiß on 2018-03-09

Also add keycap class to restart and shutdown windows

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/lightdm-gtk-greeter-fallback.css'
2--- src/lightdm-gtk-greeter-fallback.css 2015-02-25 08:25:32 +0000
3+++ src/lightdm-gtk-greeter-fallback.css 2018-03-09 22:48:51 +0000
4@@ -10,3 +10,8 @@
5 {
6 padding: 1px;
7 }
8+
9+/* Make sure the GtkSeparatorMenuItems don't alter the overall panel/menubar background */
10+#panel_window menubar > separator { background: transparent; }
11+/* Workaround for Adwaita - and other themes - setting a smaller font for the keycap window */
12+#login_window.keycap, #power_window.keycap { font-size: initial; }
13
14=== modified file 'src/lightdm-gtk-greeter.glade'
15--- src/lightdm-gtk-greeter.glade 2015-06-29 15:11:04 +0000
16+++ src/lightdm-gtk-greeter.glade 2018-03-09 22:48:51 +0000
17@@ -172,12 +172,14 @@
18 <object class="GtkSeparatorMenuItem" id="host_menuitem">
19 <property name="name">host_menuitem</property>
20 <property name="can_focus">False</property>
21+ <property name="margin_left">6</property>
22 </object>
23 </child>
24 </object>
25 </child>
26 <style>
27 <class name="background"/>
28+ <class name="osd"/>
29 </style>
30 </object>
31 <object class="GtkEventBox" id="power_window">
32@@ -319,6 +321,7 @@
33 </child>
34 <style>
35 <class name="background"/>
36+ <class name="keycap"/>
37 </style>
38 </object>
39 <object class="GtkOverlay" id="screen_overlay">
40@@ -584,6 +587,7 @@
41 </child>
42 <style>
43 <class name="background"/>
44+ <class name="keycap"/>
45 </style>
46 </object>
47 </interface>

Subscribers

People subscribed via source and target branches