From 13739e23e5a7fc4ff5414602434ef360a7eaef0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs?= Date: Thu, 30 Jan 2020 23:07:14 -0500 Subject: clean files --- src/assets/checkbox-checked-dark.svg | 4 ++-- src/assets/checkbox-checked-insensitive-dark.svg | 4 ++-- src/assets/checkbox-checked-insensitive.svg | 4 ++-- src/assets/checkbox-checked.svg | 4 ++-- src/assets/checkbox-mixed-dark.svg | 4 ++-- src/assets/checkbox-mixed-insensitive-dark.svg | 4 ++-- src/assets/checkbox-mixed-insensitive.svg | 4 ++-- src/assets/checkbox-mixed.svg | 4 ++-- src/assets/checkbox-unchecked-dark.svg | 4 ++-- src/assets/checkbox-unchecked-insensitive-dark.svg | 4 ++-- src/assets/checkbox-unchecked-insensitive.svg | 4 ++-- src/assets/checkbox-unchecked.svg | 4 ++-- src/assets/grid-selection-checked-dark.svg | 4 ++-- src/assets/grid-selection-checked.svg | 4 ++-- src/assets/grid-selection-unchecked-dark.svg | 4 ++-- src/assets/grid-selection-unchecked.svg | 4 ++-- src/assets/pane-handle-vertical.svg | 6 ++--- src/assets/pane-handle.svg | 6 ++--- src/assets/radio-checked-dark.svg | 4 ++-- src/assets/radio-checked-insensitive-dark.svg | 4 ++-- src/assets/radio-checked-insensitive.svg | 4 ++-- src/assets/radio-checked.svg | 4 ++-- src/assets/radio-mixed-dark.svg | 4 ++-- src/assets/radio-mixed-insensitive-dark.svg | 4 ++-- src/assets/radio-mixed-insensitive.svg | 4 ++-- src/assets/radio-mixed.svg | 4 ++-- src/assets/radio-selected-insensitive.svg | 4 ++-- src/assets/radio-selected.svg | 4 ++-- src/assets/radio-unchecked-dark.svg | 4 ++-- src/assets/radio-unchecked-insensitive-dark.svg | 4 ++-- src/assets/radio-unchecked-insensitive.svg | 4 ++-- src/assets/radio-unchecked.svg | 4 ++-- src/assets/radio-unselected-insensitive.svg | 4 ++-- src/assets/radio-unselected.svg | 4 ++-- src/assets/sed.sh | 4 ++-- src/assets/unsed.sh | 6 ++--- src/gtk-2.0/gtkrc | 2 +- src/gtk-2.0/gtkrc.hidpi | 2 +- src/gtk-3.0/scss/_global.scss | 26 +++++++++++----------- src/gtk-3.20/scss/_global.scss | 22 +++++++++--------- src/openbox-3/themerc | 6 ++--- src/xfwm4/hide-inactive.xpm | 2 +- src/xfwm4/maximize-inactive.xpm | 2 +- src/xfwm4/maximize-toggled-active.xpm | 5 ----- src/xfwm4/maximize-toggled-inactive.xpm | 5 ----- src/xfwm4/shade-inactive.xpm | 5 ----- src/xfwm4/shade-toggled-inactive.xpm | 2 +- src/xfwm4/stick-inactive.xpm | 5 ----- src/xfwm4/stick-toggled-inactive.xpm | 4 ---- src/xfwm4/title-1-active.xpm | 5 ----- 50 files changed, 107 insertions(+), 136 deletions(-) (limited to 'src') diff --git a/src/assets/checkbox-checked-dark.svg b/src/assets/checkbox-checked-dark.svg index f465435..b995740 100644 --- a/src/assets/checkbox-checked-dark.svg +++ b/src/assets/checkbox-checked-dark.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/checkbox-checked-insensitive-dark.svg b/src/assets/checkbox-checked-insensitive-dark.svg index 1f08373..bfc3ed3 100644 --- a/src/assets/checkbox-checked-insensitive-dark.svg +++ b/src/assets/checkbox-checked-insensitive-dark.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/checkbox-checked-insensitive.svg b/src/assets/checkbox-checked-insensitive.svg index 1f08373..bfc3ed3 100644 --- a/src/assets/checkbox-checked-insensitive.svg +++ b/src/assets/checkbox-checked-insensitive.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/checkbox-checked.svg b/src/assets/checkbox-checked.svg index 6c7968e..05a4453 100644 --- a/src/assets/checkbox-checked.svg +++ b/src/assets/checkbox-checked.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/checkbox-mixed-dark.svg b/src/assets/checkbox-mixed-dark.svg index b518d4d..d083fee 100644 --- a/src/assets/checkbox-mixed-dark.svg +++ b/src/assets/checkbox-mixed-dark.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/checkbox-mixed-insensitive-dark.svg b/src/assets/checkbox-mixed-insensitive-dark.svg index c480cd5..47f33d3 100644 --- a/src/assets/checkbox-mixed-insensitive-dark.svg +++ b/src/assets/checkbox-mixed-insensitive-dark.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/checkbox-mixed-insensitive.svg b/src/assets/checkbox-mixed-insensitive.svg index c480cd5..47f33d3 100644 --- a/src/assets/checkbox-mixed-insensitive.svg +++ b/src/assets/checkbox-mixed-insensitive.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/checkbox-mixed.svg b/src/assets/checkbox-mixed.svg index b518d4d..d083fee 100644 --- a/src/assets/checkbox-mixed.svg +++ b/src/assets/checkbox-mixed.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/checkbox-unchecked-dark.svg b/src/assets/checkbox-unchecked-dark.svg index b0f3c7d..912c21b 100644 --- a/src/assets/checkbox-unchecked-dark.svg +++ b/src/assets/checkbox-unchecked-dark.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/checkbox-unchecked-insensitive-dark.svg b/src/assets/checkbox-unchecked-insensitive-dark.svg index 57cc64f..19e56eb 100644 --- a/src/assets/checkbox-unchecked-insensitive-dark.svg +++ b/src/assets/checkbox-unchecked-insensitive-dark.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/checkbox-unchecked-insensitive.svg b/src/assets/checkbox-unchecked-insensitive.svg index 57cc64f..19e56eb 100644 --- a/src/assets/checkbox-unchecked-insensitive.svg +++ b/src/assets/checkbox-unchecked-insensitive.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/checkbox-unchecked.svg b/src/assets/checkbox-unchecked.svg index b0f3c7d..912c21b 100644 --- a/src/assets/checkbox-unchecked.svg +++ b/src/assets/checkbox-unchecked.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/grid-selection-checked-dark.svg b/src/assets/grid-selection-checked-dark.svg index 34b2852..94071e1 100644 --- a/src/assets/grid-selection-checked-dark.svg +++ b/src/assets/grid-selection-checked-dark.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/grid-selection-checked.svg b/src/assets/grid-selection-checked.svg index 34b2852..94071e1 100644 --- a/src/assets/grid-selection-checked.svg +++ b/src/assets/grid-selection-checked.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/grid-selection-unchecked-dark.svg b/src/assets/grid-selection-unchecked-dark.svg index 514b4a5..2db7c65 100644 --- a/src/assets/grid-selection-unchecked-dark.svg +++ b/src/assets/grid-selection-unchecked-dark.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/grid-selection-unchecked.svg b/src/assets/grid-selection-unchecked.svg index 514b4a5..2db7c65 100644 --- a/src/assets/grid-selection-unchecked.svg +++ b/src/assets/grid-selection-unchecked.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/pane-handle-vertical.svg b/src/assets/pane-handle-vertical.svg index 834a8df..103195e 100644 --- a/src/assets/pane-handle-vertical.svg +++ b/src/assets/pane-handle-vertical.svg @@ -14,7 +14,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/src/assets/pane-handle.svg b/src/assets/pane-handle.svg index 8c174da..03ccfff 100644 --- a/src/assets/pane-handle.svg +++ b/src/assets/pane-handle.svg @@ -14,7 +14,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/src/assets/radio-checked-dark.svg b/src/assets/radio-checked-dark.svg index f3b36ee..a706f71 100644 --- a/src/assets/radio-checked-dark.svg +++ b/src/assets/radio-checked-dark.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/radio-checked-insensitive-dark.svg b/src/assets/radio-checked-insensitive-dark.svg index e4fdb68..81854d0 100644 --- a/src/assets/radio-checked-insensitive-dark.svg +++ b/src/assets/radio-checked-insensitive-dark.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/radio-checked-insensitive.svg b/src/assets/radio-checked-insensitive.svg index e4fdb68..81854d0 100644 --- a/src/assets/radio-checked-insensitive.svg +++ b/src/assets/radio-checked-insensitive.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/radio-checked.svg b/src/assets/radio-checked.svg index f3b36ee..a706f71 100644 --- a/src/assets/radio-checked.svg +++ b/src/assets/radio-checked.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/radio-mixed-dark.svg b/src/assets/radio-mixed-dark.svg index dd17f53..5f145e2 100644 --- a/src/assets/radio-mixed-dark.svg +++ b/src/assets/radio-mixed-dark.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/radio-mixed-insensitive-dark.svg b/src/assets/radio-mixed-insensitive-dark.svg index 0aef2bd..e3711df 100644 --- a/src/assets/radio-mixed-insensitive-dark.svg +++ b/src/assets/radio-mixed-insensitive-dark.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/radio-mixed-insensitive.svg b/src/assets/radio-mixed-insensitive.svg index 0aef2bd..e3711df 100644 --- a/src/assets/radio-mixed-insensitive.svg +++ b/src/assets/radio-mixed-insensitive.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/radio-mixed.svg b/src/assets/radio-mixed.svg index dd17f53..5f145e2 100644 --- a/src/assets/radio-mixed.svg +++ b/src/assets/radio-mixed.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/radio-selected-insensitive.svg b/src/assets/radio-selected-insensitive.svg index e4fdb68..81854d0 100644 --- a/src/assets/radio-selected-insensitive.svg +++ b/src/assets/radio-selected-insensitive.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/radio-selected.svg b/src/assets/radio-selected.svg index f3b36ee..a706f71 100644 --- a/src/assets/radio-selected.svg +++ b/src/assets/radio-selected.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/radio-unchecked-dark.svg b/src/assets/radio-unchecked-dark.svg index 6c2c531..e8170d4 100644 --- a/src/assets/radio-unchecked-dark.svg +++ b/src/assets/radio-unchecked-dark.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/radio-unchecked-insensitive-dark.svg b/src/assets/radio-unchecked-insensitive-dark.svg index 9b96837..e59a311 100644 --- a/src/assets/radio-unchecked-insensitive-dark.svg +++ b/src/assets/radio-unchecked-insensitive-dark.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/radio-unchecked-insensitive.svg b/src/assets/radio-unchecked-insensitive.svg index 9b96837..e59a311 100644 --- a/src/assets/radio-unchecked-insensitive.svg +++ b/src/assets/radio-unchecked-insensitive.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/radio-unchecked.svg b/src/assets/radio-unchecked.svg index 6c2c531..e8170d4 100644 --- a/src/assets/radio-unchecked.svg +++ b/src/assets/radio-unchecked.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/radio-unselected-insensitive.svg b/src/assets/radio-unselected-insensitive.svg index 9b96837..e59a311 100644 --- a/src/assets/radio-unselected-insensitive.svg +++ b/src/assets/radio-unselected-insensitive.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/radio-unselected.svg b/src/assets/radio-unselected.svg index 6c2c531..e8170d4 100644 --- a/src/assets/radio-unselected.svg +++ b/src/assets/radio-unselected.svg @@ -1,8 +1,8 @@ - - + + diff --git a/src/assets/sed.sh b/src/assets/sed.sh index 0f37126..58c2d6d 100644 --- a/src/assets/sed.sh +++ b/src/assets/sed.sh @@ -1,9 +1,9 @@ #!/bin/sh sed -i \ - -e 's/#101010/rgb(0%,0%,0%)/g' \ + -e 's/#1f1f1f/rgb(0%,0%,0%)/g' \ -e 's/#eeeeee/rgb(100%,100%,100%)/g' \ -e 's/#111111/rgb(50%,0%,0%)/g' \ -e 's/#e91e63/rgb(0%,50%,0%)/g' \ - -e 's/#101010/rgb(50%,0%,50%)/g' \ + -e 's/#1f1f1f/rgb(50%,0%,50%)/g' \ -e 's/#eeeeee/rgb(0%,0%,50%)/g' \ *.svg diff --git a/src/assets/unsed.sh b/src/assets/unsed.sh index a8f18f7..14cdabf 100644 --- a/src/assets/unsed.sh +++ b/src/assets/unsed.sh @@ -1,11 +1,11 @@ #!/bin/sh sed -i \ - -e 's/rgb(0%,0%,0%)/#101010/g' \ + -e 's/rgb(0%,0%,0%)/#1f1f1f/g' \ -e 's/rgb(100%,100%,100%)/#eeeeee/g' \ -e 's/rgb(50%,0%,0%)/#111111/g' \ -e 's/rgb(0%,50%,0%)/#e91e63/g' \ -e 's/rgb(0%,50.196078%,0%)/#e91e63/g' \ - -e 's/rgb(50%,0%,50%)/#101010/g' \ - -e 's/rgb(50.196078%,0%,50.196078%)/#101010/g' \ + -e 's/rgb(50%,0%,50%)/#1f1f1f/g' \ + -e 's/rgb(50.196078%,0%,50.196078%)/#1f1f1f/g' \ -e 's/rgb(0%,0%,50%)/#eeeeee/g' \ *.svg diff --git a/src/gtk-2.0/gtkrc b/src/gtk-2.0/gtkrc index 73bddd5..fdd6c89 100644 --- a/src/gtk-2.0/gtkrc +++ b/src/gtk-2.0/gtkrc @@ -1,7 +1,7 @@ # Oomox GTK Theme (Librix Fork) gtk-color-scheme = -"base_color:#101010\nbg_color:#101010\ntooltip_bg_color:#101010\nselected_bg_color:#4285f4\ntext_color:#eeeeee\nfg_color:#eeeeee\ntooltip_fg_color:#eeeeee\nselected_fg_color:#ffffff\nmenubar_bg_color:#111111\nmenubar_fg_color:#eeeeee\ntoolbar_bg_color:#101010\ntoolbar_fg_color:#eeeeee\nmenu_bg_color:#111111\nmenu_fg_color:#eeeeee\npanel_bg_color:#101010\npanel_fg_color:#eeeeee\nlink_color:#4285f4\nbtn_bg_color:#1c1c1c\nbtn_fg_color:#eeeeee\ntitlebar_bg_color:#111111\ntitlebar_fg_color:#eeeeee\n" + "base_color:#101010\nbg_color:#101010\ntooltip_bg_color:#101010\nselected_bg_color:#4285f4\ntext_color:#ffffff\nfg_color:#ffffff\ntooltip_fg_color:#ffffff\nselected_fg_color:#ffffff\nmenubar_bg_color:#111111\nmenubar_fg_color:#ffffff\ntoolbar_bg_color:#101010\ntoolbar_fg_color:#ffffff\nmenu_bg_color:#111111\nmenu_fg_color:#ffffff\npanel_bg_color:#101010\npanel_fg_color:#ffffff\nlink_color:#4285f4\nbtn_bg_color:#1c1c1c\nbtn_fg_color:#ffffff\ntitlebar_bg_color:#111111\ntitlebar_fg_color:#ffffff\n" # Default Style style "murrine-default" { diff --git a/src/gtk-2.0/gtkrc.hidpi b/src/gtk-2.0/gtkrc.hidpi index b31b13b..70bec75 100644 --- a/src/gtk-2.0/gtkrc.hidpi +++ b/src/gtk-2.0/gtkrc.hidpi @@ -1,7 +1,7 @@ # Oomox GTK Theme (Librix Fork) gtk-color-scheme = -"base_color:#101010\nbg_color:#101010\ntooltip_bg_color:#101010\nselected_bg_color:#4285f4\ntext_color:#eeeeee\nfg_color:#eeeeee\ntooltip_fg_color:#eeeeee\nselected_fg_color:#ffffff\nmenubar_bg_color:#111111\nmenubar_fg_color:#eeeeee\ntoolbar_bg_color:#101010\ntoolbar_fg_color:#eeeeee\nmenu_bg_color:#111111\nmenu_fg_color:#eeeeee\npanel_bg_color:#101010\npanel_fg_color:#eeeeee\nlink_color:#4285f4\nbtn_bg_color:#1c1c1c\nbtn_fg_color:#eeeeee\ntitlebar_bg_color:#111111\ntitlebar_fg_color:#eeeeee\n" +"base_color:#1f1f1f\nbg_color:#1f1f1f\ntooltip_bg_color:#1f1f1f\nselected_bg_color:#4285f4\ntext_color:#eeeeee\nfg_color:#eeeeee\ntooltip_fg_color:#eeeeee\nselected_fg_color:#ffffff\nmenubar_bg_color:#111111\nmenubar_fg_color:#eeeeee\ntoolbar_bg_color:#1f1f1f\ntoolbar_fg_color:#eeeeee\nmenu_bg_color:#111111\nmenu_fg_color:#eeeeee\npanel_bg_color:#1f1f1f\npanel_fg_color:#eeeeee\nlink_color:#4285f4\nbtn_bg_color:#1c1c1c\nbtn_fg_color:#eeeeee\ntitlebar_bg_color:#111111\ntitlebar_fg_color:#eeeeee\n" # Default Style style "murrine-default" { diff --git a/src/gtk-3.0/scss/_global.scss b/src/gtk-3.0/scss/_global.scss index f593c0c..2b71d80 100644 --- a/src/gtk-3.0/scss/_global.scss +++ b/src/gtk-3.0/scss/_global.scss @@ -3,25 +3,25 @@ @import "functions"; // default color scheme -$bg_color: if($variant == "dark", #eeeeee, #212121); -$fg_color: if($variant == "dark", #212121, #eeeeee); -$base_color: if($variant == "dark", #eeeeee, #212121); -$text_color: if($variant == "dark", #212121, #eeeeee); -$button_bg_color: if($variant == "dark", #eeeeee, #212121); -$button_fg_color: if($variant == "dark", #212121, #eeeeee); -$header_button_bg_color: #212121; -$header_button_fg_color: #eeeeee; +$bg_color: if($variant == "dark", #ffffff, #1f1f1f); +$fg_color: if($variant == "dark", #212121, #ffffff); +$base_color: if($variant == "dark", #ffffff, #1f1f1f); +$text_color: if($variant == "dark", #1f1f1f, #ffffff); +$button_bg_color: if($variant == "dark", #ffffff, #1f1f1f); +$button_fg_color: if($variant == "dark", #1f1f1f, #ffffff); +$header_button_bg_color: #1f1f1f; +$header_button_fg_color: #ffffff; $selected_bg_color: #2962FF; $selected_fg_color: #ffffff; -$tooltip_bg_color: #212121; -$tooltip_fg_color: #eeeeee; +$tooltip_bg_color: #4285f4; +$tooltip_fg_color: #ffffff; // dark colors -$dark_bg_color: #212121; -$dark_fg_color: #eeeeee; +$dark_bg_color: #1f1f1f; +$dark_fg_color: #ffffff; // shadows -$dark_shadow: #212121; +$dark_shadow: #1f1f1f; $light_shadow: #fff; // white and black diff --git a/src/gtk-3.20/scss/_global.scss b/src/gtk-3.20/scss/_global.scss index 4bc7772..b1ef933 100644 --- a/src/gtk-3.20/scss/_global.scss +++ b/src/gtk-3.20/scss/_global.scss @@ -3,18 +3,18 @@ @import "functions"; // default color scheme -$bg_color: if($variant == "dark", #eeeeee, #101010); -$fg_color: if($variant == "dark", #101010, #eeeeee); -$base_color: if($variant == "dark", #eeeeee, #101010); -$text_color: if($variant == "dark", #101010, #eeeeee); -$button_bg_color: if($variant == "dark", #eeeeee, #1c1c1c); -$button_fg_color: if($variant == "dark", #1c1c1c, #eeeeee); -$header_button_bg_color: #101010; -$header_button_fg_color: #eeeeee; +$bg_color: if($variant == "dark", #ffffff, #1f1f1f); +$fg_color: if($variant == "dark", #1f1f1f, #ffffff); +$base_color: if($variant == "dark", #ffffff, #1f1f1f); +$text_color: if($variant == "dark", #1f1f1f, #ffffff); +$button_bg_color: if($variant == "dark", #ffffff, #1c1c1c); +$button_fg_color: if($variant == "dark", #1c1c1c, #ffffff); +$header_button_bg_color: #1f1f1f; +$header_button_fg_color: #ffffff; $selected_bg_color: #4285f4; $selected_fg_color: #ffffff; -$tooltip_bg_color: #101010; -$tooltip_fg_color: #eeeeee; +$tooltip_bg_color: #4285f4; +$tooltip_fg_color: #ffffff; /*$selected_borders_color: if($variant == 'light', darken($selected_bg_color, 30%), darken($selected_bg_color, 20%));*/ /*$borders_color: if($variant == 'light', shade($bg_color, .85), shade($bg_color, .88));*/ @@ -24,7 +24,7 @@ $borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentiz // dark colors $dark_bg_color: #111111; -$dark_fg_color: #eeeeee; +$dark_fg_color: #ffffff; // shadows /*$dark_shadow: #000;*/ diff --git a/src/openbox-3/themerc b/src/openbox-3/themerc index ce40967..f499fe6 100644 --- a/src/openbox-3/themerc +++ b/src/openbox-3/themerc @@ -120,10 +120,10 @@ osd.border.width: 2 osd.hilight.bg: Solid Flat osd.hilight.bg.color: #4285f4 osd.unhilight.bg: flat solid -osd.unhilight.bg.color: #101010 +osd.unhilight.bg.color: #1f1f1f osd.button.unpressed.bg: flat border -osd.button.unpressed.bg.color: #101010 +osd.button.unpressed.bg.color: #1f1f1f #osd.button.unpressed.*.border.color: #eeeeee osd.button.pressed.bg: flat border @@ -132,7 +132,7 @@ osd.button.pressed.bg.color: #4285f4 osd.button.focused.bg: flat solid border osd.button.focused.bg.color: #eeeeee -#osd.button.focused.*.border.color: #101010 +#osd.button.focused.*.border.color: #1f1f1f osd.button.focused.box.color: #4285f4 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 "..", "++", "++", -- cgit v1.2.3