diff options
Diffstat (limited to 'src/xfwm4')
| -rw-r--r-- | src/xfwm4/hide-inactive.xpm | 2 | ||||
| -rw-r--r-- | src/xfwm4/maximize-inactive.xpm | 2 | ||||
| -rw-r--r-- | src/xfwm4/maximize-toggled-active.xpm | 5 | ||||
| -rw-r--r-- | src/xfwm4/maximize-toggled-inactive.xpm | 5 | ||||
| -rw-r--r-- | src/xfwm4/shade-inactive.xpm | 5 | ||||
| -rw-r--r-- | src/xfwm4/shade-toggled-inactive.xpm | 2 | ||||
| -rw-r--r-- | src/xfwm4/stick-inactive.xpm | 5 | ||||
| -rw-r--r-- | src/xfwm4/stick-toggled-inactive.xpm | 4 | ||||
| -rw-r--r-- | src/xfwm4/title-1-active.xpm | 5 |
9 files changed, 32 insertions, 3 deletions
diff --git a/src/xfwm4/hide-inactive.xpm b/src/xfwm4/hide-inactive.xpm index 0ac2bce..94afb39 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 #1f1f1f", +"+ c #101010", "@ c #111111", "@@@@@@@@@@@@@@@@@@@@@@@@", "........................", diff --git a/src/xfwm4/maximize-inactive.xpm b/src/xfwm4/maximize-inactive.xpm index 9b0a376..45c7a68 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 #1f1f1f", +"+ c #101010", "@ c #111111", "@@@@@@@@@@@@@@@@@@@@@@@@", "........................", diff --git a/src/xfwm4/maximize-toggled-active.xpm b/src/xfwm4/maximize-toggled-active.xpm index 99b2758..b6cd92d 100644 --- a/src/xfwm4/maximize-toggled-active.xpm +++ b/src/xfwm4/maximize-toggled-active.xpm @@ -2,10 +2,15 @@ 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 f6c3b59..6770b9d 100644 --- a/src/xfwm4/maximize-toggled-inactive.xpm +++ b/src/xfwm4/maximize-toggled-inactive.xpm @@ -2,10 +2,15 @@ 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 933a1f8..e6381c8 100644 --- a/src/xfwm4/shade-inactive.xpm +++ b/src/xfwm4/shade-inactive.xpm @@ -2,10 +2,15 @@ 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 6b0951a..3b29731 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 #1f1f1f", +"+ c #101010", ======= ". c #444444", "+ c #888888", diff --git a/src/xfwm4/stick-inactive.xpm b/src/xfwm4/stick-inactive.xpm index 56f7fd2..3822388 100644 --- a/src/xfwm4/stick-inactive.xpm +++ b/src/xfwm4/stick-inactive.xpm @@ -2,10 +2,15 @@ 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 c00f503..7836cd1 100644 --- a/src/xfwm4/stick-toggled-inactive.xpm +++ b/src/xfwm4/stick-toggled-inactive.xpm @@ -2,6 +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", diff --git a/src/xfwm4/title-1-active.xpm b/src/xfwm4/title-1-active.xpm index 52fb899..f0b5fe9 100644 --- a/src/xfwm4/title-1-active.xpm +++ b/src/xfwm4/title-1-active.xpm @@ -2,8 +2,13 @@ static char * title_1_active_xpm[] = { "2 26 3 1", " c None", +<<<<<<< HEAD +". c #eeeeee", +"+ c #111111", +======= ". c #484848", "+ c #444444", +>>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "..", "++", "++", |