aboutsummaryrefslogtreecommitdiffstats
path: root/src/xfwm4
diff options
context:
space:
mode:
authorJesús <heckyel@hyperbola.info>2020-01-30 23:07:14 -0500
committerJesús <heckyel@hyperbola.info>2020-01-30 23:07:14 -0500
commit13739e23e5a7fc4ff5414602434ef360a7eaef0e (patch)
tree3dfe9cef07ed230bac96fa28c3fed21f284fdac9 /src/xfwm4
parent5c34ef170bcc8fbe64d9784ad1498dca31cd88ae (diff)
downloadlibrix-13739e23e5a7fc4ff5414602434ef360a7eaef0e.tar.lz
librix-13739e23e5a7fc4ff5414602434ef360a7eaef0e.tar.xz
librix-13739e23e5a7fc4ff5414602434ef360a7eaef0e.zip
clean files
Diffstat (limited to 'src/xfwm4')
-rw-r--r--src/xfwm4/hide-inactive.xpm2
-rw-r--r--src/xfwm4/maximize-inactive.xpm2
-rw-r--r--src/xfwm4/maximize-toggled-active.xpm5
-rw-r--r--src/xfwm4/maximize-toggled-inactive.xpm5
-rw-r--r--src/xfwm4/shade-inactive.xpm5
-rw-r--r--src/xfwm4/shade-toggled-inactive.xpm2
-rw-r--r--src/xfwm4/stick-inactive.xpm5
-rw-r--r--src/xfwm4/stick-toggled-inactive.xpm4
-rw-r--r--src/xfwm4/title-1-active.xpm5
9 files changed, 3 insertions, 32 deletions
diff --git a/src/xfwm4/hide-inactive.xpm b/src/xfwm4/hide-inactive.xpm
index 94afb39..0ac2bce 100644
--- a/src/xfwm4/hide-inactive.xpm
+++ b/src/xfwm4/hide-inactive.xpm
@@ -3,7 +3,7 @@ static char * hide_prelight_xpm[] = {
"24 26 4 1",
" c None",
". c #111111",
-"+ c #101010",
+"+ c #1f1f1f",
"@ c #111111",
"@@@@@@@@@@@@@@@@@@@@@@@@",
"........................",
diff --git a/src/xfwm4/maximize-inactive.xpm b/src/xfwm4/maximize-inactive.xpm
index 45c7a68..9b0a376 100644
--- a/src/xfwm4/maximize-inactive.xpm
+++ b/src/xfwm4/maximize-inactive.xpm
@@ -3,7 +3,7 @@ static char * maximize_prelight_xpm[] = {
"24 26 4 1",
" c None",
". c #111111",
-"+ c #101010",
+"+ c #1f1f1f",
"@ c #111111",
"@@@@@@@@@@@@@@@@@@@@@@@@",
"........................",
diff --git a/src/xfwm4/maximize-toggled-active.xpm b/src/xfwm4/maximize-toggled-active.xpm
index b6cd92d..99b2758 100644
--- a/src/xfwm4/maximize-toggled-active.xpm
+++ b/src/xfwm4/maximize-toggled-active.xpm
@@ -2,15 +2,10 @@
static char * maximize_toggled_prelight_xpm[] = {
"24 26 4 1",
" c None",
-<<<<<<< HEAD
-". c #111111",
-"+ c #eeeeee",
-=======
". c #444444",
"+ c #eeeeee",
"@ c #484848",
"@@@@@@@@@@@@@@@@@@@@@@@@",
->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d
"........................",
"........................",
"........................",
diff --git a/src/xfwm4/maximize-toggled-inactive.xpm b/src/xfwm4/maximize-toggled-inactive.xpm
index 6770b9d..f6c3b59 100644
--- a/src/xfwm4/maximize-toggled-inactive.xpm
+++ b/src/xfwm4/maximize-toggled-inactive.xpm
@@ -2,15 +2,10 @@
static char * maximize_toggled_prelight_xpm[] = {
"24 26 4 1",
" c None",
-<<<<<<< HEAD
-". c #111111",
-"+ c #101010",
-=======
". c #444444",
"+ c #888888",
"@ c #393939",
"@@@@@@@@@@@@@@@@@@@@@@@@",
->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d
"........................",
"........................",
"........................",
diff --git a/src/xfwm4/shade-inactive.xpm b/src/xfwm4/shade-inactive.xpm
index e6381c8..933a1f8 100644
--- a/src/xfwm4/shade-inactive.xpm
+++ b/src/xfwm4/shade-inactive.xpm
@@ -2,15 +2,10 @@
static char * shade_prelight_xpm[] = {
"24 26 4 1",
" c None",
-<<<<<<< HEAD
-". c #111111",
-"+ c #101010",
-=======
". c #444444",
"+ c #888888",
"@ c #393939",
"@@@@@@@@@@@@@@@@@@@@@@@@",
->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d
"........................",
"........................",
"........................",
diff --git a/src/xfwm4/shade-toggled-inactive.xpm b/src/xfwm4/shade-toggled-inactive.xpm
index 3b29731..6b0951a 100644
--- a/src/xfwm4/shade-toggled-inactive.xpm
+++ b/src/xfwm4/shade-toggled-inactive.xpm
@@ -4,7 +4,7 @@ static char * shade_toggled_prelight_xpm[] = {
" c None",
<<<<<<< HEAD
". c #111111",
-"+ c #101010",
+"+ c #1f1f1f",
=======
". c #444444",
"+ c #888888",
diff --git a/src/xfwm4/stick-inactive.xpm b/src/xfwm4/stick-inactive.xpm
index 3822388..56f7fd2 100644
--- a/src/xfwm4/stick-inactive.xpm
+++ b/src/xfwm4/stick-inactive.xpm
@@ -2,15 +2,10 @@
static char * stick_toggled_prelight_xpm[] = {
"24 26 4 1",
" c None",
-<<<<<<< HEAD
-". c #111111",
-"+ c #101010",
-=======
". c #444444",
"+ c #888888",
"@ c #393939",
"@@@@@@@@@@@@@@@@@@@@@@@@",
->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d
"........................",
"........................",
"........................",
diff --git a/src/xfwm4/stick-toggled-inactive.xpm b/src/xfwm4/stick-toggled-inactive.xpm
index 7836cd1..c00f503 100644
--- a/src/xfwm4/stick-toggled-inactive.xpm
+++ b/src/xfwm4/stick-toggled-inactive.xpm
@@ -2,10 +2,6 @@
static char * stick_toggled_prelight_xpm[] = {
"24 26 4 1",
" c None",
-<<<<<<< HEAD
-". c #111111",
-"+ c #101010",
-=======
". c #444444",
"+ c #888888",
"@ c #393939",
diff --git a/src/xfwm4/title-1-active.xpm b/src/xfwm4/title-1-active.xpm
index f0b5fe9..52fb899 100644
--- a/src/xfwm4/title-1-active.xpm
+++ b/src/xfwm4/title-1-active.xpm
@@ -2,13 +2,8 @@
static char * title_1_active_xpm[] = {
"2 26 3 1",
" c None",
-<<<<<<< HEAD
-". c #eeeeee",
-"+ c #111111",
-=======
". c #484848",
"+ c #444444",
->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d
"..",
"++",
"++",