ContrastHigh GTK3: add support for mate-panel, caja, mate-terminal

5 files changed, 364 insertions, 110 deletions

diff --git a/desktop-themes/ContrastHigh/gtk-3.0/Makefile.am b/desktop-themes/ContrastHigh/gtk-3.0/Makefile.am
index fde2eadd..8cb514ac 100644
--- a/desktop-themes/ContrastHigh/gtk-3.0/Makefile.am
+++ b/desktop-themes/ContrastHigh/gtk-3.0/Makefile.am
@@ -3,6 +3,8 @@ themedir = $(datadir)/themes/ContrastHigh/gtk-3.0
 theme_DATA = \
 	gtk.css \
 	gtk-widgets.css \
+	mate-applications.css \
+	resize-grip.svg \
 	settings.ini
 
 EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css
index 90618ff4..1c9bb5cd 100644
--- a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css
@@ -44,8 +44,8 @@
     -GtkComboBox-arrow-scaling: 0.9;
     -GtkButton-default-border: 0;
 
-    -GtkWindow-resize-grip-width: 0;
-    -GtkWindow-resize-grip-height: 0;
+    -GtkWindow-resize-grip-width: 15;
+    -GtkWindow-resize-grip-height: 15;
 
     -GtkStatusbar-shadow-type: none;
 
@@ -137,7 +137,8 @@ GtkImage:insensitive {
 }
 
 .grip {
-    background-color: @theme_insensitive_color;
+	background-color: transparent;
+	background-image: url("resize-grip.svg");
 }
 
 .separator {
@@ -1229,117 +1230,12 @@ GtkProgressBar.osd.progressbar {
     box-shadow: 0 2px 5px 1px alpha(black, 0.7);
 }
 
-/**********************
- * Fallback Mode Panel
- **********************/
-
-/* the panel bar itself */
-.gnome-panel-menu-bar,
-PanelApplet > GtkMenuBar.menubar,
-PanelToplevel,
-PanelWidget,
-PanelAppletFrame,
-PanelApplet {
-    color: @os_chrome_fg_color;
-
-    background-color: @os_chrome_bg_color;
-    background-image: none;
-}
-
-/* applets on the panel */
-ClockBox,
-.gnome-panel-menu-bar,
-PanelApplet > GtkMenuBar.menubar {
-    font: bold;
-}
-
-.gnome-panel-menu-bar .menuitem,
-PanelApplet > GtkMenuBar.menubar .menuitem {
-    color: @os_chrome_fg_color;
-}
-
-.gnome-panel-menu-bar .menuitem:hover,
-PanelApplet > GtkMenuBar.menubar .menuitem:hover {
-    color: @os_chrome_selected_fg_color;
-    background-color: @os_chrome_selected_bg_color;
-}
-
-.gnome-panel-menu-bar .menuitem *:hover,
-PanelApplet > GtkMenuBar.menubar .menuitem *:hover {
-    text-shadow: 0 1px @os_chrome_bg_color;
-}
-
-/* dropdown menus from applets */
-.gnome-panel-menu-bar .menu,
-PanelApplet > GtkMenuBar.menubar .menu {
-    font: regular;
-}
-
-.gnome-panel-menu-bar .menu *:hover,
-PanelApplet > GtkMenuBar.menubar .menu *:hover {
-    text-shadow: none;
-}
-
-.gnome-panel-menu-bar .menu .menuitem,
-PanelApplet > GtkMenuBar.menubar .menu .menuitem {
-    color: @theme_fg_color;
-}
-
-.gnome-panel-menu-bar .menu .menuitem:hover,
-PanelApplet > GtkMenuBar.menubar .menu .menuitem:hover {
-    color: @os_chrome_selected_fg_color;
-    background-color: @os_chrome_selected_bg_color;
-}
-
-/* application buttons */
-PanelApplet .button,
-PanelApplet .button:hover {
-    padding: 4px;
-
-    border-image: none;
-    border-width: 0;
-    border-radius: 0;
-
-    background-image: none;
-    background-color: @os_chrome_bg_color;
-
-    color: @os_chrome_fg_color;
-    text-shadow: none;
-}
-
-PanelApplet .button:active:hover,
-PanelApplet .button:active {
-    border-image: none;
-    background-image: none;
-    background-color: @os_chrome_selected_bg_color;
-    border-width: 0;
-    border-radius: 0;
-}
-
-PanelApplet *:hover {
-    color: @os_chrome_selected_fg_color;
-}
-
-PanelApplet *:active,
-PanelApplet *:hover:active {
-    color: @os_chrome_selected_fg_color;
-    text-shadow: 0 1px @os_chrome_bg_color;
-}
-
-WnckPager {
-    background-color: lighter(@os_chrome_selected_bg_color);
-}
-
-NaTrayApplet {
-    -NaTrayApplet-icon-padding: 12;
-    -NaTrayApplet-icon-size: 16;
-}
-
 /****************
  * App-specific *
  ****************/
 TerminalScreen {
-    background-color: @theme_base_color;
+    -TerminalWindow-background-darkness: 0.95;
+    background-color: shade (@theme_base_color, 0.95);
     color: @theme_fg_color;
 }
 
diff --git a/desktop-themes/ContrastHigh/gtk-3.0/gtk.css b/desktop-themes/ContrastHigh/gtk-3.0/gtk.css
index 6ef136ac..e5c5b4ea 100644
--- a/desktop-themes/ContrastHigh/gtk-3.0/gtk.css
+++ b/desktop-themes/ContrastHigh/gtk-3.0/gtk.css
@@ -89,3 +89,4 @@
 }
 
 @import url("gtk-widgets.css");
+@import url("mate-applications.css");
diff --git a/desktop-themes/ContrastHigh/gtk-3.0/mate-applications.css b/desktop-themes/ContrastHigh/gtk-3.0/mate-applications.css
new file mode 100644
index 00000000..b4e004df
--- /dev/null
+++ b/desktop-themes/ContrastHigh/gtk-3.0/mate-applications.css
@@ -0,0 +1,238 @@
+/************
+ * Caja *
+ ************/
+
+.caja-cluebar-label {
+    color: @theme_base_color;
+    font: bold;
+}
+
+CajaWindow .sidebar .frame {
+    border-style: none;
+}
+
+CajaNotebook.notebook {
+    border-right-width: 0;
+    border-left-width: 0;
+    border-bottom-width: 0;
+}
+
+CajaNotebook .frame {
+    border-width: 0;
+}
+
+CajaWindow .pane-separator {
+    border-width: 0 1px 0 0;
+    border-style: solid;
+    border-color: @theme_border_color;
+}
+
+.caja-desktop.caja-canvas-item {
+    color: @theme_base_color;
+    text-shadow: 1px 1px black;
+}
+
+.caja-desktop.caja-canvas-item:selected {
+    color: @theme_base_color;
+}
+
+.caja-desktop.caja-canvas-item:backdrop {
+    background-color: @theme_fg_color;
+}
+
+.caja-desktop.caja-canvas-item:active,
+.caja-desktop.caja-canvas-item:prelight,
+.caja-desktop.caja-canvas-item:selected {
+    text-shadow: none;
+}
+
+/****************
+ * Mate-Panel *
+ ****************/
+
+/* the panel bar itself */
+.mate-panel-menu-bar,
+MatePanelApplet > GtkMenuBar.menubar,
+PanelToplevel,
+PanelWidget,
+PanelFrame,
+PanelAppletFrame,
+MatePanelAppletFrameDBus,
+MatePanelAppletContainer,
+MatePanelApplet {
+	background-image: none;
+	background-color: @theme_base_color;
+	padding: 0;
+	color: @theme_fg_color;
+	text-shadow: none;
+}
+
+MatePanelApplet {
+	border-width: 0;
+}
+
+PanelSeparator {
+	border-width: 0;
+	background-image: none;
+	color: shade (@theme_fg_color, 1.65);
+	text-shadow: none;
+}
+
+.mate-panel-menu-bar .menuitem,
+MatePanelApplet > GtkMenuBar.menubar .menuitem {
+    color: @os_chrome_fg_color;
+}
+
+.mate-panel-menu-bar .menuitem:hover,
+MatePanelApplet > GtkMenuBar.menubar .menuitem:hover {
+    color: @os_chrome_selected_fg_color;
+    background-color: @os_chrome_selected_bg_color;
+}
+
+.mate-panel-menu-bar .menuitem *:hover,
+MatePanelApplet > GtkMenuBar.menubar .menuitem *:hover {
+    text-shadow: 0 1px @os_chrome_bg_color;
+}
+
+/* dropdown menus from applets */
+.mate-panel-menu-bar .menu,
+MatePanelApplet > GtkMenuBar.menubar .menu {
+    font: regular;
+}
+
+.mate-panel-menu-bar .menu *:hover,
+MatePanelApplet > GtkMenuBar.menubar .menu *:hover {
+    text-shadow: none;
+}
+
+.mate-panel-menu-bar .menu .menuitem,
+MatePanelApplet > GtkMenuBar.menubar .menu .menuitem {
+    color: @theme_fg_color;
+}
+
+.mate-panel-menu-bar .menu .menuitem:hover,
+MatePanelApplet > GtkMenuBar.menubar .menu .menuitem:hover {
+    color: @os_chrome_selected_fg_color;
+    background-color: @os_chrome_selected_bg_color;
+}
+
+/* desktop-applet, clockapplet, drivemount, character-map,
+dictionary */
+MatePanelApplet .button {
+	padding: 4px;
+
+	border-radius: 0px;
+	border-width: 0px;
+	border-style: solid;
+	text-shadow: none;
+
+    color: @theme_fg_color;
+    background-image: none;
+    background-color: @os_chrome_bg_color;
+}
+
+MatePanelApplet .button:active:hover,
+MatePanelApplet .button:active {
+    border-image: none;
+    background-image: none;
+    background-color: @os_chrome_selected_bg_color;
+    border-width: 0;
+    border-radius: 0;
+}
+
+MatePanelApplet .button:hover {
+    border-image: none;
+    background-image: none;
+    background-color: @os_chrome_selected_bg_color;
+    border-width: 0;
+    border-radius: 0;
+}
+
+MatePanelApplet *:hover {
+    color: @os_chrome_selected_fg_color;
+}
+
+MatePanelApplet *:active,
+MatePanelApplet *:hover:active {
+    color: @os_chrome_selected_fg_color;
+    text-shadow: 0 1px @os_chrome_bg_color;
+}
+
+/*Wncklist */
+WnckTasklist .button {
+	padding: 4px;
+
+	border-radius: 0px;
+	border-width: 0px;
+	border-style: solid;
+	text-shadow: none;
+
+    color: @os_chrome_fg_color;
+    background-image: none;
+    background-color: @os_chrome_bg_color;
+}
+
+WnckTasklist .button:active:hover,
+WnckTasklist .button:active {
+    border-image: none;
+    background-image: none;
+    background-color: @os_chrome_selected_bg_color;
+    border-width: 0;
+    border-radius: 0;
+}
+
+WnckTasklist .button:hover {
+    border-image: none;
+    background-image: none;
+    background-color: @os_chrome_selected_bg_color;
+    border-width: 0;
+    border-radius: 0;
+}
+
+ClockBox,
+.mate-panel-menu-bar.menubar,
+MatePanelApplet > GtkMenuBar.menubar {
+	font: normal;
+}
+
+WnckPager {
+	background-image: none;
+	border-color: transparent;
+	background-color: shade(@theme_base_color, 0.9);
+	text-shadow: none;
+}
+
+/* prelight of WnckPager */
+MatePanelApplet *:hover {
+	background-image: linear-gradient(to bottom,
+		shade (@theme_selected_bg_color, 2.86),
+		shade (@theme_selected_bg_color, 1.0));
+	background-color: @theme_base_color;
+}
+
+/* Classic icon style */
+/*.mate-panel-menu-bar {
+	-PanelMenuBar-icon-visible: true;
+}*/
+
+NaTrayApplet {
+	background-image: none;
+	background-color: @theme_base_color;
+	padding: 0;
+	color: @theme_fg_color;
+	text-shadow: none;
+/*	-NaTrayApplet-icon-padding: 12;
+	-NaTrayApplet-icon-size: 16;*/
+}
+
+/****************
+ * Mate-Terminal *
+ ****************/
+
+/* Background mate-terminal, this isn't the normal way to style that! */
+TerminalWindow .entry {
+    -TerminalWindow-background-darkness: 0.95;
+    background-color: shade (@theme_base_color, 0.95);
+    color: @theme_fg_color;
+}
+
diff --git a/desktop-themes/ContrastHigh/gtk-3.0/resize-grip.svg b/desktop-themes/ContrastHigh/gtk-3.0/resize-grip.svg
new file mode 100644
index 00000000..fa1f5872
--- /dev/null
+++ b/desktop-themes/ContrastHigh/gtk-3.0/resize-grip.svg
@@ -0,0 +1,117 @@
+<?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"
+   width="13"
+   height="13"
+   id="svg17653"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="resize-grip.svg">
+  <defs
+     id="defs17655" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="21.311078"
+     inkscape:cx="-8.2186936"
+     inkscape:cy="8.0008486"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1022"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata17658">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-3)">
+    <path
+       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-392.19484)"
+       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+       sodipodi:ry="1.9003495"
+       sodipodi:rx="1.9003495"
+       sodipodi:cy="617.14966"
+       sodipodi:cx="868.63647"
+       id="path5513"
+       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       id="path5515"
+       sodipodi:cx="868.63647"
+       sodipodi:cy="617.14966"
+       sodipodi:rx="1.9003495"
+       sodipodi:ry="1.9003495"
+       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+       transform="matrix(0.65777374,0,0,0.65777374,-563.84354,-392.19484)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       id="path5517"
+       sodipodi:cx="868.63647"
+       sodipodi:cy="617.14966"
+       sodipodi:rx="1.9003495"
+       sodipodi:ry="1.9003495"
+       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-395.46756)" />
+    <path
+       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-398.74029)"
+       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+       sodipodi:ry="1.9003495"
+       sodipodi:rx="1.9003495"
+       sodipodi:cy="617.14966"
+       sodipodi:cx="868.63647"
+       id="path5519"
+       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(0.65777374,0,0,0.65777374,-567.11626,-392.19484)"
+       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+       sodipodi:ry="1.9003495"
+       sodipodi:rx="1.9003495"
+       sodipodi:cy="617.14966"
+       sodipodi:cx="868.63647"
+       id="path5521"
+       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(0.65777374,0,0,0.65777374,-563.84354,-395.46756)"
+       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+       sodipodi:ry="1.9003495"
+       sodipodi:rx="1.9003495"
+       sodipodi:cy="617.14966"
+       sodipodi:cx="868.63647"
+       id="path5523"
+       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       sodipodi:type="arc" />
+  </g>
+</svg>