merge with dev

This commit is contained in:
Desmis
2019-03-15 17:55:15 +01:00

View File

@@ -1,8 +1,8 @@
/* /*
This file is part of RawTherapee. This file is part of RawTherapee.
Copyright (c) 2016-2018 TooWaBoo Copyright (c) 2016-2019 TooWaBoo
Version 3.02 Version 3.04
RawTherapee is free software: you can redistribute it and/or modify RawTherapee is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@@ -269,7 +269,7 @@ textview:selected, treeview:selected {
/**/ /**/
#PlacesPaned > box:nth-child(3) treeview { #PlacesPaned > box:nth-child(3) treeview {
padding: 0.25em 0.333333333333333333em 0.25em 0.333333333333333333em; padding: 0.25em 0;
} }
#HistoryPanel { #HistoryPanel {
@@ -1204,6 +1204,7 @@ menu {
border: 0.083333333333333333em solid @accent-color; border: 0.083333333333333333em solid @accent-color;
padding: 0.083333333333333333em; padding: 0.083333333333333333em;
margin: 0; margin: 0;
border-radius: 0;
} }
menu > arrow.top, menu > arrow.top,
menu > arrow.top:hover, menu > arrow.top:hover,