5 files changed, 34 insertions, 18 deletions
diff --git a/desktop-themes/BlackMATE/gtk-3.0/Makefile.am b/desktop-themes/BlackMATE/gtk-3.0/Makefile.am
index 4c8a627c..94b3f568 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/Makefile.am
+++ b/desktop-themes/BlackMATE/gtk-3.0/Makefile.am
@@ -16,7 +16,16 @@ theme_DATA = \
 unity.css \
 window-controls.css
 
-EXTRA_DIST = $(theme_DATA)
+%.ini: %.ini.in
+ $(AM_V_GEN) sed -e 's|@bindir[@]|$(bindir)|g' $< > $@
 
-SUBDIRS = assets \
+EXTRA_DIST = \
+ $(theme_DATA) \
+ settings.ini.in
+
+CLEAN = \
+ settings.ini
+
+SUBDIRS = \
+ assets \
 window-controls
diff --git a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
index f4c61a97..838e7ecd 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
@@ -3001,7 +3001,7 @@ popover .separator {
 *******/
 
 /*mostly taken from Adwaita except the border radius */
-decoration {
+decoration, window.unified {
 border-radius: 7px 7px 0px 0px;
 border-width: 1px;
 box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(0, 0, 0, 0.23);
@@ -3131,6 +3131,7 @@ button.text-button.titlebutton {
 border-radius: 3px;
 border-width: 1px;
 border-style: solid;
+ padding: 7px;
 text-shadow: none;
 color: #D9D9D9;
 background-image: linear-gradient(to bottom,
diff --git a/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css b/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
index 857b85ad..21b6e40a 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
@@ -347,12 +347,11 @@ PanelSeparator {
 text-shadow: none;
 }
 */
-/* FIXME, this does not work anymore with >= gtk+-3.20 */
-/* dictionary applet */
-GdictApplet .entry,
-GdictApplet .entry:focus {
+
+.mate-panel-menu-bar #PanelApplet entry,
+.mate-panel-menu-bar #PanelApplet entry:focus {
 border-style: none;
- padding: 1px 4px 5px 4px;
+ padding: 1px 4px 1px 4px;
 box-shadow: inset 0px 1px shade (@theme_selected_bg_color, 1.3),
 inset 1px 0px shade (@theme_selected_bg_color, 1.3),
 inset -1px 0px shade (@theme_selected_bg_color, 1.3),
@@ -473,13 +472,13 @@ dictionary */
 }
 
 /*Wncklist */
-.mate-panel-menu-bar #tasklist-button {
+.mate-panel-menu-bar #PanelApplet button.flat.toggle {
 transition: all 400ms ease-out;
 padding: 2px;
 border-radius: 3px;
 border-width: 1px;
 border-style: solid;
- border-color:transparent;
+ border-color: shade(@button_border, 1.1);
 text-shadow: none;
 color: @theme_fg_color;
 background-image: none;
@@ -493,10 +492,8 @@ dictionary */
 to (shade(@button_gradient_color_b, 0.7)));
 */
 }
-.mate-panel-menu-bar #tasklist-button:checked:hover,
-.mate-panel-menu-bar #tasklist-button:checked,
-.mate-panel-menu-bar #tasklist-button:active:hover,
-.mate-panel-menu-bar #tasklist-button:active {
+.mate-panel-menu-bar #PanelApplet button.flat.toggle:checked,
+.mate-panel-menu-bar #PanelApplet button.flat.toggle:active {
 border-radius: 3px;
 color: @theme_fg_color;
 border-style: solid;
@@ -506,8 +503,7 @@ dictionary */
 shade(@button_gradient_color_a, 1.5));
 }
 
-/* FIXME, this does not work anymore with >= gtk+-3.20 */
-.mate-panel-menu-bar button .button:hover {
+.mate-panel-menu-bar #PanelApplet button.flat.toggle:hover{
 border-radius: 3px;
 border-image: none;
 border-style: solid;
@@ -555,13 +551,21 @@ dictionary */
 shade(@theme_selected_bg_color, 0.5));
 }
 
-#clock-applet-button,
+.mate-panel-menu-bar #PanelApplet #clock-applet-button,
 .mate-panel-menu-bar.menubar,
 MatePanelApplet > menubar {
 font-style: normal;
 font-weight: normal;
 }
 
+/*Keep tasklist/charpick/etc borders off of clock applet*/
+.mate-panel-menu-bar #PanelApplet button#clock-applet-button.flat.toggle {
+ border-style: none;
+ border-image: none;
+ border-color: transparent;
+}
+
+
 #clock-applet-button{
 padding: 4px; /*any less and outlines touch text or get cut off */
 }
diff --git a/desktop-themes/BlackMATE/gtk-3.0/settings.ini b/desktop-themes/BlackMATE/gtk-3.0/settings.ini.in
index 4dd15fec..aa35b842 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/settings.ini
+++ b/desktop-themes/BlackMATE/gtk-3.0/settings.ini.in
@@ -1,4 +1,5 @@
 [Settings]
-gtk-color-scheme = "base_color:#3b3b3e\nbg_color:#3b3b3e\ntooltip_bg_color:#000000\nselected_bg_color:#666669\ntext_color:#ffffff\nfg_color:#ffffff;\ntooltip_fg_color:#eeeeee\nselected_fg_color:#ffffff"
 gtk-auto-mnemonics = 1
+gtk-color-scheme = "base_color:#3b3b3e\nbg_color:#3b3b3e\ntooltip_bg_color:#000000\nselected_bg_color:#666669\ntext_color:#ffffff\nfg_color:#ffffff;\ntooltip_fg_color:#eeeeee\nselected_fg_color:#ffffff"
+gtk-print-preview-command = @bindir@/atril-previewer --unlink-tempfile --print-settings %s %f
 gtk-visible-focus = automatic
diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls.css b/desktop-themes/BlackMATE/gtk-3.0/window-controls.css
index 63d47c9d..b3811653 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/window-controls.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls.css
@@ -30,6 +30,7 @@ headerbar .left button.close.titlebutton,
 headerbar .left button.close.titlebutton:backdrop,
 headerbar .left:dir(rtl) button.close.titlebutton,
 headerbar .left:dir(rtl) button.close.titlebutton:backdrop {
+ padding: 5px;
 color: transparent;
 background-position: center;
 background-repeat: no-repeat;