Ubuntu theme

Merge lp:~larsu/ubuntu-themes/eog-overlay-buttons into lp:ubuntu-themes

  1. eog-overlay-buttons
  2. Merge into trunk
Proposed by Lars Karlitski
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 449
Merged at revision: 454
Proposed branch: lp:~larsu/ubuntu-themes/eog-overlay-buttons
Merge into: lp:ubuntu-themes
Diff against target: 71 lines (+26/-0)
2 files modified
Ambiance/gtk-3.0/gtk-widgets.css (+13/-0)
Radiance/gtk-3.0/gtk-widgets.css (+13/-0)
To merge this branch: bzr merge lp:~larsu/ubuntu-themes/eog-overlay-buttons
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+269482@code.launchpad.net

Commit message

osd: style free-floating osd buttons

Description of the change

osd: style free-floating osd buttons

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:449
http://jenkins.qa.ubuntu.com/job/ubuntu-themes-ci/112/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-themes-vivid-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-themes-vivid-armhf-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-themes-vivid-i386-ci/26

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

review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

works as it should, thanks

review: Approve
lp:~larsu/ubuntu-themes/eog-overlay-buttons updated
450. By Lars Karlitski

Set toolbar background color

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Ambiance/gtk-3.0/gtk-widgets.css'
2--- Ambiance/gtk-3.0/gtk-widgets.css 2015-09-09 01:28:38 +0000
3+++ Ambiance/gtk-3.0/gtk-widgets.css 2015-09-30 08:34:42 +0000
4@@ -1596,6 +1596,7 @@
5 border-style: none;
6 padding: 1px;
7
8+ background-color: @bg_color;
9 color: @fg_color;
10 text-shadow: none;
11 }
12@@ -2005,11 +2006,23 @@
13 transition: all 100ms ease-in-out;
14 }
15
16+/* buttons that are not part of an osd toolbar need a background */
17+.button.osd,
18+.button.osd:hover,
19+.button.osd:active {
20+ background: @osd_bg_color;
21+ padding: 12px;
22+ box-shadow: none;
23+ border-image: none;
24+}
25+
26+.button.osd:hover,
27 .osd .button:hover {
28 color: lighter(@osd_fg_color);
29 icon-shadow: 0 0 3px @osd_fg_color;
30 }
31
32+.button.osd:active,
33 .osd .button:active {
34 color: darker(@osd_fg_color);
35 icon-shadow: none;
36
37=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
38--- Radiance/gtk-3.0/gtk-widgets.css 2015-09-09 01:28:38 +0000
39+++ Radiance/gtk-3.0/gtk-widgets.css 2015-09-30 08:34:42 +0000
40@@ -1615,6 +1615,7 @@
41 border-style: none;
42 padding: 1px;
43
44+ background-color: @bg_color;
45 color: @fg_color;
46 text-shadow: none;
47 }
48@@ -2019,11 +2020,23 @@
49 transition: all 100ms ease-in-out;
50 }
51
52+/* buttons that are not part of an osd toolbar need a background */
53+.button.osd,
54+.button.osd:hover,
55+.button.osd:active {
56+ background: @osd_bg_color;
57+ padding: 12px;
58+ box-shadow: none;
59+ border-image: none;
60+}
61+
62+.button.osd:hover,
63 .osd .button:hover {
64 color: lighter(@osd_fg_color);
65 icon-shadow: 0 0 3px @osd_fg_color;
66 }
67
68+.button.osd:active,
69 .osd .button:active {
70 color: darker(@osd_fg_color);
71 icon-shadow: none;

Subscribers

People subscribed via source and target branches