BlackMATE: update GTK3 to 3.10

5 files changed, 251 insertions, 31 deletions

diff --git a/desktop-themes/BlackMATE/README b/desktop-themes/BlackMATE/README
index 8034e2e1..841bc5a6 100644
--- a/desktop-themes/BlackMATE/README
+++ b/desktop-themes/BlackMATE/README
@@ -70,14 +70,3 @@ table.headmeta {color: #fff;}
 	color: #000;
 }
 
-Ubuntu Software Center (thanks to Marcelo Ruiz)
-===============================================
-Find the following definitions in '/usr/share/software-center/ui/gtk3/css/softwarecenter.css':
-
-@define-color light-aubergine
-@define-color super-light-aubergine
-
-Then, change their values to #4D4D4D and #3B3B3E respectively, i.e.
-
-@define-color light-aubergine #4D4D4D;
-@define-color super-light-aubergine #3B3B3E;
diff --git a/desktop-themes/BlackMATE/gtk-3.0/assets/Makefile.am b/desktop-themes/BlackMATE/gtk-3.0/assets/Makefile.am
index bfa67066..7eec6fed 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/assets/Makefile.am
+++ b/desktop-themes/BlackMATE/gtk-3.0/assets/Makefile.am
@@ -70,6 +70,8 @@ theme_DATA = \
 	scale-slider-vertical-dark.svg \
 	scale-slider-vertical-insensitive-dark.svg \
 	sidebar-radio-checked-dark.svg \
+	slider_fine_horizontal.svg \
+	slider_fine_vertical.svg
 	sidebar-radio-prelight.svg \
 	sidebar-radio-selected-dark.svg \
 	sidebar-radio-selected-prelight.svg \
diff --git a/desktop-themes/BlackMATE/gtk-3.0/assets/slider_fine_horizontal.svg b/desktop-themes/BlackMATE/gtk-3.0/assets/slider_fine_horizontal.svg
new file mode 100644
index 00000000..dcb96063
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/assets/slider_fine_horizontal.svg
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   version="1.1"
+   height="12"
+   width="20"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="slider_fine_horizontal.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="898"
+     inkscape:window-height="651"
+     id="namedview16"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="3.7906997"
+     inkscape:cy="7.8757062"
+     inkscape:window-x="239"
+     inkscape:window-y="282"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7386" />
+  <g
+     transform="translate(-183.99822,-521.99944)"
+     id="layer9"
+     style="display:inline" />
+  <g
+     transform="translate(-183.99822,-521.99944)"
+     id="layer10" />
+  <g
+     transform="translate(-183.99822,-521.99944)"
+     id="layer11" />
+  <g
+     transform="translate(-183.99822,-521.99944)"
+     id="layer13" />
+  <g
+     transform="translate(-183.99822,-521.99944)"
+     id="layer14" />
+  <g
+     transform="translate(-183.99822,-521.99944)"
+     id="layer15" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3490-2"
+     d="m 2.5002225,6.0006706 a 1.5000001,1.5000001 0 0 0 3,0 1.5000001,1.5000001 0 1 0 -3,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3490-3-0"
+     d="m 6.5002215,6.0006706 a 1.5000005,1.5000005 0 0 0 3.000001,0 1.5000001,1.5000001 0 1 0 -3,0 z" />
+  <path
+     d="m 10.499776,6.0006706 a 1.5000005,1.5000005 0 0 0 3.000001,0 1.5000001,1.5000001 0 1 0 -3,0 z"
+     id="path2997"
+     style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     inkscape:connector-curvature="0" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path2999"
+     d="m 14.499776,6.0006706 a 1.5000005,1.5000005 0 0 0 3.000001,0 1.5000001,1.5000001 0 1 0 -2.999999,0 z" />
+</svg>
diff --git a/desktop-themes/BlackMATE/gtk-3.0/assets/slider_fine_vertical.svg b/desktop-themes/BlackMATE/gtk-3.0/assets/slider_fine_vertical.svg
new file mode 100644
index 00000000..fdec5e38
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/assets/slider_fine_vertical.svg
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   version="1.1"
+   height="20"
+   width="12"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="slider_fine_vertical.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="898"
+     inkscape:window-height="651"
+     id="namedview16"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-8.8813559"
+     inkscape:cy="10.847458"
+     inkscape:window-x="429"
+     inkscape:window-y="363"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7386" />
+  <g
+     transform="translate(-180,-514)"
+     id="layer9"
+     style="display:inline" />
+  <g
+     transform="translate(-180,-514)"
+     id="layer10" />
+  <g
+     transform="translate(-180,-514)"
+     id="layer11" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3490-2"
+     d="m 6.0003872,17.499777 a 1.5000001,1.5000001 0 0 0 0,-3 1.5000001,1.5000001 0 1 0 0,3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3490-3-0"
+     d="m 6.0003872,13.499778 a 1.5000004,1.5000004 0 0 0 0,-3 1.5000001,1.5000001 0 1 0 0,2.999999 z" />
+  <g
+     transform="translate(-180,-514)"
+     id="layer13" />
+  <g
+     transform="translate(-180,-514)"
+     id="layer14" />
+  <g
+     transform="translate(-180,-514)"
+     id="layer15" />
+  <path
+     d="m 6.0003872,9.5002235 a 1.5000004,1.5000004 0 0 0 0,-3.0000008 1.5000001,1.5000001 0 1 0 0,2.9999998 z"
+     id="path2992"
+     style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     inkscape:connector-curvature="0" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path2994"
+     d="m 6.0003872,5.5002235 a 1.5000004,1.5000004 0 0 0 0,-3.0000008 1.5000001,1.5000001 0 1 0 0,2.9999998 z" />
+</svg>
diff --git a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
index 01b573d9..9a4f65bd 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
@@ -42,7 +42,8 @@
 
 	-WnckTasklist-fade-overlay-rect: 0;
 
-	border-radius: 3px;
+	/* this makes emacs behave weirdly */
+	/*border-radius: 3px;*/
 
 	-GtkWidget-focus-padding: 2;
 	-GtkWidget-focus-line-width: 1;
@@ -116,6 +117,7 @@
 	background-color: shade(@inactive_frame_color, 0.93);
 }*/
 
+.content-view.view.rubberband,
 .view.rubberband,
 .rubberband {
 	background-color: alpha(@theme_selected_bg_color, 0.35);
@@ -524,6 +526,7 @@ GtkCalendar {
 	border-width: 1px;
 	border-color: alpha(@frame_color, 0.6);
 	padding: 2px;
+	border-radius: 3px;
 }
 
 /***************
@@ -594,6 +597,7 @@ GtkLevelBar.vertical {
  *************/
 GtkNotebook {
 	background-color: transparent;
+	border-radius: 3px;
 }
 
 .notebook {
@@ -1039,6 +1043,15 @@ row {
 	background-color: transparent;
 }
 
+.scale.slider.fine-tune:active,
+.scale.slider.fine-tune:active:hover,
+.scale.slider.fine-tune.horizontal:active,
+.scale.slider.fine-tune.horizontal:active:hover {
+	background-size: 80%;
+	background-repeat: no-repeat;
+	background-position: center;
+}
+
 .scale.trough {
 	background-image: linear-gradient(to bottom,
 	                                  shade(@theme_bg_color, 0.5),
@@ -1132,7 +1145,9 @@ GtkComboBox .menu {
  * Buttons *
  ***********/
 .button {
-	padding: 0;
+	/* Due to a bug somewhere in gtk or cairo,
+	   a padding of zero (or even one) doesn't work always!!! */
+	padding: 2px;
 
 	border-radius: 3px;
 	border-width: 1px;
@@ -1390,6 +1405,26 @@ GtkComboBox .menu {
 	background-color: shade(@theme_bg_color, 1.5);
 }
 
+.scrollbar.slider.fine-tune:prelight:active {
+	background-image: url("assets/slider_fine_horizontal.svg"),
+	                  linear-gradient(to top,
+	                                  shade(@scroll_slider_color, 3.3),
+	                                  shade(@scroll_slider_color, 1.6) 55%,
+	                                  shade(@scroll_slider_color, 0.6));
+	background-repeat: no-repeat;
+	background-position: center;
+}
+
+.scrollbar.slider.vertical.fine-tune:prelight:active {
+	background-image: url("assets/slider_fine_vertical.svg"),
+	                  linear-gradient(to left,
+	                                  shade(@scroll_slider_color, 3.3),
+	                                  shade(@scroll_slider_color, 1.6) 55%,
+	                                  shade(@scroll_slider_color, 0.6));
+	background-repeat: no-repeat;
+	background-position: center;
+}
+
 /*********
  * Menus *
  *********/
@@ -1484,8 +1519,8 @@ GtkComboBox .menu {
 .menu.button:hover {
 	color: @theme_main_color;
 	background-image: linear-gradient(to bottom,
-	                                  #ffffff,
-	                                  #808080);
+	                                  #999999,
+	                                  #404040);
 }
 
 .menu.button:insensitive {
@@ -1563,7 +1598,7 @@ GtkMenuButton .menu {
 }
 
 .toolbar .button.text-button {
-	padding: 2px 16px;
+	padding: 2px 5px;
 }
 
 .toolbar .button.image-button {
@@ -1726,16 +1761,17 @@ GtkMenuButton .menu {
 	border-width: 0 0 1px;
 	border-style: solid;
 	padding: 0 1px;
+	border-radius: 0px;
 
 	background-color: @theme_bg_color;
-	background-image: linear-gradient(to bottom,
+	/*background-image: linear-gradient(to bottom,
 	                                  @toolbar_gradient_base,
-	                                  shade(@theme_bg_color, 1.6));
+	                                  shade(@theme_bg_color, 1.6));*/
 	border-color: alpha(@frame_color, 0.6);
 }
 
 .notebook GtkContainer .header-bar {
-	border-color: alpha(@frame_color, 0.6);
+	background-color: @theme_bg_color;
 }
 
 
@@ -1804,20 +1840,20 @@ GtkOverlay.osd {
 	background-color: @osd_button_bg_insensitive_active;
 }
 
-.osd.button *:hover,
-.osd .button *:hover {
+.osd.button:hover,
+.osd .button:hover {
 	color: @osd_button_fg_hover;
 }
 
-.osd .button *:active,
-.osd .button *:hover:active {
+.osd .button:active,
+.osd .button:hover:active {
 	color: @osd_button_fg_active;
 }
 
-.osd.button *:insensitive,
-.osd.button *:insensitive:active,
-.osd .button *:insensitive,
-.osd .button *:insensitive:active {
+.osd.button:insensitive,
+.osd.button:insensitive:active,
+.osd .button:insensitive,
+.osd .button:active *:insensitive {
 	color: @osd_button_fg_insensitive;
 }
 
@@ -1845,7 +1881,7 @@ GtkOverlay.osd {
     border-color: @osd_button_border;
 }
 
-.osd GtkMenuButton.button *:active {
+.osd GtkMenuButton.button:active {
     color: @osd_button_fg_active;
     text-shadow: 0 -1px @osd_button_shadow;
 }
@@ -1954,6 +1990,12 @@ GtkProgressBar.osd.progressbar {
 
 /* Not different from other buttons. */
 
+/******************************
+ * Destructive action buttons *
+ ******************************/
+
+/* not different from other buttons */
+
 /**************************
  * Selection Mode classes *
  **************************/
@@ -1995,7 +2037,7 @@ GtkAssistant .sidebar {
  * GtkSwitch *
  *************/
 GtkSwitch {
-	font: bold condensed 10;
+	font: bold condensed;
 }
 
 GtkSwitch.trough {
@@ -2058,11 +2100,11 @@ GtkSwitch.slider:active {
 GtkSwitch.slider:insensitive {
 	border-style: none;
 	background-image: none;
-	background-color: shade(@switch_slider_color, 0.6)
+	background-color: shade(@switch_slider_color, 0.6);
 }
 
 .notebook GtkContainer GtkSwitch.slider:insensitive {
-	background-color: shade(@switch_slider_color, 0.6)
+	background-color: shade(@switch_slider_color, 0.6);
 }
 
 GtkStatusbar {
@@ -2485,6 +2527,7 @@ GtkCalendar.highlight {
 GtkInfoBar {
 	border-width: 0;
 	border-style: none;
+	border-radius: 3px;
 }
 
 .info .entry,