Ubuntu theme

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

  1. osd-totem
  2. Merge into trunk
Proposed by Lars Karlitski
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 421
Merged at revision: 421
Proposed branch: lp:~larsu/ubuntu-themes/osd-totem
Merge into: lp:ubuntu-themes
Diff against target: 129 lines (+86/-0)
4 files modified
Ambiance/gtk-3.0/gtk-main.css (+4/-0)
Ambiance/gtk-3.0/gtk-widgets.css (+39/-0)
Radiance/gtk-3.0/gtk-main.css (+4/-0)
Radiance/gtk-3.0/gtk-widgets.css (+39/-0)
To merge this branch: bzr merge lp:~larsu/ubuntu-themes/osd-totem
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+253036@code.launchpad.net

Commit message

Style overlay widgets needed by totem

Description of the change

Style overlay widgets needed by totem

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

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)
Revision history for this message
Sebastien Bacher (seb128) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
4040
41@define-color shadow_color alpha(black, 0.5);41@define-color shadow_color alpha(black, 0.5);
4242
43@define-color osd_fg_color #eeeeec;
44@define-color osd_bg_color alpha(#202526, 0.7);
45@define-color osd_border_color alpha(black, 0.7);
46
43@import url("gtk-widgets-borders.css");47@import url("gtk-widgets-borders.css");
44@import url("gtk-widgets-assets.css");48@import url("gtk-widgets-assets.css");
45@import url("gtk-widgets.css");49@import url("gtk-widgets.css");
4650
=== 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 @@
1924 background: none;1924 background: none;
1925}1925}
19261926
1927
1928/* OSD overlays */
1929.osd,
1930.osd:backdrop {
1931 color: @osd_fg_color;
1932 background-color: @osd_bg_color;
1933 border-color: @osd_border_color;
1934}
1935
1936.osd.toolbar {
1937 padding: 12px;
1938 border-radius: 8px;
1939}
1940
1941.osd .button,
1942.osd .button:backdrop {
1943 color: @osd_fg_color;
1944 background: none;
1945 border: none;
1946 padding: 12px;
1947 border-radius: 8px;
1948 transition: all 100ms ease-in-out;
1949}
1950
1951.osd .button:hover {
1952 color: lighter(@osd_fg_color);
1953 icon-shadow: 0 0 3px @osd_fg_color;
1954}
1955
1956.osd .button:active {
1957 color: darker(@osd_fg_color);
1958 icon-shadow: none;
1959}
1960
1961.osd .scale {
1962 margin-left: 9px;
1963 margin-right: 9px;
1964}
1965
1927/*****************************************************************************1966/*****************************************************************************
1928 * states [please keep this section at the end of the file (CSS precedence)] *1967 * states [please keep this section at the end of the file (CSS precedence)] *
1929 *****************************************************************************/1968 *****************************************************************************/
19301969
=== 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 @@
3939
40@define-color shadow_color alpha(black, 0.5);40@define-color shadow_color alpha(black, 0.5);
4141
42@define-color osd_fg_color #eeeeec;
43@define-color osd_bg_color alpha(#202526, 0.7);
44@define-color osd_border_color alpha(black, 0.7);
45
42@import url("gtk-widgets-borders.css");46@import url("gtk-widgets-borders.css");
43@import url("gtk-widgets-borders-radiance.css");47@import url("gtk-widgets-borders-radiance.css");
44@import url("gtk-widgets-assets.css");48@import url("gtk-widgets-assets.css");
4549
=== 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 @@
1917 background: none;1917 background: none;
1918}1918}
19191919
1920
1921/* OSD overlays */
1922.osd,
1923.osd:backdrop {
1924 color: @osd_fg_color;
1925 background-color: @osd_bg_color;
1926 border-color: @osd_border_color;
1927}
1928
1929.osd.toolbar {
1930 padding: 12px;
1931 border-radius: 8px;
1932}
1933
1934.osd .button,
1935.osd .button:backdrop {
1936 color: @osd_fg_color;
1937 background: none;
1938 border: none;
1939 padding: 12px;
1940 border-radius: 8px;
1941 transition: all 100ms ease-in-out;
1942}
1943
1944.osd .button:hover {
1945 color: lighter(@osd_fg_color);
1946 icon-shadow: 0 0 3px @osd_fg_color;
1947}
1948
1949.osd .button:active {
1950 color: darker(@osd_fg_color);
1951 icon-shadow: none;
1952}
1953
1954.osd .scale {
1955 margin-left: 9px;
1956 margin-right: 9px;
1957}
1958
1920/*****************************************************************************1959/*****************************************************************************
1921 * states [please keep this section at the end of the file (CSS precedence)] *1960 * states [please keep this section at the end of the file (CSS precedence)] *
1922 *****************************************************************************/1961 *****************************************************************************/

Subscribers

People subscribed via source and target branches