Manually merging?

This commit is contained in:
Chris Cochrun 2020-09-16 06:46:33 -05:00
parent fb23eb9da6
commit 567e03be28
3 changed files with 1 additions and 79 deletions

View file

@ -160,7 +160,6 @@ inactive-opacity-override = false;
# Default opacity for active windows. (0.0 - 1.0, defaults to 1.0)
active-opacity = 0.8;
>>>>>>> 1d4ba76... making nice only work on desktop for now
# Dim inactive windows. (0.0 - 1.0, defaults to 0.0)
# inactive-dim = 0.0
@ -199,7 +198,6 @@ opacity-rule = [
"100:class_g = 'firefox'",
"100:class_g = 'dolphin'",
"100:class_g = 'mpv'",
>>>>>>> 1d4ba76... making nice only work on desktop for now
"100:class_g = 'libreoffice'",
"100:class_g = 'Thunderbird'"
];
@ -265,12 +263,9 @@ blur-background-exclude = [
# https://github.com/naelstrof/maim/issues/130
"class_g = 'slop'",
"_GTK_FRAME_EXTENTS@:c",
"class_g = 'soffice'",
# "window_type = '_NET_WM_WINDOW_TYPE_NOTIFICATION'"
"window_type = 'notification'"
=======
"class_g = 'soffice'",
"_GTK_FRAME_EXTENTS@:c"
>>>>>>> 1d4ba76... making nice only work on desktop for now
];