diff -Nru ubuntu-mate-artwork-0.4.6/debian/changelog ubuntu-mate-artwork-0.4.7/debian/changelog --- ubuntu-mate-artwork-0.4.6/debian/changelog 2015-03-20 15:49:35.000000000 +0000 +++ ubuntu-mate-artwork-0.4.7/debian/changelog 2015-04-15 14:53:49.000000000 +0100 @@ -1,3 +1,53 @@ +ubuntu-mate-artwork (0.4.7) vivid; urgency=medium + + [ Martin Wimpress ] + * Aligned with ubuntu-themes (14.04+15.04.20150410-0ubuntu1) incorporating + many bugs fixes. + + [ Iain Lane ] + * Draw shadows for menus - thanks to Simon Steinbeiß (LP: #1441975) + + [ Lars Uebernickel ] + * Don't use symbolic colors for style (LP: #1436428) + + [ Alberts Muktupāvels ] + * Add some style info for unity-greeter buttons. (LP: #1423542) (LP: + #1423542) + + [ Iain Lane ] + * Style geary's compose view to get a background with overlay- + scrollbars added: Ambiant-MATE/gtk-3.0/apps/geary.css + Radiant-MATE/gtk-3.0/apps/geary.css + * Theme software-center's action bar so it gets a background. added: + Ambiant-MATE/gtk-3.0/apps/software-center.css Radiant-MATE/gtk- + 3.0/apps/software-center.css + + [ Lars Uebernickel ] + * Radiant-MATE: fix radio mark coloring in menus + + [ William Hua ] + * Set the background on GtkStack widgets. (LP: #1285783) + + [ Lars Uebernickel ] + * Set and animate spinner icon for password entry in unity-greeter and + sound menu's playback item. + + [ Iain Lane ] + * Switch gnome-icon-theme to adwaita-icon-theme, which is its + successor. + + [ Dmitry Shachnev ] + * gnome-panel.css: Fix styling for checked GtkToggleButtons. + + [ Alberts Muktupāvels ] + * metacity-theme: remove unsupported properties. + + [ Lars Uebernickel ] + * Stop using the unico gtk engine + * A few more fixes and cleanups for gtk 3.14 (combo boxes, spinners) + + -- Martin Wimpress Sun, 12 Apr 2015 14:27:15 +0000 + ubuntu-mate-artwork (0.4.6) vivid; urgency=medium * Define active-monitor in lightdm-gtk-greeter.conf to prevent diff -Nru ubuntu-mate-artwork-0.4.6/debian/control ubuntu-mate-artwork-0.4.7/debian/control --- ubuntu-mate-artwork-0.4.6/debian/control 2015-03-02 15:51:50.000000000 +0000 +++ ubuntu-mate-artwork-0.4.7/debian/control 2015-04-13 10:20:59.000000000 +0100 @@ -69,7 +69,6 @@ Package: ubuntu-mate-icon-themes Architecture: all Depends: ${misc:Depends}, - gnome-icon-theme-full, ubuntu-mono Description: Icon themes for Ubuntu MATE This package contains icon themes for Ubuntu MATE. @@ -78,7 +77,6 @@ Architecture: all Multi-Arch: foreign Depends: gtk2-engines-murrine (>= 0.90.3+git20100810), - gtk3-engines-unico (>= 1.0.1-0ubuntu2), ubuntu-mate-icon-themes, ${misc:Depends}, Description: GTK2 and GTK3 themes for Ubuntu MATE diff -Nru ubuntu-mate-artwork-0.4.6/usr/share/icons/Ambiant-MATE/actions/16/window-close-symbolic.svg ubuntu-mate-artwork-0.4.7/usr/share/icons/Ambiant-MATE/actions/16/window-close-symbolic.svg --- ubuntu-mate-artwork-0.4.6/usr/share/icons/Ambiant-MATE/actions/16/window-close-symbolic.svg 1970-01-01 01:00:00.000000000 +0100 +++ ubuntu-mate-artwork-0.4.7/usr/share/icons/Ambiant-MATE/actions/16/window-close-symbolic.svg 2015-04-13 09:29:00.000000000 +0100 @@ -0,0 +1,68 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + diff -Nru ubuntu-mate-artwork-0.4.6/usr/share/icons/Ambiant-MATE/actions/16/window-maximize-symbolic.svg ubuntu-mate-artwork-0.4.7/usr/share/icons/Ambiant-MATE/actions/16/window-maximize-symbolic.svg --- ubuntu-mate-artwork-0.4.6/usr/share/icons/Ambiant-MATE/actions/16/window-maximize-symbolic.svg 1970-01-01 01:00:00.000000000 +0100 +++ ubuntu-mate-artwork-0.4.7/usr/share/icons/Ambiant-MATE/actions/16/window-maximize-symbolic.svg 2015-04-13 09:29:00.000000000 +0100 @@ -0,0 +1,77 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff -Nru ubuntu-mate-artwork-0.4.6/usr/share/icons/Ambiant-MATE/actions/16/window-minimize-symbolic.svg ubuntu-mate-artwork-0.4.7/usr/share/icons/Ambiant-MATE/actions/16/window-minimize-symbolic.svg --- ubuntu-mate-artwork-0.4.6/usr/share/icons/Ambiant-MATE/actions/16/window-minimize-symbolic.svg 1970-01-01 01:00:00.000000000 +0100 +++ ubuntu-mate-artwork-0.4.7/usr/share/icons/Ambiant-MATE/actions/16/window-minimize-symbolic.svg 2015-04-13 09:29:00.000000000 +0100 @@ -0,0 +1,65 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff -Nru ubuntu-mate-artwork-0.4.6/usr/share/icons/Ambiant-MATE/actions/16/window-restore-symbolic.svg ubuntu-mate-artwork-0.4.7/usr/share/icons/Ambiant-MATE/actions/16/window-restore-symbolic.svg --- ubuntu-mate-artwork-0.4.6/usr/share/icons/Ambiant-MATE/actions/16/window-restore-symbolic.svg 1970-01-01 01:00:00.000000000 +0100 +++ ubuntu-mate-artwork-0.4.7/usr/share/icons/Ambiant-MATE/actions/16/window-restore-symbolic.svg 2015-04-13 09:29:00.000000000 +0100 @@ -0,0 +1,77 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + Binary files /tmp/FrDoNQ1Zr8/ubuntu-mate-artwork-0.4.6/usr/share/icons/Ambiant-MATE/icon-theme.cache and /tmp/W_KXDK5jGd/ubuntu-mate-artwork-0.4.7/usr/share/icons/Ambiant-MATE/icon-theme.cache differ diff -Nru ubuntu-mate-artwork-0.4.6/usr/share/icons/Radiant-MATE/actions/16/window-close-symbolic.svg ubuntu-mate-artwork-0.4.7/usr/share/icons/Radiant-MATE/actions/16/window-close-symbolic.svg --- ubuntu-mate-artwork-0.4.6/usr/share/icons/Radiant-MATE/actions/16/window-close-symbolic.svg 1970-01-01 01:00:00.000000000 +0100 +++ ubuntu-mate-artwork-0.4.7/usr/share/icons/Radiant-MATE/actions/16/window-close-symbolic.svg 2015-04-13 09:29:00.000000000 +0100 @@ -0,0 +1,68 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + diff -Nru ubuntu-mate-artwork-0.4.6/usr/share/icons/Radiant-MATE/actions/16/window-maximize-symbolic.svg ubuntu-mate-artwork-0.4.7/usr/share/icons/Radiant-MATE/actions/16/window-maximize-symbolic.svg --- ubuntu-mate-artwork-0.4.6/usr/share/icons/Radiant-MATE/actions/16/window-maximize-symbolic.svg 1970-01-01 01:00:00.000000000 +0100 +++ ubuntu-mate-artwork-0.4.7/usr/share/icons/Radiant-MATE/actions/16/window-maximize-symbolic.svg 2015-04-13 09:29:00.000000000 +0100 @@ -0,0 +1,77 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff -Nru ubuntu-mate-artwork-0.4.6/usr/share/icons/Radiant-MATE/actions/16/window-minimize-symbolic.svg ubuntu-mate-artwork-0.4.7/usr/share/icons/Radiant-MATE/actions/16/window-minimize-symbolic.svg --- ubuntu-mate-artwork-0.4.6/usr/share/icons/Radiant-MATE/actions/16/window-minimize-symbolic.svg 1970-01-01 01:00:00.000000000 +0100 +++ ubuntu-mate-artwork-0.4.7/usr/share/icons/Radiant-MATE/actions/16/window-minimize-symbolic.svg 2015-04-13 09:29:00.000000000 +0100 @@ -0,0 +1,65 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff -Nru ubuntu-mate-artwork-0.4.6/usr/share/icons/Radiant-MATE/actions/16/window-restore-symbolic.svg ubuntu-mate-artwork-0.4.7/usr/share/icons/Radiant-MATE/actions/16/window-restore-symbolic.svg --- ubuntu-mate-artwork-0.4.6/usr/share/icons/Radiant-MATE/actions/16/window-restore-symbolic.svg 1970-01-01 01:00:00.000000000 +0100 +++ ubuntu-mate-artwork-0.4.7/usr/share/icons/Radiant-MATE/actions/16/window-restore-symbolic.svg 2015-04-13 09:29:00.000000000 +0100 @@ -0,0 +1,77 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + Binary files /tmp/FrDoNQ1Zr8/ubuntu-mate-artwork-0.4.6/usr/share/icons/Radiant-MATE/icon-theme.cache and /tmp/W_KXDK5jGd/ubuntu-mate-artwork-0.4.7/usr/share/icons/Radiant-MATE/icon-theme.cache differ diff -Nru ubuntu-mate-artwork-0.4.6/usr/share/themes/Ambiant-MATE/gtk-3.0/apps/geary.css ubuntu-mate-artwork-0.4.7/usr/share/themes/Ambiant-MATE/gtk-3.0/apps/geary.css --- ubuntu-mate-artwork-0.4.6/usr/share/themes/Ambiant-MATE/gtk-3.0/apps/geary.css 1970-01-01 01:00:00.000000000 +0100 +++ ubuntu-mate-artwork-0.4.7/usr/share/themes/Ambiant-MATE/gtk-3.0/apps/geary.css 2015-04-13 09:29:00.000000000 +0100 @@ -0,0 +1,5 @@ + +/* for overlay-scrollbars */ +ComposerWidget { + background-color: @bg_color; +} diff -Nru ubuntu-mate-artwork-0.4.6/usr/share/themes/Ambiant-MATE/gtk-3.0/apps/gnome-panel.css ubuntu-mate-artwork-0.4.7/usr/share/themes/Ambiant-MATE/gtk-3.0/apps/gnome-panel.css --- ubuntu-mate-artwork-0.4.6/usr/share/themes/Ambiant-MATE/gtk-3.0/apps/gnome-panel.css 2015-03-02 15:51:50.000000000 +0000 +++ ubuntu-mate-artwork-0.4.7/usr/share/themes/Ambiant-MATE/gtk-3.0/apps/gnome-panel.css 2015-04-13 09:31:06.000000000 +0100 @@ -89,6 +89,26 @@ border-left-color: alpha (shade (@dark_bg_color, 1.5), 0.4); } +PanelApplet .button:checked { + background-image: -gtk-gradient (linear, left top, left bottom, + from (shade (@dark_bg_color, 0.95)), + to (shade (@dark_bg_color, 1.1))); +} + +PanelApplet .button:checked:prelight { + background-image: -gtk-gradient (linear, left top, left bottom, + from (shade (@dark_bg_color, 1.15)), + to (shade (@dark_bg_color, 1.3))); +} + +PanelApplet .button:checked:prelight:active { + border-image: none; + background-image: -gtk-gradient (linear, left top, left bottom, + from (shade (@dark_bg_color, 0.75)), + to (shade (@dark_bg_color, 0.9))); + border-color: shade (@dark_bg_color, 0.8); +} + ClockBox { text-shadow: 0 -1px shade (@dark_bg_color, 0.6); } diff -Nru ubuntu-mate-artwork-0.4.6/usr/share/themes/Ambiant-MATE/gtk-3.0/apps/gnome-terminal.css ubuntu-mate-artwork-0.4.7/usr/share/themes/Ambiant-MATE/gtk-3.0/apps/gnome-terminal.css --- ubuntu-mate-artwork-0.4.6/usr/share/themes/Ambiant-MATE/gtk-3.0/apps/gnome-terminal.css 2015-03-02 15:51:50.000000000 +0000 +++ ubuntu-mate-artwork-0.4.7/usr/share/themes/Ambiant-MATE/gtk-3.0/apps/gnome-terminal.css 2015-04-13 09:32:05.000000000 +0100 @@ -1,112 +1,8 @@ /* gnome-terminal */ TerminalScreen { -TerminalScreen-background-darkness: 0.95; - background-color: #19230D; - color: #DFDBD2; -} - -/* -TerminalWindow, -TerminalWindow.background { - background-color: @dark_bg_color; - - color: @dark_fg_color; -} -*/ -/* notebook */ -/* -TerminalWindow .notebook { - background-image: none; - background-color: shade (@dark_bg_color, 1.02); - border-radius: 3; - - -unico-border-gradient: -gtk-gradient (linear, left top, right top, - from (shade (@dark_bg_color, 0.93)), - to (shade (@dark_bg_color, 0.93))); - -unico-inner-stroke-width: 0; - -unico-outer-stroke-width: 0; -} - -TerminalWindow .notebook tab { - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@dark_bg_color, 0.92)), - color-stop (0.60, shade (@dark_bg_color, 0.9)), - to (shade (@dark_bg_color, 0.85))); - padding: 0; - - color: @dark_fg_color; - - -unico-inner-stroke-color: alpha (shade (@dark_bg_color, 1.26), 0.2); -} - -TerminalWindow .notebook tab:active { - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@dark_bg_color, 1.2)), - to (shade (@dark_bg_color, 1.12))); - - -unico-inner-stroke-color: alpha (shade (@dark_bg_color, 1.26), 1.0); -} -TerminalWindow .notebook .button, -TerminalWindow .notebook .button:active { - background-image: -gtk-gradient (linear, left top, right top, - from (shade (@dark_bg_color, 1.08)), - to (shade (@dark_bg_color, 0.92))); - - -unico-border-gradient: -gtk-gradient (linear, left top, right top, - from (shade (@dark_bg_color, 0.9)), - to (shade (@dark_bg_color, 0.9))); - -unico-inner-stroke-color: alpha (shade (@dark_bg_color, 1.26), 0.7); - -unico-outer-stroke-style: none; -} -*/ -/* Scrollbars */ -/* -TerminalWindow .scrollbar { - border-radius: 20; - - -unico-border-gradient: -gtk-gradient (linear, left top, left bottom, - from (shade (@dark_bg_color, 0.74)), - to (shade (@dark_bg_color, 0.74))); -} - -TerminalWindow .scrollbar.trough { - background-image: -gtk-gradient (linear, left top, right top, - from (shade (@dark_bg_color, 0.9)), - to (shade (@dark_bg_color, 0.95))); -} - -TerminalWindow .scrollbar.trough.horizontal { - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@dark_bg_color, 0.9)), - to (shade (@dark_bg_color, 0.95))); -} - -TerminalWindow .scrollbar.slider, -TerminalWindow .scrollbar.slider:prelight, -TerminalWindow .scrollbar.button, -TerminalWindow .scrollbar.button:insensitive { - background-image: -gtk-gradient (linear, left top, right top, - from (shade (@dark_bg_color, 1.08)), - to (shade (@dark_bg_color, 0.92))); - - -unico-border-gradient: -gtk-gradient (linear, left top, right top, - from (shade (@dark_bg_color, 0.74)), - to (shade (@dark_bg_color, 0.74))); - -unico-inner-stroke-color: alpha (shade (@dark_bg_color, 1.26), 0.7); -} - -TerminalWindow .scrollbar.slider.horizontal, -TerminalWindow .scrollbar.slider.horizontal:prelight, -TerminalWindow .scrollbar.button.horizontal, -TerminalWindow .scrollbar.button:insensitive { - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@dark_bg_color, 1.08)), - to (shade (@dark_bg_color, 0.92))); + background-color: #19230D; - -unico-border-gradient: -gtk-gradient (linear, left top, left bottom, - from (shade (@dark_bg_color, 0.74)), - to (shade (@dark_bg_color, 0.74))); - -unico-inner-stroke-color: alpha (shade (@dark_bg_color, 1.26), 0.7); + color: #DFDBD2; } -*/ diff -Nru ubuntu-mate-artwork-0.4.6/usr/share/themes/Ambiant-MATE/gtk-3.0/apps/software-center.css ubuntu-mate-artwork-0.4.7/usr/share/themes/Ambiant-MATE/gtk-3.0/apps/software-center.css --- ubuntu-mate-artwork-0.4.6/usr/share/themes/Ambiant-MATE/gtk-3.0/apps/software-center.css 1970-01-01 01:00:00.000000000 +0100 +++ ubuntu-mate-artwork-0.4.7/usr/share/themes/Ambiant-MATE/gtk-3.0/apps/software-center.css 2015-04-13 09:29:00.000000000 +0100 @@ -0,0 +1,5 @@ + +/* for overlay-scrollbars */ +.action-bar { + background-color: @bg_color; +} diff -Nru ubuntu-mate-artwork-0.4.6/usr/share/themes/Ambiant-MATE/gtk-3.0/apps/unity.css ubuntu-mate-artwork-0.4.7/usr/share/themes/Ambiant-MATE/gtk-3.0/apps/unity.css --- ubuntu-mate-artwork-0.4.6/usr/share/themes/Ambiant-MATE/gtk-3.0/apps/unity.css 2015-03-02 15:51:50.000000000 +0000 +++ ubuntu-mate-artwork-0.4.7/usr/share/themes/Ambiant-MATE/gtk-3.0/apps/unity.css 2015-04-13 09:32:45.000000000 +0100 @@ -120,3 +120,14 @@ from (shade (@dark_bg_color, 1.5)), to (shade (@dark_bg_color, 1.11))); } + + +@keyframes playbackmenuitem_spinner { + to { -gtk-icon-transform: rotate(1turn); } +} + +.menu IdoPlaybackMenuItem.menuitem:active { + -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); + animation: playbackmenuitem_spinner 1s infinite linear; + color: @selected_bg_color; +} diff -Nru ubuntu-mate-artwork-0.4.6/usr/share/themes/Ambiant-MATE/gtk-3.0/apps/unity-greeter.css ubuntu-mate-artwork-0.4.7/usr/share/themes/Ambiant-MATE/gtk-3.0/apps/unity-greeter.css --- ubuntu-mate-artwork-0.4.6/usr/share/themes/Ambiant-MATE/gtk-3.0/apps/unity-greeter.css 2015-03-02 15:51:50.000000000 +0000 +++ ubuntu-mate-artwork-0.4.7/usr/share/themes/Ambiant-MATE/gtk-3.0/apps/unity-greeter.css 2015-04-13 09:32:31.000000000 +0100 @@ -57,7 +57,6 @@ .lightdm.button:focused, .lightdm.entry:focused { - -unico-focus-border-color: alpha (white, 0.9); border-color: alpha (white, 0.9); border-width: 1px; border-style: solid; @@ -68,3 +67,28 @@ .lightdm.entry:selected { background-color: alpha (white, 0.2); } + +@keyframes dashentry_spinner { + to { -gtk-icon-transform: rotate(1turn); } +} + +.lightdm.entry:active { + -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); + animation: dashentry_spinner 1s infinite linear; +} + +.lightdm.option-button { + padding: 2px; + background: none; + border: 0; +} + +.lightdm.toggle-button { + background: none; + border-width: 0; +} + +.lightdm.toggle-button.selected { + background-color: alpha (black, 0.3); + border-width: 1px; +} diff -Nru ubuntu-mate-artwork-0.4.6/usr/share/themes/Ambiant-MATE/gtk-3.0/gtk-main.css ubuntu-mate-artwork-0.4.7/usr/share/themes/Ambiant-MATE/gtk-3.0/gtk-main.css --- ubuntu-mate-artwork-0.4.6/usr/share/themes/Ambiant-MATE/gtk-3.0/gtk-main.css 2015-03-02 15:51:50.000000000 +0000 +++ ubuntu-mate-artwork-0.4.7/usr/share/themes/Ambiant-MATE/gtk-3.0/gtk-main.css 2015-04-13 09:33:24.000000000 +0100 @@ -8,7 +8,13 @@ @define-color tooltip_bg_color #000000; @define-color tooltip_fg_color #ffffff; -/* misc colors used by gtk+ */ +/* misc colors used by gtk+ + * + * Gtk doesn't currently expand color variables for style properties. Thus, + * gtk-widgets.css uses literal color names, but includes a comment containing + * the name of the variable. Please remember to change values there as well + * when changing one of the variables below. + */ @define-color info_fg_color rgb (181, 171, 156); @define-color info_bg_color rgb (252, 252, 189); @define-color warning_fg_color rgb (173, 120, 41); @@ -35,11 +41,19 @@ @define-color backdrop_selected_bg_color shade (@bg_color, 0.92); @define-color backdrop_selected_fg_color @fg_color; +@define-color focus_color alpha (@selected_bg_color, 0.5); +@define-color focus_bg_color alpha (@selected_bg_color, 0.1); + @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"); +@import url("apps/geary.css"); @import url("apps/unity.css"); @import url("apps/baobab.css"); @import url("apps/gedit.css"); @@ -50,4 +64,5 @@ @import url("apps/unity-greeter.css"); @import url("apps/glade.css"); @import url("apps/california.css"); +@import url("apps/software-center.css"); @import url("public-colors.css"); diff -Nru ubuntu-mate-artwork-0.4.6/usr/share/themes/Ambiant-MATE/gtk-3.0/gtk-widgets.css ubuntu-mate-artwork-0.4.7/usr/share/themes/Ambiant-MATE/gtk-3.0/gtk-widgets.css --- ubuntu-mate-artwork-0.4.6/usr/share/themes/Ambiant-MATE/gtk-3.0/gtk-widgets.css 2015-03-02 15:51:50.000000000 +0000 +++ ubuntu-mate-artwork-0.4.7/usr/share/themes/Ambiant-MATE/gtk-3.0/gtk-widgets.css 2015-04-13 09:40:27.000000000 +0100 @@ -43,26 +43,14 @@ -GtkWidget-separator-width: 2; -GtkWidget-separator-height: 2; -GtkWidget-wide-separators: true; - -GtkWidget-focus-padding: 0; - -GtkWidget-focus-line-width: 1px; -GtkWidget-link-color: @link_color; -GtkWidget-visited-link-color: @link_color; - -GtkWindow-decoration-button-layout: "close:"; -GtkWindow-resize-grip-width: 0; -GtkWindow-resize-grip-height: 0; -WnckTasklist-fade-overlay-rect: 0; background-origin: border-box; background-clip: padding-box; - - engine: unico; - - /* To avoid using custom attributes, unico looks at the outline attributes - * to find out how to render the focus ring. - */ - outline-color: alpha (@selected_bg_color, 0.5); - outline-offset: 5px; - -gtk-icon-style: regular; /* disable symbolic icons */ } @@ -75,6 +63,11 @@ color: @backdrop_fg_color; } +/* LP: #1285783 */ +GtkScrolledWindow { + background-color: @bg_color; +} + GtkPaned { background-color: @bg_color; } @@ -117,8 +110,6 @@ * button * **********/ .button { - -GtkWidget-focus-line-width: 0; - padding: 5px 6px; background-image: -gtk-gradient (linear, left top, left bottom, @@ -262,29 +253,33 @@ /****************** * Linked Widgets * *****************/ -.linked .entry, -.linked .button { +.linked > .entry, +.linked > .button, +.linked > GtkComboBox > .button { border-radius: 0; border-image-width: 10px 0 10px 0; border-width: 1px 0 1px 0; box-shadow: inset -1px 0 shade (@bg_color, 0.84); } -.linked .entry:first-child, -.linked .button:first-child { +.linked > .entry:first-child, +.linked > .button:first-child, +.linked > GtkComboBox:first-child > .button { border-image-width: 10px 0 10px 12px; border-radius: 8px 0 0 8px; } -.linked .entry:last-child, -.linked .button:last-child { +.linked > .entry:last-child, +.linked > .button:last-child, +.linked > GtkComboBox:last-child > .button { border-image-width: 10px 12px 10px 0; border-radius: 0 8px 8px 0; box-shadow: none; } -.linked .entry:only-child, -.linked .button:only-child { +.linked > .entry:only-child, +.linked > .button:only-child, +.linked > GtkComboBox:only-child > .button { border-image-width: 10px 12px 10px 12px; border-radius: 8px; } @@ -322,7 +317,6 @@ ****************/ .cell { -GtkCheckButton-indicator-size: 16; - -GtkWidget-focus-line-width: 0; background-color: @base_color; border-radius: 0; @@ -348,21 +342,22 @@ /******************* * check and radio * *******************/ -.check, -.radio, -.check:insensitive, -.radio:insensitive { - background-color: transparent; - border-style: none; - margin: 1px 0; +/* Draw a focus ring around the contained label ... */ +GtkCheckButton.text-button GtkLabel { + border: 1px solid transparent; + border-radius: 5px; } -GtkCheckButton:hover, -GtkCheckButton:active:hover, -GtkCheckButton:selected, -GtkCheckButton:selected:focus { - background-color: transparent; +GtkCheckButton.text-button:focus GtkLabel { + border-color: @focus_color; + background-color: @focus_bg_color; +} + +/* ... unless it's a proper button, which already has a focus-colored border */ +.button.text-button:focus GtkLabel { + border: none; + background: none; } .menu .radio * { @@ -460,32 +455,10 @@ -GdMainIconView-icon-size: 40; } -GtkIconView.content-view.check { - background-color: transparent; -} - -GtkIconView.content-view.check:checked { - background-color: transparent; -} - -.content-view.view.check, -.content-view.view.check:checked { - background-color: transparent; -} - -GtkIconView.content-view.check:prelight, -GtkIconView.content-view.check:insensitive, -GtkIconView.content-view.check:backdrop, -GtkIconView.content-view.check:selected { - background-color: transparent; -} - /********* * entry * *********/ .entry { - -GtkWidget-focus-line-width: 0; - background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@base_color, 0.96)), to (@base_color)); @@ -561,6 +534,16 @@ border: none; } +/**************** + * window-frame * + ****************/ + +.window-frame.csd.popup { + border-style: none; + border-radius: 0; + box-shadow: 0 3px 8px @shadow_color; +} + /************ * iconview * ************/ @@ -586,10 +569,6 @@ inset 0 -1px shade (@selected_bg_color, 1.0); } -GtkIconView.cell { - background-color: transparent; -} - .rubberband { background-color: alpha (@selected_bg_color, 0.35); border-color: @selected_bg_color; @@ -598,11 +577,7 @@ border-width: 1px; } -/********* - * image * - *********/ -GtkImage, -GtkImage:insensitive { +GtkIconView.cell { background-color: transparent; } @@ -681,23 +656,6 @@ inset 0 -1px shade (@error_bg_color, 1.04); } -/********* - * label * - *********/ -GtkLabel, -GtkLabel:insensitive { - background-color: transparent; -} - -/********* - * stack * - *********/ - -GtkHeaderBar > GtkStack, -GtkHeaderBar > GtkStack:insensitive { - background-color: transparent; -} - /******** * menu * ********/ @@ -1005,6 +963,17 @@ border-image-width: 0 1px; } +/* Draw a focus ring around labels in tabs */ +.notebook tab GtkLabel { + border: 1px solid transparent; + border-radius: 5px; +} + +.notebook:focus tab GtkLabel.active-page { + border-color: @focus_color; + background-color: @focus_bg_color; +} + .notebook GtkDrawingArea { background-color: shade (@bg_color, 1.02); } @@ -1175,17 +1144,12 @@ -GtkRange-slider-width: 18; -GtkRange-trough-border: 0; -GtkScale-slider-length: 14; - -GtkWidget-focus-line-width: 0; } GtkScale.vertical { -GtkScale-slider-length: 13; } -.scale.slider { - background-color: transparent; -} - .scale.trough.highlight { background-color: #df784e; background-image: none; @@ -1438,116 +1402,26 @@ * spinner * ***********/ @keyframes spinner { - 0.00% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); } - - 12.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); } - - 25.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)); } - - 37.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)); } - - 50.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)); } - - 62.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)); } - - 75.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)); } - - 87.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)); } - - 100% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); } + to { -gtk-icon-transform: rotate(1turn); } } .spinner { - background-color: transparent; - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); - background-position: 14% 14%, 0% 50%, 14% 86%, 50% 100%, 86% 86%, 100% 50%, 86% 14%, 50% 0%; - background-size: 20% 20%; - background-repeat: no-repeat; -} - -.menu .spinner, -.menu .spinner:hover, -.primary-toolbar .spinner, -.primary-toolbar .spinner, -.header-bar .spinner, -.header-bar .spinner { + -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); color: @selected_bg_color; - border: none; - box-shadow: none; + opacity: 0; } .spinner:active { animation: spinner 1s infinite linear; + opacity: 1; +} + +.spinner:active:backdrop { + color: @backdrop_fg_color; +} + +.spinner:active:insensitive { + opacity: 0.5; } /************* @@ -1583,6 +1457,12 @@ text-shadow: 0 1px shade (@selected_bg_color, 0.7); } +GtkSwitch:focus { + outline: 2px solid @focus_color; + outline-offset: -2px; + outline-radius: 6px; +} + /* XXX temporary */ GtkSwitch.trough:backdrop, GtkSwitch.trough:insensitive { @@ -1624,7 +1504,7 @@ } .header-bar { - padding: 2px; + padding: 2px 6px; } /* @@ -1656,6 +1536,11 @@ font: bold; } +.titlebar.header-bar .subtitle { + font-size: smaller; + opacity: 0.5; +} + .titlebar.header-bar:backdrop { color: @backdrop_fg_color; background-image: none; @@ -1670,15 +1555,47 @@ } .titlebar.header-bar .button.titlebutton { - background-color: transparent; - border-image-width: 0; + background-clip: padding-box; + border: 1px solid #383734; + color: #3d3c37; + icon-shadow: 0 1px rgba(255, 255, 255, 0.1); + border-radius: 9px; + padding: 0; box-shadow: none; + background-image: linear-gradient(to top, #5a5955, #75746d 50%, #8e8d88); +} + +.titlebar.header-bar .button.titlebutton.close { + color: #323112; + icon-shadow: 0 1px rgba(255, 255, 255, 0.25); + background-image: linear-gradient(to top, #de4c19, #e55e30 50%, #f58d6e); +} + +.titlebar.header-bar .button.titlebutton.close:hover { + background-image: linear-gradient(to top, #e24f1b, #f17750 50%, #fba992); +} + +.titlebar.header-bar .button.titlebutton:hover, +.titlebar.header-bar .button.titlebutton:backdrop:hover { + background-image: linear-gradient(to top, #969696, #bdbdbd 50%, #cacaca); } -.titlebar.header-bar .button.titlebutton:hover { - border-image-width: 12px; +.titlebar.header-bar .button.titlebutton:active { + icon-shadow: none; + background-image: linear-gradient(to top, #77766f, #74736c); } +.titlebar.header-bar .button.titlebutton.close:active { + background-image: linear-gradient(to top, #ec6e44, #e76b41); +} + +.titlebar.header-bar .button.titlebutton:backdrop { + color: #3d3c37; + icon-shadow: none; + background-image: linear-gradient(to top, #605f59, #5b5a54); +} + + /*********** * toolbar * ***********/ @@ -1963,14 +1880,9 @@ border-style: solid; border-width: 1px; - background-color: transparent; color: @tooltip_fg_color; } -.tooltip * { - background-color: transparent; -} - /************ * treeview * ************/ @@ -2066,6 +1978,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)] * *****************************************************************************/ diff -Nru ubuntu-mate-artwork-0.4.6/usr/share/themes/Ambiant-MATE/metacity-1/metacity-theme-1.xml ubuntu-mate-artwork-0.4.7/usr/share/themes/Ambiant-MATE/metacity-1/metacity-theme-1.xml --- ubuntu-mate-artwork-0.4.6/usr/share/themes/Ambiant-MATE/metacity-1/metacity-theme-1.xml 2015-03-02 15:51:50.000000000 +0000 +++ ubuntu-mate-artwork-0.4.7/usr/share/themes/Ambiant-MATE/metacity-1/metacity-theme-1.xml 2015-04-13 09:41:52.000000000 +0100 @@ -389,8 +389,6 @@