Merge lp:~laney/ubuntu-themes/lp1578810-xenial into lp:ubuntu-themes

[Iain Lane]

Dim images of insensitive widgets. Thanks Marc-Andre Laperle.

Unmerged revisions

485. By Iain Lane on 2016-10-24

Dim images of insensitive widgets. Thanks Marc-Andre Laperle.

484. By CI Train Bot Account on 2016-08-04

Releasing 14.04+16.04.20160804-0ubuntu1

483. By Will Cooke on 2016-08-04

Adds specific border widths to left and right of GtkSwitch buttons to hide the overflowing background of the button. (LP: #1594816)

Approved by: Dmitry Shachnev

482. By Dmitry Shachnev on 2016-08-04

Simplify Metacity theme by replacing solid color image with filled rectangle to improve HiDPI support. (LP: #1603218)

Approved by: Alberts Muktupāvels, Iain Lane

481. By CI Train Bot Account on 2016-06-21

Releasing 14.04+16.04.20160621-0ubuntu1

480. By Iain Lane on 2016-06-21

Re-style progress bars to fix them having a border but no background, for example in gnome-system-monitor. (LP: #1052936)

479. By Iain Lane on 2016-05-24

releasing package ubuntu-themes version 14.04+16.04.20160415-0ubuntu2

478. By Iain Lane on 2016-05-24

Update Vcs-Bzr for 16.04

477. By Iain Lane on 2016-05-24

Adds Terminal specific CSS to change tab colours making it easier to
distinguish the current selected tab from the others. Design have reviewed
and ack'd. LP: #762349

=== modified file 'Ambiance/gtk-3.0/gtk-widgets-borders.css'
--- Ambiance/gtk-3.0/gtk-widgets-borders.css	2016-08-19 17:01:56 +0000
+++ Ambiance/gtk-3.0/gtk-widgets-borders.css	2016-10-24 16:23:20 +0000
@@ -215,9 +215,15 @@
 /* XXX temporary */
 GtkSwitch.slider:active:backdrop,
 GtkSwitch.slider:active:insensitive {
+<<<<<<< TREE
     border-image: -gtk-scaled(url("assets/switch-button-on-disabled.png"),url("assets/[e-mail]")) 9 11 9 11 / 9px 11px 9px 11px stretch;
 }
 
+=======
+    border-image: url("assets/switch-button-on-disabled.png") 9 11 9 11 / 9px 11px 9px 11px stretch;
+}
+
+>>>>>>> MERGE-SOURCE
 .scale.trough {
     border-image: -gtk-scaled(url("assets/scale-horizontal-trough.png"),url("assets/[e-mail]")) 2 6 2 6 / 2px 6px 2px 6px stretch;
 }

=== modified file 'Ambiance/gtk-3.0/gtk-widgets.css'
--- Ambiance/gtk-3.0/gtk-widgets.css	2016-08-19 14:52:58 +0000
+++ Ambiance/gtk-3.0/gtk-widgets.css	2016-10-24 16:23:20 +0000
@@ -2144,6 +2144,7 @@
 *:insensitive {
     color: shade (@bg_color, 0.6);
     text-shadow: 0 1px alpha (shade (@bg_color, 1.25), 0.5);
+    -gtk-image-effect: dim;
 }
 
 *:selected,

=== modified file 'Radiance/gtk-3.0/gtk-widgets-borders.css'
--- Radiance/gtk-3.0/gtk-widgets-borders.css	2016-08-19 17:01:56 +0000
+++ Radiance/gtk-3.0/gtk-widgets-borders.css	2016-10-24 16:23:20 +0000
@@ -224,9 +224,15 @@
 /* XXX temporary */
 GtkSwitch.slider:active:backdrop,
 GtkSwitch.slider:active:insensitive {
+<<<<<<< TREE
     border-image: -gtk-scaled(url("assets/switch-button-on-disabled.png"),url("assets/[e-mail]")) 9 11 9 11 / 9px 11px 9px 11px stretch;
 }
 
+=======
+    border-image: url("assets/switch-button-on-disabled.png") 9 11 9 11 / 9px 11px 9px 11px stretch;
+}
+
+>>>>>>> MERGE-SOURCE
 .scale.trough {
     border-image: -gtk-scaled(url("assets/scale-horizontal-trough.png"),url("assets/[e-mail]")) 2 6 2 6 / 2px 6px 2px 6px stretch;
 }

=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
--- Radiance/gtk-3.0/gtk-widgets.css	2016-09-26 13:17:51 +0000
+++ Radiance/gtk-3.0/gtk-widgets.css	2016-10-24 16:23:20 +0000
@@ -2158,6 +2158,7 @@
 *:insensitive {
     color: shade (@bg_color, 0.6);
     text-shadow: 0 1px alpha (shade (@bg_color, 1.25), 0.5);
+    -gtk-image-effect: dim;
 }
 
 *:selected,

=== modified file 'debian/changelog'
--- debian/changelog	2016-10-07 16:30:52 +0000
+++ debian/changelog	2016-10-24 16:23:20 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 ubuntu-themes (16.10+16.10.20161007-0ubuntu1) yakkety; urgency=medium
 
   [ Martin Wimpress ]
@@ -153,6 +154,55 @@
 
  -- Sebastien Bacher <[e-mail]>  Fri, 15 Apr 2016 19:49:25 +0000
 
+=======
+ubuntu-themes (14.04+16.04.20160804-0ubuntu1) xenial; urgency=medium
+
+  [ Dmitry Shachnev ]
+  * Simplify Metacity theme by replacing solid color image with filled
+    rectangle to improve HiDPI support. (LP: #1603218)
+
+  [ [e-mail] ]
+  * Adds specific border widths to left and right of GtkSwitch buttons
+    to hide the overflowing background of the button. (LP: #1594816)
+
+ -- Dmitry Shachnev <[e-mail]>  Thu, 04 Aug 2016 17:59:45 +0000
+
+ubuntu-themes (14.04+16.04.20160621-0ubuntu1) xenial; urgency=medium
+
+  [ Iain Lane ]
+  * Re-style progress bars to fix them having a border but no
+    background, for example in gnome-system-monitor. (LP: #1052936)
+
+ -- [e-mail] <[e-mail]>  Tue, 21 Jun 2016 08:08:37 +0000
+
+ubuntu-themes (14.04+16.04.20160415-0ubuntu2) xenial; urgency=medium
+
+  [ Will Cooke ]
+  * Adds Terminal specific CSS to change tab colours making it easier to
+    distinguish the current selected tab from the others. Design have reviewed
+    and ack'd. LP: #762349
+
+  [ Iain Lane ]
+  * Update Vcs-Bzr for 16.04
+
+ -- Iain Lane <[e-mail]>  Tue, 24 May 2016 10:54:25 +0100
+
+ubuntu-themes (14.04+16.04.20160415-0ubuntu1) xenial; urgency=medium
+
+  [ Adolfo Jayme Barrientos ]
+  * Add 1px padding to calendar widget elements; looks better. Thanks,
+    Khurshid Alam. (LP: #1537794)
+
+  [ Matthieu James ]
+  * Suru icon theme: normalization of arrows used in mono icons, plus
+    minor additions or updates to existing designs. (LP: #1518934)
+
+  [ Will Cooke ]
+  * Adds these fixes for Calendar: (LP: #1551744, #1558659)
+
+ -- Sebastien Bacher <[e-mail]>  Fri, 15 Apr 2016 19:49:25 +0000
+
+>>>>>>> MERGE-SOURCE
 ubuntu-themes (14.04+16.04.20160324.1-0ubuntu1) xenial; urgency=medium
 
   [ Marco Trevisan (Treviño) ]

=== modified file 'debian/control'
--- debian/control	2016-08-01 12:10:11 +0000
+++ debian/control	2016-10-24 16:23:20 +0000
@@ -12,8 +12,8 @@
 # If you aren't a member of ~ubuntu-art-pkg but need to upload
 # packaging changes, just go ahead. ~ubuntu-art-pkg will notice
 # and sync up the code again.
-Vcs-Bzr: https://code.launchpad.net/~ubuntu-art-pkg/ubuntu-themes/trunk
-Vcs-Browser: https://bazaar.launchpad.net/~ubuntu-art-pkg/ubuntu-themes/trunk
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-art-pkg/ubuntu-themes/16.04
+Vcs-Browser: https://bazaar.launchpad.net/~ubuntu-art-pkg/ubuntu-themes/16.04
 
 Package: light-themes
 Architecture: all