Merge branch 'master' into gtk3

2017-01-02 02:48:45 +01:00
parent e9db962a5f d29a94c2a7
commit d702156f8a
20 changed files with 444 additions and 219 deletions
--- a/rtdata/themes/RawTherapee-GTK3-20_.css
+++ b/rtdata/themes/RawTherapee-GTK3-20_.css
@@ -746,6 +746,10 @@ paned.vertical > separator {
    border-radius: 3px;
 }

+#MetaPanelNotebook stack > box > scrolledwindow > viewport {
+    margin-left: 15px;
+}
+
 #PreviewWindow {
    border-style: solid;
 }