Merge lp:~3v1n0/ubuntu-themes/panel-rules-ignore-unity into lp:ubuntu-themes

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 501
Proposed branch: lp:~3v1n0/ubuntu-themes/panel-rules-ignore-unity
Merge into: lp:ubuntu-themes
Diff against target: 29 lines (+4/-4)
2 files modified
Ambiance/gtk-3.20/apps/gnome-panel.css (+2/-2)
Radiance/gtk-3.20/apps/gnome-panel.css (+2/-2)
To merge this branch: bzr merge lp:~3v1n0/ubuntu-themes/panel-rules-ignore-unity
Reviewer Review Type Date Requested Status
Dmitry Shachnev Approve
Alberts Muktupāvels (community) Approve
Iain Lane Approve
Review via email: mp+304095@code.launchpad.net

Commit message

gnome-panel: don't apply the gnome-menubar rules to unity decorations and panel too

To post a comment you must log in.
Revision history for this message
Iain Lane (laney) wrote :

It looks good to me, thanks. I want Dmitry or Alberts to sign off too though, please. :)

(Seems unity was using gnome-panel's CSS classes, who knew?)

https://requests.ci-train.ubuntu.com/#/ticket/1876 (ppa:ci-train-ppa-service/landing-099) to test

review: Approve
Revision history for this message
Alberts Muktupāvels (muktupavels) wrote :

Why Unity use gnome-panel* css classes? I think that proper fix is to not use same css classes in Unity. Otherwise similar things/bugs might happen in future, no?

review: Needs Information
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

The reason behind that, is that we want some gnome themes which have been done without unity in mind to still work in unity.

This for example allows to use Adwita without having to define unity classes there.

So there won't be such problems in non-unity themes, but indeed there will be in the ubuntu-ones.

Revision history for this message
Alberts Muktupāvels (muktupavels) wrote :

Adwaita does not have gnome-panel related css... Is there any other example?

Does unity panel really adds these classes to menubar:
.gnome-panel-menu-bar
.unity-panel
.unity-decoration

I would expect that it might look like this:
.unity-panel .gnome-panel-menu-bar { .. }

.unity-panel class added to panel and .gnome-panel-menu-bar to menubar.

Revision history for this message
Dmitry Shachnev (mitya57) wrote :

How about prefixing the rules with panel-toplevel instead of using not()?

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Alberts, I don't know other themes that needed that.. Maybe the high-visibility ones, however in the past we had situations where with "standard gnome" themes the panel wasn't usable, while having this ensures tings would at least work. Not well, but in a better usable way.

> How about prefixing the rules with panel-toplevel instead of using not()?

That was my first idea too

Let me know what you prefer

Revision history for this message
Dmitry Shachnev (mitya57) wrote :

>> How about prefixing the rules with panel-toplevel instead of using not()?
>
> That was my first idea too
>
> Let me know what you prefer

I would prefer prefixing, it looks less hacky.

Revision history for this message
Alberts Muktupāvels (muktupavels) wrote :

Maybe not needed these days if problem was with gnome standard themes?
- GTK+ built-in themes does not have gnome-panel css classes.
- gnome-themes-standard does not have GTK+ 3 theme.

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Quite famous 3rd party themes such as numix defines these... So I didn't want to break them too, but indeed is something we could you think that to be cleaner.

However... I really think that the best way is to use a parent selector too..

I've pushed a change, let me know if it works correctly in your case too.
I'll change unity in the future, but I'd prefer to ensure the theme applies to your case only.

Revision history for this message
Alberts Muktupāvels (muktupavels) :
review: Approve
Revision history for this message
Alberts Muktupāvels (muktupavels) :
review: Needs Fixing
Revision history for this message
Alberts Muktupāvels (muktupavels) wrote :

There is missing `,`...

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

> There is missing `,`...

I noticed when committing, I thought I had saved... But it wasn't the case.

Fixed.

Revision history for this message
Alberts Muktupāvels (muktupavels) wrote :

> Fixed.

Diff still does not have `,`...

502. By Marco Trevisan (Treviño)

gnome-panel: use panel-toplevel as selector

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

It should now...

Revision history for this message
Alberts Muktupāvels (muktupavels) :
review: Approve
Revision history for this message
Dmitry Shachnev (mitya57) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Ambiance/gtk-3.20/apps/gnome-panel.css'
--- Ambiance/gtk-3.20/apps/gnome-panel.css 2016-08-08 21:44:55 +0000
+++ Ambiance/gtk-3.20/apps/gnome-panel.css 2016-08-29 10:08:19 +0000
@@ -6,8 +6,8 @@
6 to (shade (@dark_bg_color, 1.05)));6 to (shade (@dark_bg_color, 1.05)));
7}7}
88
9.gnome-panel-menu-bar:backdrop,9panel-toplevel .gnome-panel-menu-bar:backdrop,
10.gnome-panel-menu-bar,10panel-toplevel .gnome-panel-menu-bar,
11panel-applet > menubar,11panel-applet > menubar,
12clock-box {12clock-box {
13 background: transparent;13 background: transparent;
1414
=== modified file 'Radiance/gtk-3.20/apps/gnome-panel.css'
--- Radiance/gtk-3.20/apps/gnome-panel.css 2016-08-25 17:32:23 +0000
+++ Radiance/gtk-3.20/apps/gnome-panel.css 2016-08-29 10:08:19 +0000
@@ -6,8 +6,8 @@
6 to (shade (@dark_bg_color, 0.95)));6 to (shade (@dark_bg_color, 0.95)));
7}7}
88
9.gnome-panel-menu-bar:backdrop,9panel-toplevel .gnome-panel-menu-bar:backdrop,
10.gnome-panel-menu-bar,10panel-toplevel .gnome-panel-menu-bar,
11panel-applet > menubar,11panel-applet > menubar,
12clock-box {12clock-box {
13 background: transparent;13 background: transparent;

Subscribers

People subscribed via source and target branches