Merge lp:~larsu/ubuntu-themes/osd-totem into lp:ubuntu-themes

[Lars Karlitski]

Style overlay widgets needed by totem

Style overlay widgets needed by totem

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:421
http://jenkins.qa.ubuntu.com/job/ubuntu-themes-ci/92/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-themes-vivid-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-themes-vivid-armhf-ci/6
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-themes-vivid-i386-ci/6/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-themes-ci/92/rebuild

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

That looks much nicer, we should get that in vivid!

review: Approve

=== modified file 'Ambiance/gtk-3.0/gtk-main.css'
--- Ambiance/gtk-3.0/gtk-main.css	2015-01-15 13:15:40 +0000
+++ Ambiance/gtk-3.0/gtk-main.css	2015-03-16 12:13:21 +0000
@@ -40,6 +40,10 @@
 
 @define-color shadow_color alpha(black, 0.5);
 
+@define-color osd_fg_color #eeeeec;
+@define-color osd_bg_color alpha(#202526, 0.7);
+@define-color osd_border_color alpha(black, 0.7);
+
 @import url("gtk-widgets-borders.css");
 @import url("gtk-widgets-assets.css");
 @import url("gtk-widgets.css");

=== modified file 'Ambiance/gtk-3.0/gtk-widgets.css'
--- Ambiance/gtk-3.0/gtk-widgets.css	2015-01-16 16:44:11 +0000
+++ Ambiance/gtk-3.0/gtk-widgets.css	2015-03-16 12:13:21 +0000
@@ -1924,6 +1924,45 @@
     background: none;
 }
 
+
+/* OSD overlays */
+.osd,
+.osd:backdrop {
+    color: @osd_fg_color;
+    background-color: @osd_bg_color;
+    border-color: @osd_border_color;
+}
+
+.osd.toolbar {
+    padding: 12px;
+    border-radius: 8px;
+}
+
+.osd .button,
+.osd .button:backdrop {
+    color: @osd_fg_color;
+    background: none;
+    border: none;
+    padding: 12px;
+    border-radius: 8px;
+    transition: all 100ms ease-in-out;
+}
+
+.osd .button:hover {
+    color: lighter(@osd_fg_color);
+    icon-shadow: 0 0 3px @osd_fg_color;
+}
+
+.osd .button:active {
+    color: darker(@osd_fg_color);
+    icon-shadow: none;
+}
+
+.osd .scale {
+    margin-left: 9px;
+    margin-right: 9px;
+}
+
 /*****************************************************************************
  * states [please keep this section at the end of the file (CSS precedence)] *
  *****************************************************************************/

=== modified file 'Radiance/gtk-3.0/gtk-main.css'
--- Radiance/gtk-3.0/gtk-main.css	2015-01-27 20:47:49 +0000
+++ Radiance/gtk-3.0/gtk-main.css	2015-03-16 12:13:21 +0000
@@ -39,6 +39,10 @@
 
 @define-color shadow_color alpha(black, 0.5);
 
+@define-color osd_fg_color #eeeeec;
+@define-color osd_bg_color alpha(#202526, 0.7);
+@define-color osd_border_color alpha(black, 0.7);
+
 @import url("gtk-widgets-borders.css");
 @import url("gtk-widgets-borders-radiance.css");
 @import url("gtk-widgets-assets.css");

=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
--- Radiance/gtk-3.0/gtk-widgets.css	2015-01-16 16:44:11 +0000
+++ Radiance/gtk-3.0/gtk-widgets.css	2015-03-16 12:13:21 +0000
@@ -1917,6 +1917,45 @@
     background: none;
 }
 
+
+/* OSD overlays */
+.osd,
+.osd:backdrop {
+    color: @osd_fg_color;
+    background-color: @osd_bg_color;
+    border-color: @osd_border_color;
+}
+
+.osd.toolbar {
+    padding: 12px;
+    border-radius: 8px;
+}
+
+.osd .button,
+.osd .button:backdrop {
+    color: @osd_fg_color;
+    background: none;
+    border: none;
+    padding: 12px;
+    border-radius: 8px;
+    transition: all 100ms ease-in-out;
+}
+
+.osd .button:hover {
+    color: lighter(@osd_fg_color);
+    icon-shadow: 0 0 3px @osd_fg_color;
+}
+
+.osd .button:active {
+    color: darker(@osd_fg_color);
+    icon-shadow: none;
+}
+
+.osd .scale {
+    margin-left: 9px;
+    margin-right: 9px;
+}
+
 /*****************************************************************************
  * states [please keep this section at the end of the file (CSS precedence)] *
  *****************************************************************************/