Merge lp:~azzar1/ubuntu-themes/fix-osd-progressbar into lp:ubuntu-themes

[Andrea Azzarone]

Fix osd progress bar look.

[Iain Lane (laney)]

Thanks Andrea, I think the affect looks good (for reference https://usercontent.irccloud-cdn.com/file/Zv4nR8bt/VID_20171019_133537.mp4).

But I'm wondering if it's not too specific. I think the intent of the ".osd" rules we have currently was to style toolbar-like things such as we have in totem. So what if we scope those to apply to "toolbar .osd ..." instead?

review: Needs Information

[Andrea Azzarone (azzar1)]

Applying it to "toolbar .osd" does not work here. Maybe because the
progress part is not part of a toolbar?

On Thu, Oct 19, 2017 at 2:24 PM, Iain Lane <email address hidden> wrote:

> Review: Needs Information
>
> Thanks Andrea, I think the affect looks good (for reference
> https://usercontent.irccloud-cdn.com/file/Zv4nR8bt/VID_20171019_133537.mp4
> ).
>
> But I'm wondering if it's not too specific. I think the intent of the
> ".osd" rules we have currently was to style toolbar-like things such as we
> have in totem. So what if we scope those to apply to "toolbar .osd ..."
> instead?
> --
> https://code.launchpad.net/~azzar1/ubuntu-themes/fix-osd-
> progressbar/+merge/332491
> You are the owner of lp:~azzar1/ubuntu-themes/fix-osd-progressbar.
>
> Launchpad-Message-Rationale: Owner
> Launchpad-Message-For: azzar1
> Launchpad-Notification-Type: code-review
> Launchpad-Branch: ~azzar1/ubuntu-themes/fix-osd-progressbar
> Launchpad-Project: ubuntu-themes
>

[Iain Lane (laney)]

On Thu, Oct 19, 2017 at 01:39:22PM -0000, Andrea Azzarone wrote:
> Applying it to "toolbar .osd" does not work here. Maybe because the
> progress part is not part of a toolbar?

I mean apply the existing rules to that class, so that they stop
applying in the progressbar case --- is that what you tried?

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[Iain Lane (laney)]

On Thu, Oct 19, 2017 at 01:51:40PM -0000, Iain Lane wrote:
> On Thu, Oct 19, 2017 at 01:39:22PM -0000, Andrea Azzarone wrote:
> > Applying it to "toolbar .osd" does not work here. Maybe because the
> > progress part is not part of a toolbar?
>
> I mean apply the existing rules to that class, so that they stop
> applying in the progressbar case --- is that what you tried?

Ah, I should have said "toolbar.osd" instead of "toolbar .osd" too...
that is - look for the comment "/* OSD overlays */" and make the
selectors in the group below that "toolbar.osd" instead of ".osd".

Let me know what you think. :)

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[Andrea Azzarone (azzar1)]

If I get it right you are suggesting something like that:
http://paste.ubuntu.com/25773885 ?

On Thu, Oct 19, 2017 at 4:03 PM, Iain Lane <email address hidden> wrote:

> On Thu, Oct 19, 2017 at 01:51:40PM -0000, Iain Lane wrote:
> > On Thu, Oct 19, 2017 at 01:39:22PM -0000, Andrea Azzarone wrote:
> > > Applying it to "toolbar .osd" does not work here. Maybe because the
> > > progress part is not part of a toolbar?
> >
> > I mean apply the existing rules to that class, so that they stop
> > applying in the progressbar case --- is that what you tried?
>
> Ah, I should have said "toolbar.osd" instead of "toolbar .osd" too...
> that is - look for the comment "/* OSD overlays */" and make the
> selectors in the group below that "toolbar.osd" instead of ".osd".
>
> Let me know what you think. :)
>
> --
> Iain Lane [ <email address hidden> ]
> Debian Developer [ <email address hidden> ]
> Ubuntu Developer [ <email address hidden> ]
>
> https://code.launchpad.net/~azzar1/ubuntu-themes/fix-osd-
> progressbar/+merge/332491
> You are the owner of lp:~azzar1/ubuntu-themes/fix-osd-progressbar.
>
> Launchpad-Message-Rationale: Owner
> Launchpad-Message-For: azzar1
> Launchpad-Notification-Type: code-review
> Launchpad-Branch: ~azzar1/ubuntu-themes/fix-osd-progressbar
> Launchpad-Project: ubuntu-themes
>

[Iain Lane (laney)]

On Thu, Oct 19, 2017 at 05:36:35PM -0000, Andrea Azzarone wrote:
> If I get it right you are suggesting something like that:
> http://paste.ubuntu.com/25773885 ?

Yeah, if that works. I'm not sure exactly which rules need updating - I
had something like https://paste.ubuntu.com/25800023/ locally.

I don't have a real opinion on adding the styling for progressbar.osd.
The default theme styling looks good to me but if the border changes are
better for you & others then you can include those.

Cheers!

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[lp:~azzar1/ubuntu-themes/fix-osd-progressbar]

585. By Andrea Azzarone on 2017-10-31

s\^.osd\toolbar.osd\g

[Andrea Azzarone (azzar1)]

Fixed.

[Iain Lane (laney)]

nice!

I guess this should live in b only for a bit, to see if it breaks anything else, before SRUing.

review: Approve

=== modified file 'Ambiance/gtk-3.20/gtk-widgets.css'
--- Ambiance/gtk-3.20/gtk-widgets.css	2017-10-12 05:18:40 +0000
+++ Ambiance/gtk-3.20/gtk-widgets.css	2017-10-31 09:14:03 +0000
@@ -2930,26 +2930,26 @@
 
 
 /* OSD overlays */
-.osd,
-.osd:backdrop {
+toolbar.osd,
+toolbar.osd:backdrop {
     color: @osd_fg_color;
     background-color: @osd_bg_color;
     border-color: @osd_border_color;
 }
 
-.osd:backdrop {
+toolbar.osd:backdrop {
     border-color: lighter (@osd_border_color);
 }
 
-.osd.toolbar {
+toolbar.osd.toolbar {
     padding: 12px;
     border-radius: 8px;
 }
 
-.osd button,
-.osd button:backdrop,
-.osd button.destructive-action,
-.osd button.destructive-action:backdrop {
+toolbar.osd button,
+toolbar.osd button:backdrop,
+toolbar.osd button.destructive-action,
+toolbar.osd button.destructive-action:backdrop {
     color: @osd_fg_color;
     background: none;
     border: none;
@@ -2980,24 +2980,37 @@
 
 button.osd:hover,
 button.osd.destructive-action:hover,
-.osd button:hover,
-.osd button.destructive-action:hover {
+toolbar.osd button:hover,
+toolbar.osd button.destructive-action:hover {
     color: lighter(@osd_fg_color);
     -gtk-icon-shadow: 0 0 3px @osd_fg_color;
 }
 
 button.osd:active,
-.osd button:active {
+toolbar.osd button:active {
     color: darker(@osd_fg_color);
     -gtk-icon-shadow: none;
 }
 
 button.osd.destructive-action:active,
-.osd button.destructive-action:active {
+toolbar.osd button.destructive-action:active {
     color: shade(@osd_fg_color, 0.9);
     -gtk-icon-shadow: none;
 }
 
+progressbar.osd {
+    padding: 0px;
+    border-radius: 0;
+}
+
+progressbar.osd trough {
+    border-radius: 0;
+}
+
+progressbar.osd progress {
+    border-radius: 0;
+}
+
 /*************
  * overshoot *
  *************/

=== modified file 'Radiance/gtk-3.20/gtk-widgets.css'
--- Radiance/gtk-3.20/gtk-widgets.css	2017-10-12 05:18:40 +0000
+++ Radiance/gtk-3.20/gtk-widgets.css	2017-10-31 09:14:03 +0000
@@ -2926,26 +2926,26 @@
 
 
 /* OSD overlays */
-.osd,
-.osd:backdrop {
+toolbar.osd,
+toolbar.osd:backdrop {
     color: @osd_fg_color;
     background-color: @osd_bg_color;
     border-color: @osd_border_color;
 }
 
-.osd:backdrop {
+toolbar.osd:backdrop {
     border-color: lighter (@osd_border_color);
 }
 
-.osd.toolbar {
+toolbar.osd.toolbar {
     padding: 12px;
     border-radius: 8px;
 }
 
-.osd button,
-.osd button:backdrop,
-.osd button.destructive-action,
-.osd button.destructive-action:backdrop {
+toolbar.osd button,
+toolbar.osd button:backdrop,
+toolbar.osd button.destructive-action,
+toolbar.osd button.destructive-action:backdrop {
     color: @osd_fg_color;
     background: none;
     border: none;
@@ -2976,24 +2976,37 @@
 
 button.osd:hover,
 button.osd.destructive-action:hover,
-.osd button:hover,
-.osd button.destructive-action:hover {
+toolbar.osd button:hover,
+toolbar.osd button.destructive-action:hover {
     color: lighter(@osd_fg_color);
     -gtk-icon-shadow: 0 0 3px @osd_fg_color;
 }
 
 button.osd:active,
-.osd button:active {
+toolbar.osd button:active {
     color: darker(@osd_fg_color);
     -gtk-icon-shadow: none;
 }
 
 button.osd.destructive-action:active,
-.osd button.destructive-action:active {
+toolbar.osd button.destructive-action:active {
     color: shade(@osd_fg_color, 0.9);
     -gtk-icon-shadow: none;
 }
 
+progressbar.osd {
+    padding: 0px;
+    border-radius: 0;
+}
+
+progressbar.osd trough {
+    border-radius: 0;
+}
+
+progressbar.osd progress {
+    border-radius: 0;
+}
+
 /*************
  * overshoot *
  *************/