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

Proposed by Simon Steinbeiß
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 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ß

Add some padding to hostname

415. By Simon Steinbeiß

Make sure the separators don't alter the panel background

416. By Simon Steinbeiß

Add keycap class to login window for rounded corners

417. By Simon Steinbeiß

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
=== modified file 'src/lightdm-gtk-greeter-fallback.css'
--- src/lightdm-gtk-greeter-fallback.css 2015-02-25 08:25:32 +0000
+++ src/lightdm-gtk-greeter-fallback.css 2018-03-09 22:48:51 +0000
@@ -10,3 +10,8 @@
10{10{
11 padding: 1px;11 padding: 1px;
12}12}
13
14/* Make sure the GtkSeparatorMenuItems don't alter the overall panel/menubar background */
15#panel_window menubar > separator { background: transparent; }
16/* Workaround for Adwaita - and other themes - setting a smaller font for the keycap window */
17#login_window.keycap, #power_window.keycap { font-size: initial; }
1318
=== modified file 'src/lightdm-gtk-greeter.glade'
--- src/lightdm-gtk-greeter.glade 2015-06-29 15:11:04 +0000
+++ src/lightdm-gtk-greeter.glade 2018-03-09 22:48:51 +0000
@@ -172,12 +172,14 @@
172 <object class="GtkSeparatorMenuItem" id="host_menuitem">172 <object class="GtkSeparatorMenuItem" id="host_menuitem">
173 <property name="name">host_menuitem</property>173 <property name="name">host_menuitem</property>
174 <property name="can_focus">False</property>174 <property name="can_focus">False</property>
175 <property name="margin_left">6</property>
175 </object>176 </object>
176 </child>177 </child>
177 </object>178 </object>
178 </child>179 </child>
179 <style>180 <style>
180 <class name="background"/>181 <class name="background"/>
182 <class name="osd"/>
181 </style>183 </style>
182 </object>184 </object>
183 <object class="GtkEventBox" id="power_window">185 <object class="GtkEventBox" id="power_window">
@@ -319,6 +321,7 @@
319 </child>321 </child>
320 <style>322 <style>
321 <class name="background"/>323 <class name="background"/>
324 <class name="keycap"/>
322 </style>325 </style>
323 </object>326 </object>
324 <object class="GtkOverlay" id="screen_overlay">327 <object class="GtkOverlay" id="screen_overlay">
@@ -584,6 +587,7 @@
584 </child>587 </child>
585 <style>588 <style>
586 <class name="background"/>589 <class name="background"/>
590 <class name="keycap"/>
587 </style>591 </style>
588 </object>592 </object>
589</interface>593</interface>

Subscribers

People subscribed via source and target branches