summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2014-05-29 16:10:00 +0200
committerraveit65 <[email protected]>2014-05-29 16:31:12 +0200
commit5c54fabfb629bb3daed8a1231dad565cd65efaf7 (patch)
tree384e173bee159a89f23b471fedf86c6583ace4b3
parente61256027ae45f766e8e981007e77f91dbaedcc4 (diff)
downloadmate-themes-5c54fabfb629bb3daed8a1231dad565cd65efaf7.tar.bz2
mate-themes-5c54fabfb629bb3daed8a1231dad565cd65efaf7.tar.xz
BlueMenta Menta GTK3: fix caja statusbar color + remove ugly scrollbar butt
on outline + use resize grip image Conflicts: desktop-themes/BlueMenta/gtk-2.0/apps/Caja/Makefile.am
-rw-r--r--desktop-themes/BlueMenta/gtk-2.0/apps/Caja/Makefile.am4
-rw-r--r--desktop-themes/BlueMenta/gtk-2.0/apps/Caja/resize-grip.pngbin0 -> 408 bytes
-rw-r--r--desktop-themes/BlueMenta/gtk-2.0/apps/Caja/resize_grip.pngbin205 -> 0 bytes
-rw-r--r--desktop-themes/BlueMenta/gtk-2.0/apps/caja.rc19
-rw-r--r--desktop-themes/BlueMenta/gtk-2.0/gtkrc21
-rw-r--r--desktop-themes/BlueMenta/gtk-2.0/widgets/Others/Makefile.am3
-rw-r--r--desktop-themes/BlueMenta/gtk-2.0/widgets/Others/resize-grip.pngbin0 -> 408 bytes
-rw-r--r--desktop-themes/Menta/gtk-2.0/apps/Caja/Makefile.am2
-rw-r--r--desktop-themes/Menta/gtk-2.0/apps/Caja/resize-grip.pngbin0 -> 408 bytes
-rw-r--r--desktop-themes/Menta/gtk-2.0/apps/Caja/resize_grip.pngbin205 -> 0 bytes
-rw-r--r--desktop-themes/Menta/gtk-2.0/apps/caja.rc19
-rw-r--r--desktop-themes/Menta/gtk-2.0/gtkrc21
-rw-r--r--desktop-themes/Menta/gtk-2.0/widgets/Others/Makefile.am3
-rw-r--r--desktop-themes/Menta/gtk-2.0/widgets/Others/resize-grip.pngbin0 -> 408 bytes
14 files changed, 69 insertions, 23 deletions
diff --git a/desktop-themes/BlueMenta/gtk-2.0/apps/Caja/Makefile.am b/desktop-themes/BlueMenta/gtk-2.0/apps/Caja/Makefile.am
index da325a81..e639243a 100644
--- a/desktop-themes/BlueMenta/gtk-2.0/apps/Caja/Makefile.am
+++ b/desktop-themes/BlueMenta/gtk-2.0/apps/Caja/Makefile.am
@@ -9,8 +9,8 @@ theme_DATA = \
mode_normal.png \
mode_prelight.png \
mode_pressed.png \
- nautilus-toolbar.png \
- resize_grip.png \
+ caja-toolbar.png \
+ resize-grip.png \
right_slider_normal.png \
slider.png \
slider-prelight.png \
diff --git a/desktop-themes/BlueMenta/gtk-2.0/apps/Caja/resize-grip.png b/desktop-themes/BlueMenta/gtk-2.0/apps/Caja/resize-grip.png
new file mode 100644
index 00000000..a41c3dd0
--- /dev/null
+++ b/desktop-themes/BlueMenta/gtk-2.0/apps/Caja/resize-grip.png
Binary files differ
diff --git a/desktop-themes/BlueMenta/gtk-2.0/apps/Caja/resize_grip.png b/desktop-themes/BlueMenta/gtk-2.0/apps/Caja/resize_grip.png
deleted file mode 100644
index d78ecc2b..00000000
--- a/desktop-themes/BlueMenta/gtk-2.0/apps/Caja/resize_grip.png
+++ /dev/null
Binary files differ
diff --git a/desktop-themes/BlueMenta/gtk-2.0/apps/caja.rc b/desktop-themes/BlueMenta/gtk-2.0/apps/caja.rc
index 9b71f4d3..78d42290 100644
--- a/desktop-themes/BlueMenta/gtk-2.0/apps/caja.rc
+++ b/desktop-themes/BlueMenta/gtk-2.0/apps/caja.rc
@@ -35,11 +35,20 @@ style "caja-handle" {
style "caja-statusbar"
{
- bg[NORMAL] = @base_color
- base[NORMAL] = @base_color
- fg[NORMAL] = shade (1.2, @fg_color)
-
- engine "murrine" {}
+ xthickness = 0
+ engine "pixmap"
+ {
+ image
+ {
+ function = RESIZE_GRIP
+ recolorable = TRUE
+ state = NORMAL
+ detail = "statusbar"
+ overlay_file = "Caja/resize-grip.png"
+ overlay_border = {0,0,0,0 }
+ overlay_stretch = FALSE
+ }
+ }
}
style "caja-location"
diff --git a/desktop-themes/BlueMenta/gtk-2.0/gtkrc b/desktop-themes/BlueMenta/gtk-2.0/gtkrc
index d474e44d..119d4544 100644
--- a/desktop-themes/BlueMenta/gtk-2.0/gtkrc
+++ b/desktop-themes/BlueMenta/gtk-2.0/gtkrc
@@ -57,7 +57,7 @@ style "murrine-default" {
GtkScrollbar ::activate-slider = 1
GtkScrolledWindow ::scrollbar-spacing = 0
- GtkScrolledWindow ::scrollbars-within-bevel = 1
+ GtkScrolledWindow ::scrollbars-within-bevel = 0
GtkPaned ::handle-size = 6
@@ -99,8 +99,8 @@ style "murrine-default" {
GtkToolbar ::window-dragging = 1
# The little lovely gripper at the bottom right needs to stay.
- GtkWindow ::resize-grip-height = 15
- GtkWindow ::resize-grip-width = 15
+ GtkWindow ::resize-grip-height = 13
+ GtkWindow ::resize-grip-width = 13
xthickness = 1
ythickness = 1
@@ -366,7 +366,20 @@ style "murrine-progressbar" = "murrine-thin" {
}
style "murrine-statusbar" {
- xthickness = 2
+ xthickness = 0
+ engine "pixmap"
+ {
+ image
+ {
+ function = RESIZE_GRIP
+ recolorable = TRUE
+ state = NORMAL
+ detail = "statusbar"
+ overlay_file = "widgets/Others/resize-grip.png"
+ overlay_border = {0,0,0,0 }
+ overlay_stretch = FALSE
+ }
+ }
}
style "murrine-comboboxentry" { engine "murrine" { contrast = .4 }}
diff --git a/desktop-themes/BlueMenta/gtk-2.0/widgets/Others/Makefile.am b/desktop-themes/BlueMenta/gtk-2.0/widgets/Others/Makefile.am
index cd15ea0e..3ff32008 100644
--- a/desktop-themes/BlueMenta/gtk-2.0/widgets/Others/Makefile.am
+++ b/desktop-themes/BlueMenta/gtk-2.0/widgets/Others/Makefile.am
@@ -3,7 +3,8 @@ themedir = $(datadir)/themes/BlueMenta/gtk-2.0/widgets/Others
theme_DATA = \
close.png \
handle.png \
- null.png
+ null.png \
+ resize-grip.png
EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/BlueMenta/gtk-2.0/widgets/Others/resize-grip.png b/desktop-themes/BlueMenta/gtk-2.0/widgets/Others/resize-grip.png
new file mode 100644
index 00000000..a41c3dd0
--- /dev/null
+++ b/desktop-themes/BlueMenta/gtk-2.0/widgets/Others/resize-grip.png
Binary files differ
diff --git a/desktop-themes/Menta/gtk-2.0/apps/Caja/Makefile.am b/desktop-themes/Menta/gtk-2.0/apps/Caja/Makefile.am
index 2cf96491..86473b16 100644
--- a/desktop-themes/Menta/gtk-2.0/apps/Caja/Makefile.am
+++ b/desktop-themes/Menta/gtk-2.0/apps/Caja/Makefile.am
@@ -11,7 +11,7 @@ theme_DATA = \
mode_normal.png \
mode_prelight.png \
mode_pressed.png \
- resize_grip.png \
+ resize-grip.png \
right_slider_normal.png \
slider.png \
slider-prelight.png \
diff --git a/desktop-themes/Menta/gtk-2.0/apps/Caja/resize-grip.png b/desktop-themes/Menta/gtk-2.0/apps/Caja/resize-grip.png
new file mode 100644
index 00000000..a41c3dd0
--- /dev/null
+++ b/desktop-themes/Menta/gtk-2.0/apps/Caja/resize-grip.png
Binary files differ
diff --git a/desktop-themes/Menta/gtk-2.0/apps/Caja/resize_grip.png b/desktop-themes/Menta/gtk-2.0/apps/Caja/resize_grip.png
deleted file mode 100644
index d78ecc2b..00000000
--- a/desktop-themes/Menta/gtk-2.0/apps/Caja/resize_grip.png
+++ /dev/null
Binary files differ
diff --git a/desktop-themes/Menta/gtk-2.0/apps/caja.rc b/desktop-themes/Menta/gtk-2.0/apps/caja.rc
index cc2af944..891ba568 100644
--- a/desktop-themes/Menta/gtk-2.0/apps/caja.rc
+++ b/desktop-themes/Menta/gtk-2.0/apps/caja.rc
@@ -35,11 +35,20 @@ style "caja-handle" {
style "caja-statusbar"
{
- bg[NORMAL] = @base_color
- base[NORMAL] = @base_color
- fg[NORMAL] = shade (1.2, @fg_color)
-
- engine "murrine" {}
+ xthickness = 0
+ engine "pixmap"
+ {
+ image
+ {
+ function = RESIZE_GRIP
+ recolorable = TRUE
+ state = NORMAL
+ detail = "statusbar"
+ overlay_file = "Caja/resize-grip.png"
+ overlay_border = {0,0,0,0 }
+ overlay_stretch = FALSE
+ }
+ }
}
style "caja-location"
diff --git a/desktop-themes/Menta/gtk-2.0/gtkrc b/desktop-themes/Menta/gtk-2.0/gtkrc
index 8cb3fd8f..42787f03 100644
--- a/desktop-themes/Menta/gtk-2.0/gtkrc
+++ b/desktop-themes/Menta/gtk-2.0/gtkrc
@@ -62,7 +62,7 @@ style "murrine-default" {
GtkScrollbar ::activate-slider = 1
GtkScrolledWindow ::scrollbar-spacing = 0
- GtkScrolledWindow ::scrollbars-within-bevel = 1
+ GtkScrolledWindow ::scrollbars-within-bevel = 0
GtkPaned ::handle-size = 6
@@ -104,8 +104,8 @@ style "murrine-default" {
GtkToolbar ::window-dragging = 1
# The little lovely gripper at the bottom right needs to stay.
- GtkWindow ::resize-grip-height = 15
- GtkWindow ::resize-grip-width = 15
+ GtkWindow ::resize-grip-height = 13
+ GtkWindow ::resize-grip-width = 13
xthickness = 1
ythickness = 1
@@ -371,7 +371,20 @@ style "murrine-progressbar" = "murrine-thin" {
}
style "murrine-statusbar" {
- xthickness = 2
+ xthickness = 0
+ engine "pixmap"
+ {
+ image
+ {
+ function = RESIZE_GRIP
+ recolorable = TRUE
+ state = NORMAL
+ detail = "statusbar"
+ overlay_file = "widgets/Others/resize-grip.png"
+ overlay_border = {0,0,0,0 }
+ overlay_stretch = FALSE
+ }
+ }
}
style "murrine-comboboxentry" { engine "murrine" { contrast = .4 }}
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/Others/Makefile.am b/desktop-themes/Menta/gtk-2.0/widgets/Others/Makefile.am
index 30a3b3d6..83c5eea4 100644
--- a/desktop-themes/Menta/gtk-2.0/widgets/Others/Makefile.am
+++ b/desktop-themes/Menta/gtk-2.0/widgets/Others/Makefile.am
@@ -5,7 +5,8 @@ theme_DATA = \
close.png \
handle.png \
null.png \
- toolbar.png
+ toolbar.png \
+ resize-grip.png
EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/Others/resize-grip.png b/desktop-themes/Menta/gtk-2.0/widgets/Others/resize-grip.png
new file mode 100644
index 00000000..a41c3dd0
--- /dev/null
+++ b/desktop-themes/Menta/gtk-2.0/widgets/Others/resize-grip.png
Binary files differ