merging onto master

This commit is contained in:
Chris Cochrun 2020-09-16 06:41:40 -05:00
parent 93b95448cb
commit fb23eb9da6
3 changed files with 155 additions and 114 deletions

View file

@ -159,11 +159,8 @@ frame-opacity = 0.7;
inactive-opacity-override = false;
# Default opacity for active windows. (0.0 - 1.0, defaults to 1.0)
<<<<<<< HEAD
active-opacity = 0.8;
=======
active-opacity = 0.85;
>>>>>>> 05f8e08... making nice only work on desktop for now
>>>>>>> 1d4ba76... making nice only work on desktop for now
# Dim inactive windows. (0.0 - 1.0, defaults to 0.0)
# inactive-dim = 0.0
@ -200,12 +197,9 @@ opacity-rule = [
"70:class_g = 'TelegramDesktop'",
"90:class_g = 'Joplin'",
"100:class_g = 'firefox'",
<<<<<<< HEAD
"100:class_g = 'dolphin'",
"100:class_g = 'mpv'",
=======
"100:class_g = 'soffice'",
>>>>>>> 05f8e08... making nice only work on desktop for now
>>>>>>> 1d4ba76... making nice only work on desktop for now
"100:class_g = 'libreoffice'",
"100:class_g = 'Thunderbird'"
];
@ -270,14 +264,13 @@ blur-background-exclude = [
# when taking selection screenshot with `main`
# https://github.com/naelstrof/maim/issues/130
"class_g = 'slop'",
<<<<<<< HEAD
"_GTK_FRAME_EXTENTS@:c",
# "window_type = '_NET_WM_WINDOW_TYPE_NOTIFICATION'"
"window_type = 'notification'"
=======
"class_g = 'soffice'",
"_GTK_FRAME_EXTENTS@:c"
>>>>>>> 05f8e08... making nice only work on desktop for now
>>>>>>> 1d4ba76... making nice only work on desktop for now
];