Merge lp:~roryj/egtk/fix-1293012 into lp:~elementary-design/egtk/trunk

[Rory]

Add padding to GtkWidget child instead. Fixes bug #1293012.

Add padding to GtkWidget child instead. Fixes bug #1293012.

[Cody Garver (codygarver)]

.panel-app-button is now empty so it can be removed

[Danielle Foré (danrabbit)]

I definitely don't want to hardcode the padding. Moving forward, we should be setting styles in CSS, not in code. So I don't agree with this branch.

Maybe we can do something with :first/last-child to replace GtkMenuItem-horizontal-padding. But hardcoding the padding is not a good solution, imo

review: Needs Fixing

[Rory (roryj)]

I understand why you don't want it harcoded - I didn't realise it was possible with CSS but now I know!

I couldn't get :first-child or :last-child to work, so we cannot add extra padding to last indicator on right, however, for the current layout that shouldn't be a problem.

[lp:~roryj/egtk/fix-1293012]

341. By Rory on 2014-09-02

Add padding to GtkWidget child instead.

[Rory (roryj)]

Any reason for not being merged?

=== modified file 'gtk-3.0/apps.css'
--- gtk-3.0/apps.css	2014-08-10 03:54:18 +0000
+++ gtk-3.0/apps.css	2014-09-02 19:32:37 +0000
@@ -134,14 +134,17 @@
     background-color: transparent;
 }
 
-.panel-app-button {
-    -GtkMenuItem-horizontal-padding: 6px;
-}
-
 .composited-indicator {
     background-color: transparent;
     color: #fff;
-    padding: 0 2px;
+}
+
+.composited-indicator > GtkWidget > GtkWidget {
+    padding: 0 2px;    
+}
+
+.panel-app-button > GtkWidget > GtkWidget {
+    padding: 0 2px 0 4px;
 }
 
 .composited-indicator.menuitem:active,
@@ -223,4 +226,4 @@
 
 PantheonTerminalPantheonTerminalWindow.background {
    background-color: transparent;
-}
\ No newline at end of file
+}