Merge branch 'master' of github.com:mate-desktop/mate-themes

2 files changed, 217 insertions, 34 deletions

diff --git a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css
index fe0fd836..9ee1ad49 100644
--- a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css
@@ -47,10 +47,12 @@
     -GtkWindow-resize-grip-width: 0;
     -GtkWindow-resize-grip-height: 0;
 
+    -GtkStatusbar-shadow-type: none;
+
     background-clip: padding-box;
 }
 
-GtkWindow {
+.background {
     color: @theme_fg_color;
     background-color: @theme_base_color;
 }
@@ -63,6 +65,7 @@ GtkClutterOffscreen {
 *:insensitive {
     background-color: @theme_button_insensitive_bg;
     border-color: @theme_button_insensitive_active_bg;
+    color: @theme_insensitive_color;
 }
 
 *:selected {
@@ -143,6 +146,38 @@ GtkImage:insensitive {
 
 .floating-bar {
     background-color: @theme_insensitive_bg;
+    border-width: 1px;
+    border-radius: 3px;
+    border-style: solid;
+}
+
+.floating-bar.top {
+    border-top-width: 0;
+    border-top-right-radius: 0;
+    border-top-left-radius: 0;
+}
+
+.floating-bar.right {
+    border-right-width: 0;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+}
+
+.floating-bar.bottom {
+    border-bottom-width: 0;
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 0;
+}
+
+.floating-bar.left {
+    border-left-width: 0;
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+}
+
+.floating-bar .button {
+    background-color: transparent;
+    border-style: none;
 }
 
 GtkColorButton.button {
@@ -242,6 +277,10 @@ GtkLevelBar.vertical {
     color: @theme_button_fg;
 }
 
+.button.image-button {
+    padding: 5px;
+}
+
 .button:active {
     background-color: @theme_button_active_bg;
     color: @theme_base_color;
@@ -250,18 +289,20 @@ GtkLevelBar.vertical {
 
 .button:insensitive {
     background-color: @theme_button_insensitive_bg;
-    color: @theme_button_insensitive_fg;
     border-color: @theme_button_insensitive_border;
 }
 
-GtkComboBox:insensitive {
-    color: @theme_button_insensitive_fg
+.button:active *:insensitive {
+    background-color: @theme_button_insensitive_active_bg;
+    border-color: @theme_button_insensitive_active_border;
 }
 
-.button:insensitive:active {
-    background-color: @theme_button_insensitive_active_bg;
+.button *:insensitive {
+    color: @theme_button_insensitive_fg;
+}
+
+.button *:insensitive:active {
     color: @theme_button_insensitive_active_fg;
-    border-color: @theme_button_insensitive_active_border;
 }
 
 .button:hover {
@@ -275,6 +316,17 @@ GtkComboBox:insensitive {
     border-color: @theme_fg_color;
 }
 
+GtkComboBox .separator {
+    /* always disable separators */
+    -GtkWidget-wide-separators: true;
+    -GtkWidget-horizontal-separator: 0;
+    -GtkWidget-vertical-separator: 0;
+}
+
+GtkComboBox *:insensitive {
+    color: @theme_button_insensitive_fg
+}
+
 /***********
  * Entries *
  ***********/
@@ -455,38 +507,34 @@ GtkComboBox .button {
 /*********
  * Menus *
  *********/
+.menu {
+    border-style: solid;
+    border-color: @theme_fg_color;
+    border-width: 1px;
+
+    color: @theme_fg_color;
+}
+
 .menuitem {
     color: @theme_fg_color;
+    background-color: transparent;
 }
 
 .menuitem:insensitive {
     color: @theme_button_insensitive_fg;
 }
 
-.menubar .menuitem {
-    padding: 3px 5px;
-}
-
-.menubar .menuitem:hover {
-    background-color: @theme_active_color;
+.menuitem:hover {
     color: @theme_base_color;
+    background-color: @theme_active_color;
 }
 
 .menu .menuitem {
     padding: 4px;
 }
 
-.menu .menuitem:hover {
-    background-color: @theme_active_color;
-    color: @theme_base_color;
-}
-
-.menu {
-    border-style: solid;
-    border-color: @theme_fg_color;
-    border-width: 1px;
-
-    color: @theme_fg_color;
+.menubar .menuitem {
+    padding: 3px 5px;
 }
 
 .menuitem.separator {
@@ -510,6 +558,14 @@ GtkComboBox .button {
     padding: 1px;
 }
 
+.toolbar .button.text-button {
+    padding: 2px 16px;
+}
+
+.toolbar .button.image-button {
+    padding: 5px;
+}
+
 .toolbar .button:insensitive {
     background-color: @theme_base_color;
 }
@@ -661,6 +717,20 @@ GtkComboBox .button {
     border-width: 2px;
 }
 
+.linked.vertical .button {
+    border-width: 0 2px 2px;
+    border-radius: 0;
+}
+
+.linked.vertical .button:first-child {
+    border-radius: 3px 3px 0 0;
+    border-width: 2px;
+}
+
+.linked.vertical .button:last-child {
+    border-radius: 0 0 3px 3px;
+}
+
 /**********
  * Scales *
  **********/
@@ -987,6 +1057,13 @@ GtkIconView.view.cell {
     border-radius: 4px;
 }
 
+/**************
+ * List boxes *
+ **************/
+.list-row:hover {
+    background-color: @theme_button_bg;
+}
+
 /*******
  * OSD *
  *******/
@@ -1027,6 +1104,107 @@ GtkIconView.view.cell {
     background-color: @theme_base_color;
 }
 
+GtkProgressBar.osd {
+    -GtkProgressBar-min-horizontal-bar-height: 12px;
+}
+
+GtkProgressBar.osd.trough {
+    padding: 0;
+    border-radius: 0;
+    background-color: transparent;
+    border-style: none;
+}
+
+GtkProgressBar.osd.progressbar {
+    background-color: @theme_highlight_color;
+    border-radius: 0;
+    border-style: none;
+}
+
+/***************
+ * Header bars *
+ ***************/
+.header-bar {
+    border-width: 0 0 1px;
+    border-style: solid;
+    border-color: @theme_border_color;
+
+    background-color: @theme_base_color;
+
+    padding: 6px 6px 5px 6px;
+}
+
+.header-bar .button.text-button {
+    padding: 2px 16px;
+}
+
+.header-bar .button.image-button {
+    padding: 5px;
+}
+
+.header-bar .title {
+    font: Bold 11;
+}
+
+.header-bar .subtitle {
+    font: 9;
+}
+
+/*******
+ * CSD *
+ *******/
+.titlebar {
+    background-color: @theme_base_color;
+    border-radius: 7px 7px 0px 0px;
+}
+
+/* this is the default titlebar that is added by GTK
+ * when client-side decorations are in use and the application
+ * did not set a custom titlebar.
+ */
+.titlebar.default-decoration {
+    border: none;
+}
+
+.titlebar .title {
+    font: Bold 11;
+}
+
+.titlebar .titlebutton {
+    color: @theme_button_fg;
+    background-color: transparent;
+    padding: 5px;
+
+    border-color: transparent;
+}
+
+.titlebar .titlebutton:hover {
+    background-color: @theme_button_bg;
+    border-color: @theme_button_fg;
+    color: @theme_button_fg;
+}
+
+.titlebar .titlebutton:active {
+    background-color: @theme_button_active_bg;
+    color: @theme_base_color;
+}
+
+.window-frame {
+    border-color: darker(@theme_bg_color);
+    border-radius: 7px 7px 0 0;
+    border-width: 1px;
+    border-style: solid;
+
+    box-shadow: 0 2px 8px 3px alpha(black, 0.7);
+
+    /* this is used for the resize cursor area */
+    margin: 10px;
+}
+
+.window-frame:backdrop {
+    box-shadow: 0 2px 5px 1px alpha(black, 0.7);
+}
+
 /**********************
  * Fallback Mode Panel
  **********************/
@@ -1146,19 +1324,24 @@ TerminalScreen {
     font: bold;
 }
 
-NautilusWindow .pane-separator {
-    border-style: solid;
-    border-width: 1px;
-    border-color: @theme_border_color;
+NautilusWindow .sidebar .frame {
+    border-style: none;
 }
 
-NautilusWindow .sidebar .frame {
-    border-style: solid;
-    border-width: 1px 0 0 0;
+NautilusNotebook.notebook {
+    border-right-width: 0;
+    border-left-width: 0;
+    border-bottom-width: 0;
 }
 
-.nautilus-inactive-pane .view {
-    background-color: @theme_insensitive_bg;
+NautilusNotebook .frame {
+    border-width: 0;
+}
+
+NautilusWindow .pane-separator {
+    border-width: 0 1px 0 0;
+    border-style: solid;
+    border-color: @theme_border_color;
 }
 
 .nautilus-desktop.nautilus-canvas-item {
diff --git a/desktop-themes/ContrastHigh/metacity-1/metacity-theme-3.xml b/desktop-themes/ContrastHigh/metacity-1/metacity-theme-3.xml
index dbb15dae..86689ff7 100644
--- a/desktop-themes/ContrastHigh/metacity-1/metacity-theme-3.xml
+++ b/desktop-themes/ContrastHigh/metacity-1/metacity-theme-3.xml
@@ -5,7 +5,7 @@
 	<author>GNOME Art Team &lt;art.gnome.org&gt;</author>
 	<copyright>&#194; Intel, &#194; Red Hat, Lapo Calamandrei</copyright>
 	<date>2012</date>
-	<description>HighContrast GNOME 3 window theme</description>
+	<description>ContrastHigh MATE window theme</description>
 </info>
 
 <!-- meaningfull constants -->