summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2015-02-09 21:31:46 +0100
committerraveit65 <[email protected]>2015-02-09 21:31:46 +0100
commitbd25dd3fdeeb4032a47873c5ebdceb27d95ba370 (patch)
tree388c62e65bfcc58d43037fae93ea95132dbe65c7
parent7a13366db049de37c14c2865f33dc707c1f0e6db (diff)
downloadmate-themes-bd25dd3fdeeb4032a47873c5ebdceb27d95ba370.tar.bz2
mate-themes-bd25dd3fdeeb4032a47873c5ebdceb27d95ba370.tar.xz
Menta themes GTK3: adjust flat buttons in caja, pluma and m-c-c
- adjust transition timings - adjust GtkComboBox in primary toolbar
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/gtk-main.css5
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css10
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/mate-applications.css159
-rw-r--r--desktop-themes/Menta/gtk-3.0/gtk-main.css5
-rw-r--r--desktop-themes/Menta/gtk-3.0/gtk-widgets.css12
-rw-r--r--desktop-themes/Menta/gtk-3.0/mate-applications.css150
6 files changed, 281 insertions, 60 deletions
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css
index 17bff2b9..1ac34917 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css
@@ -177,6 +177,11 @@
@define-color selection_menu_active shade(@selection_menu_fg, 0.60);
/**************
+ * MATE Apps *
+ **************/
+@define-color cluebar_color shade (@theme_base_color, 0.9);
+
+/**************
* GNOME Apps *
**************/
@define-color entry_tag_bg shade(@theme_selected_bg_color, 0.89);
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
index 725982ad..f1d1b3b3 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
@@ -965,7 +965,7 @@ GtkComboBox.combobox-entry .button {
}
.button {
- transition: all 200ms ease-out;
+ transition: all 400ms ease-out;
-GtkButton-image-spacing: 4;
-GtkButton-interior-focus: true;
-GtkButton-default-border: 0;
@@ -982,6 +982,10 @@ GtkComboBox.combobox-entry .button {
color: @theme_selected_fg_color;
}
+.button.flat.hover {
+ border-radius: 3px;
+}
+
/* We may want a background for focused buttons, but in the meantime let's remove it too */
.primary-toolbar .button,
.primary-toolbar .button:insensitive,
@@ -2067,8 +2071,8 @@ GtkTreeMenu .menuitem,
}
.menu .menuitem {
- -GtkMenuItem-arrow-scaling: 0.4;
- transition: all 100ms ease-out;
+ -GtkMenuItem-arrow-scaling: 0.6;
+ transition: all 150ms ease-out;
padding: 4px;
}
diff --git a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
index 3ad917fb..027ef8cc 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
@@ -37,9 +37,7 @@ CajaPathbarButton:active:hover {
color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)));
}
-
/* For Places Sidebar diskfull indicators */
-
CajaPlacesTreeView {
-CajaPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, .65);
-CajaPlacesTreeView-disk-full-fg-color: shade(@theme_selected_bg_color, 1.0);
@@ -60,7 +58,58 @@ CajaPlacesTreeView:hover {
CajaPlacesTreeView:selected:hover {
}
-@define-color cluebar_color shade (@theme_base_color, 0.9);
+/* Caja places bar */
+CajaWindow .button.flat {
+ background-color: transparent;
+ background-image: linear-gradient(to bottom,
+ @button_gradient_color_a,
+ @button_gradient_color_b);
+ border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+ padding: 2px 5px;
+}
+
+CajaWindow .button.flat:hover {
+ background-color: transparent;
+ background-image: linear-gradient(to bottom,
+ @button_hover_gradient_color_a,
+ @button_hover_gradient_color_b);
+ border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+ padding: 2px 5px;
+}
+
+/* some overrides for button.flat */
+/* zoom button */
+CajaWindow .primary-toolbar .button.flat {
+ background-color: transparent;
+ background-image: linear-gradient(to bottom,
+ shade (@theme_bg_color, 1.0),
+ shade (@theme_bg_color, 0.96));
+}
+
+/* zoom button */
+CajaWindow .primary-toolbar .button.flat:hover {
+ background-color: transparent;
+ background-image: linear-gradient(to bottom,
+ @button_gradient_color_a,
+ @button_gradient_color_b);
+ border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+}
+
+/* ComboBox views */
+CajaWindow .toolbar GtkComboBox .button {
+ background-image: linear-gradient(to bottom,
+ shade (@theme_bg_color, 1.0),
+ shade (@theme_bg_color, 0.96));
+ padding: 4px 4px;
+}
+
+CajaWindow .toolbar GtkComboBox .button:hover {
+ background-image: linear-gradient(to bottom,
+ @button_gradient_color_a,
+ @button_gradient_color_b);
+ border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+ padding: 4px 4px;
+}
CajaWindow * {
-GtkPaned-handle-size: 0;
@@ -78,7 +127,6 @@ CajaWindow .view.rubberband {
}
/* sidebar */
-
CajaWindow .sidebar .view {
background-color: shade (@theme_bg_color, 1.08);
color: @theme_fg_color;
@@ -227,11 +275,10 @@ MatePanelApplet *:hover {
/* desktop-applet, clockapplet, drivemount, character-map,
dictionary */
MatePanelApplet .button {
- transition: all 300ms ease-out;
+ transition: all 400ms ease-out;
background-image: none;
background-color: @theme_bg_color;
color: @theme_text_color;
-
border-image: none;
border-style: solid;
border-width: 0px;
@@ -242,13 +289,11 @@ MatePanelApplet .button {
MatePanelApplet .button:active:hover,
MatePanelApplet .button:active {
- transition: all 300ms ease-out;
background-image: linear-gradient(to bottom,
shade (@theme_selected_bg_color, 0.86),
shade (@theme_selected_bg_color, 0.26));
background-color: @theme_base_color;
color: shade (@theme_selected_fg_color, 1.00);
-
border-image: none;
border-style: solid;
border-width: 0px;
@@ -258,13 +303,11 @@ MatePanelApplet .button:active {
}
MatePanelApplet .button:hover {
- transition: all 300ms ease-out;
background-image: linear-gradient(to bottom,
@theme_bg_color,
shade (@theme_selected_bg_color, 0.86));
background-color: @theme_base_color;
color: shade (@theme_text_color, 1.0);
-
border-image: none;
border-style: solid;
border-width: 0px;
@@ -275,13 +318,12 @@ MatePanelApplet .button:hover {
/*Wncklist */
WnckTasklist .button {
- transition: all 300ms ease-out;
+ transition: all 400ms ease-out;
background-image: linear-gradient(to bottom,
shade (@theme_bg_color, 1.0),
shade (@theme_bg_color, 0.96));
background-color: @theme_base_color;
color: @theme_text_color;
-
border-image: none;
border-style: solid;
border-width: 0px;
@@ -292,13 +334,11 @@ WnckTasklist .button {
WnckTasklist .button:active:hover,
WnckTasklist .button:active {
- transition: all 300ms ease-out;
background-image: linear-gradient(to bottom,
shade (@theme_selected_bg_color, 0.86),
shade (@theme_selected_bg_color, 0.26));
background-color: @theme_base_color;
color: shade (@theme_selected_fg_color, 1.00);
-
border-image: none;
border-style: solid;
border-width: 0px;
@@ -308,13 +348,11 @@ WnckTasklist .button:active {
}
WnckTasklist .button:hover {
- transition: all 300ms ease-out;
background-image: linear-gradient(to bottom,
@theme_bg_color,
shade (@theme_selected_bg_color, 0.86));
background-color: @theme_base_color;
color: shade (@theme_text_color, 1.0);
-
border-image: none;
border-style: solid;
border-width: 0px;
@@ -323,9 +361,13 @@ WnckTasklist .button:hover {
-GtkWidget-window-dragging: true;
}
+/* set normal menubar button */
+PanelMenuBar.menubar .menuitem {
+ transition: all 200ms ease-out;
+}
+
/* set selected menubar button */
PanelMenuBar.menubar .menuitem:hover {
- transition: all 300ms ease-out;
background-image: linear-gradient(to bottom,
shade (@theme_selected_bg_color, 0.86),
shade (@theme_selected_bg_color, 0.26));
@@ -337,10 +379,14 @@ PanelMenuBar.menubar .menuitem:hover {
border-radius: 5px;
}
+/* set normal menubar menuitem */
+PanelMenuBar.menubar .menu .menuitem {
+ transition: all 150ms ease-out;
+}
+
/* set selected menubar menuitem */
PanelMenuBar.menubar .menu .menuitem:active:hover,
PanelMenuBar.menubar .menu .menuitem:hover {
- transition: all 200ms ease-out;
background-color: @theme_selected_bg_color;
background-image: linear-gradient(to bottom,
shade (@theme_selected_bg_color, 1.0),
@@ -414,28 +460,79 @@ NaTrayApplet {
}
/****************
+ * Mate-Terminal *
+ ****************/
+
+TerminalWindow GtkNotebook.notebook tab {
+ padding: 2px;
+ border-color: transparent;
+ border-width: 0px;
+ background-image: none;
+ background-color: transparent;
+}
+
+TerminalWindow GtkNotebook.notebook tab.top,
+.notebook tab.bottom {
+ padding: 2px;
+}
+
+/****************
* Pluma *
****************/
/* pluma line numbers */
-
PlumaView {
background-color: shade (@theme_bg_color, 1.07);
}
-/****************
- * Mate-Terminal *
- ****************/
+/*FIXME normaly this isn't the right entry for adjusting
+the sidebar entry hover color*/
+PlumaWindow .view row:hover {
+ background-color: shade (@theme_selected_bg_color, 1.15);
+ color: shade (@theme_selected_bg_color, 0.35);
+}
-TerminalWindow GtkNotebook.notebook tab {
- padding: 2px;
- border-color: transparent;
- border-width: 0px;
- background-image: none;
- background-color: transparent;
+/* Pluma status bar */
+PlumaWindow .button.flat {
+ border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+ padding: 2px 5px;
}
-TerminalWindow GtkNotebook.notebook tab.top,
-.notebook tab.bottom {
- padding: 2px;
+PlumaWindow .button.flat:hover {
+ background-color: transparent;
+ background-image: linear-gradient(to bottom,
+ @button_gradient_color_a,
+ @button_gradient_color_b);
+ border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+ padding: 2px 5px;
+}
+
+/* surpress styling of close button */
+PlumaWindow .notebook tab .button.flat,
+PlumaWindow .notebook tab .button.flat:hover {
+ border-color: transparent;
+ background-color: transparent;
+ background-image: none;
+ box-shadow: inset 0 1px rgba(255,255,255,0), 0 1px rgba(255,255,255,0);
+ text-shadow: none;
+ icon-shadow: none;
+ border-image: none;
+}
+
+/***********************
+ * Mate-Control-Center *
+ ***********************/
+
+ShellWindow .button.flat {
+ border-image: none;
}
+
+/* button hover of applications */
+ShellWindow .button.flat:hover {
+ background-color: transparent;
+ background-image: linear-gradient(to bottom,
+ @button_hover_gradient_color_a,
+ @button_hover_gradient_color_b);
+ border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+}
+
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-main.css b/desktop-themes/Menta/gtk-3.0/gtk-main.css
index 50c12a70..ad320228 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-main.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-main.css
@@ -177,6 +177,11 @@
@define-color selection_menu_active shade(@selection_menu_fg, 0.60);
/**************
+ * MATE Apps *
+ **************/
+@define-color cluebar_color shade (@theme_base_color, 0.9);
+
+/**************
* GNOME Apps *
**************/
@define-color entry_tag_bg shade(@theme_selected_bg_color, 0.89);
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
index 75846a01..a7b16c01 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
@@ -965,7 +965,7 @@ GtkComboBox.combobox-entry .button {
}
.button {
- transition: all 200ms ease-out;
+ transition: all 400ms ease-out;
-GtkButton-image-spacing: 4;
-GtkButton-interior-focus: true;
-GtkButton-default-border: 0;
@@ -982,6 +982,10 @@ GtkComboBox.combobox-entry .button {
color: @theme_selected_fg_color;
}
+.button.flat.hover {
+ border-radius: 3px;
+}
+
/* We may want a background for focused buttons, but in the meantime let's remove it too */
.primary-toolbar .button,
.primary-toolbar .button:insensitive,
@@ -1785,7 +1789,7 @@ GtkComboBox.combobox-entry .button:hover,
GtkComboBox.combobox-entry .button:active,
GtkComboBox.combobox-entry .button:active:hover {
color: shade (@theme_selected_bg_color, 0.80);
- transition: all 200ms ease-in;
+ transition: all 400ms ease-in;
}
GtkComboBox .button {
@@ -2065,8 +2069,8 @@ GtkTreeMenu .menuitem,
}
.menu .menuitem {
- -GtkMenuItem-arrow-scaling: 0.4;
- transition: all 100ms ease-out;
+ -GtkMenuItem-arrow-scaling: 0.6;
+ transition: all 150ms ease-out;
padding: 4px;
}
diff --git a/desktop-themes/Menta/gtk-3.0/mate-applications.css b/desktop-themes/Menta/gtk-3.0/mate-applications.css
index 91d14570..c722cf4d 100644
--- a/desktop-themes/Menta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Menta/gtk-3.0/mate-applications.css
@@ -60,7 +60,58 @@ CajaPlacesTreeView:hover {
CajaPlacesTreeView:selected:hover {
}
-@define-color cluebar_color shade (@theme_base_color, 0.9);
+/* Caja places bar */
+CajaWindow .button.flat {
+ background-color: transparent;
+ background-image: linear-gradient(to bottom,
+ @button_gradient_color_a,
+ @button_gradient_color_b);
+ border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+ padding: 2px 5px;
+}
+
+CajaWindow .button.flat:hover {
+ background-color: transparent;
+ background-image: linear-gradient(to bottom,
+ @button_hover_gradient_color_a,
+ @button_hover_gradient_color_b);
+ border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+ padding: 2px 5px;
+}
+
+/* some overrides for button.flat */
+/* zoom button */
+CajaWindow .primary-toolbar .button.flat {
+ background-color: transparent;
+ background-image: linear-gradient(to bottom,
+ shade (@theme_bg_color, 1.0),
+ shade (@theme_bg_color, 0.96));
+}
+
+/* zoom button */
+CajaWindow .primary-toolbar .button.flat:hover {
+ background-color: transparent;
+ background-image: linear-gradient(to bottom,
+ @button_gradient_color_a,
+ @button_gradient_color_b);
+ border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+}
+
+/* ComboBox views */
+CajaWindow .toolbar GtkComboBox .button {
+ background-image: linear-gradient(to bottom,
+ shade (@theme_bg_color, 1.0),
+ shade (@theme_bg_color, 0.96));
+ padding: 4px 4px;
+}
+
+CajaWindow .toolbar GtkComboBox .button:hover {
+ background-image: linear-gradient(to bottom,
+ @button_gradient_color_a,
+ @button_gradient_color_b);
+ border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+ padding: 4px 4px;
+}
CajaWindow * {
-GtkPaned-handle-size: 0;
@@ -227,7 +278,7 @@ MatePanelApplet *:hover {
/* desktop-applet, clockapplet, drivemount, character-map,
dictionary */
MatePanelApplet .button {
- transition: all 300ms ease-out;
+ transition: all 400ms ease-out;
background-image: none;
background-color: @theme_bg_color;
color: @theme_text_color;
@@ -242,7 +293,6 @@ MatePanelApplet .button {
MatePanelApplet .button:active:hover,
MatePanelApplet .button:active {
- transition: all 300ms ease-out;
background-image: linear-gradient(to bottom,
shade (@theme_selected_bg_color, 0.86),
shade (@theme_selected_bg_color, 0.26));
@@ -257,7 +307,6 @@ MatePanelApplet .button:active {
}
MatePanelApplet .button:hover {
- transition: all 300ms ease-out;
background-image: linear-gradient(to bottom,
@theme_bg_color,
shade (@theme_selected_bg_color, 0.86));
@@ -273,7 +322,7 @@ MatePanelApplet .button:hover {
/*Wncklist */
WnckTasklist .button {
- transition: all 300ms ease-out;
+ transition: all 400ms ease-out;
background-image: linear-gradient(to bottom,
shade (@theme_bg_color, 1.0),
shade (@theme_bg_color, 0.96));
@@ -290,7 +339,6 @@ WnckTasklist .button {
WnckTasklist .button:active:hover,
WnckTasklist .button:active {
- transition: all 300ms ease-out;
background-image: linear-gradient(to bottom,
shade (@theme_selected_bg_color, 0.86),
shade (@theme_selected_bg_color, 0.26));
@@ -305,7 +353,6 @@ WnckTasklist .button:active {
}
WnckTasklist .button:hover {
- transition: all 300ms ease-out;
background-image: linear-gradient(to bottom,
@theme_bg_color,
shade (@theme_selected_bg_color, 0.86));
@@ -319,9 +366,13 @@ WnckTasklist .button:hover {
-GtkWidget-window-dragging: true;
}
+/* set normal menubar button */
+PanelMenuBar.menubar .menuitem:hover {
+ transition: all 200ms ease-out;
+}
+
/* set selected menubar button */
PanelMenuBar.menubar .menuitem:hover {
- transition: all 300ms ease-out;
background-image: linear-gradient(to bottom,
shade (@theme_selected_bg_color, 0.86),
shade (@theme_selected_bg_color, 0.26));
@@ -333,10 +384,14 @@ PanelMenuBar.menubar .menuitem:hover {
border-radius: 5px;
}
+/* set normal menubar menuitem */
+PanelMenuBar.menubar .menu .menuitem {
+ transition: all 150ms ease-out;
+}
+
/* set selected menubar menuitem */
PanelMenuBar.menubar .menu .menuitem:active:hover,
PanelMenuBar.menubar .menu .menuitem:hover {
- transition: all 200ms ease-out;
background-color: @theme_selected_bg_color;
background-image: linear-gradient(to bottom,
shade (@theme_selected_bg_color, 1.0),
@@ -410,28 +465,79 @@ NaTrayApplet {
}
/****************
+ * Mate-Terminal *
+ ****************/
+
+TerminalWindow GtkNotebook.notebook tab {
+ padding: 2px;
+ border-color: transparent;
+ border-width: 0px;
+ background-image: none;
+ background-color: transparent;
+}
+
+TerminalWindow GtkNotebook.notebook tab.top,
+.notebook tab.bottom {
+ padding: 2px;
+}
+
+/****************
* Pluma *
****************/
/* pluma line numbers */
-
PlumaView {
background-color: shade (@theme_bg_color, 1.07);
}
-/****************
- * Mate-Terminal *
- ****************/
+/*FIXME normaly this isn't the right entry for adjusting
+the sidebar entry hover color*/
+PlumaWindow .view row:hover {
+ background-color: shade (@theme_selected_bg_color, 1.15);
+ color: shade (@theme_selected_bg_color, 0.35);
+}
-TerminalWindow GtkNotebook.notebook tab {
- padding: 2px;
- border-color: transparent;
- border-width: 0px;
- background-image: none;
- background-color: transparent;
+/* Pluma status bar */
+PlumaWindow .button.flat {
+ border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+ padding: 2px 5px;
}
-TerminalWindow GtkNotebook.notebook tab.top,
-.notebook tab.bottom {
- padding: 2px;
+PlumaWindow .button.flat:hover {
+ background-color: transparent;
+ background-image: linear-gradient(to bottom,
+ @button_gradient_color_a,
+ @button_gradient_color_b);
+ border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+ padding: 2px 5px;
+}
+
+/* surpress styling of close button */
+PlumaWindow .notebook tab .button.flat,
+PlumaWindow .notebook tab .button.flat:hover {
+ border-color: transparent;
+ background-color: transparent;
+ background-image: none;
+ box-shadow: inset 0 1px rgba(255,255,255,0), 0 1px rgba(255,255,255,0);
+ text-shadow: none;
+ icon-shadow: none;
+ border-image: none;
}
+
+/***********************
+ * Mate-Control-Center *
+ ***********************/
+
+ShellWindow .button.flat {
+ border-image: none;
+}
+
+/* button hover of applications */
+ShellWindow .button.flat:hover {
+ background-color: transparent;
+ background-image: linear-gradient(to bottom,
+ @button_hover_gradient_color_a,
+ @button_hover_gradient_color_b);
+ border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+}
+