From d4fa1344a9f2bbee2297615957d64425545375f5 Mon Sep 17 00:00:00 2001
From: TooWaBoo <TooWaBoo@users.noreply.github.com>
Date: Sat, 21 Jul 2018 11:40:00 +0200
Subject: [PATCH] Update TooWaBlue theme (fine tuning)

---
 rtdata/themes/TooWaBlue-GTK3-20_.css | 78 ++++++++++++++++------------
 1 file changed, 46 insertions(+), 32 deletions(-)

diff --git a/rtdata/themes/TooWaBlue-GTK3-20_.css b/rtdata/themes/TooWaBlue-GTK3-20_.css
index 0b00f77a9..091370dc7 100644
--- a/rtdata/themes/TooWaBlue-GTK3-20_.css
+++ b/rtdata/themes/TooWaBlue-GTK3-20_.css
@@ -2,7 +2,7 @@
   This file is part of RawTherapee.
 
   Copyright (c) 2016-2017 TooWaBoo
-  Version 2.67
+  Version 2.68
 
   RawTherapee is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -843,12 +843,12 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
     padding: 0 0.33334em;
 }
 #ToolPanelNotebook > header tab + tab {
-    margin-left: 0.33333em;
+    margin-left: 0.25em;
 }
 
-#ToolPanelNotebook > header tab image{
-    min-height: 2.5em;
-    min-width: 2em;
+#ToolPanelNotebook > header tab #TextOrIcon image{
+    min-height: 2.66667em;
+    min-width: 2.5em;
     padding: 0;
     margin: 0;
 }
@@ -1011,18 +1011,32 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
     margin: 0 0.08334em;
 }
 /* Filter */
-#ToolBarPanelFileBrowser > box > box > button {
+#ToolBarPanelFileBrowser .smallbuttonbox {
     min-height: 1.16667em;
-    min-width: 1.16667em;
     padding: 0;
-    margin: 0 0.08334em -1px;
+    margin: 0;
+}
+#ToolBarPanelFileBrowser .smallbuttonbox:nth-child(1) {
+    min-height: 1.25em;
+    padding: 0;
+    margin: 0;
+}
+#ToolBarPanelFileBrowser .smallbuttonbox button.smallbutton {
+    min-height: 0;
+    min-width: 0;
+    padding: 0.08334em;
+    margin: 0 0.41667em;
     border: none;
     background-color: transparent;
     background-image: none;
     box-shadow: none;
 }
-#ToolBarPanelFileBrowser > box > box image{
-    -gtk-icon-transform: scale(calc(15/16));
+#ToolBarPanelFileBrowser .smallbuttonbox button.smallbutton:checked image{
+    background-color: @bg-dark-grey;
+}
+#ToolBarPanelFileBrowser .smallbuttonbox button.smallbutton image{
+    -gtk-icon-transform: scale(calc(14/16));
+    margin: -5px
 }
 
 #ToolBarPanelFileBrowser entry + button.flat,
@@ -1068,21 +1082,21 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
 }
 
 #BeforeAfterContainer label {
-    min-height: 2.41667em;
+    min-height: 2.66667em;
     padding: 0 0.5em;
 }
 /* Small Lock Button */
 #BeforeAfterContainer button {
-    min-height: 1.66667em;
-    min-width: 1.75em;
+    min-height: 2em;
+    min-width: 2.08334em;
     margin: 0.25em 0.25em 0.25em 0;
     padding: 0;
 }
 #BeforeAfterContainer button image{
-    margin-left: 0.083334em;
+    margin-left: 1px;
 }
 #BeforeAfterContainer button:checked image{
-    margin-left: 0.41667em;
+    margin-left: 5px;
 }
 /**/
 
@@ -1101,7 +1115,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
     margin-right: 0;
 }
 
-#EditorTopPanel > box:nth-child(9) > button.image-button {
+#EditorTopPanel button.narrowbutton {
     min-width: 1.05em;
     padding: 0;
 }
@@ -1151,10 +1165,6 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
 #ToolPanelNotebook scrolledwindow viewport.frame {
     padding: 0 0.56em;
 }
-/* #MyExpander.withScrollbar {
-    padding: 0 6px;
-}
- */
 
 #MyExpander {
     margin: 0;
@@ -1397,11 +1407,16 @@ scale + button.flat {
 /* Buttons Curve drawingarea*/
 #MyExpander button.flat + button.flat,
 #MyExpander button.flat:first-child {
-    min-height: 2.33334em;
-    min-width: 2.33334em;
-    margin: 0.08334em;
+    min-height: 2em;
+    min-width: 2em;
+    margin: 0.16667em 0.16667em 0 0;
     padding: 0;
 }
+#MyExpander button.flat + button.flat image,
+#MyExpander button.flat:first-child image{
+     -gtk-icon-transform: scale(calc(20/24));
+    margin: -2px;
+}
 /**/
 
 #ToolBarPanelFileBrowser entry + button:hover,
@@ -1484,13 +1499,12 @@ dialog combobox .combo,
 
 /* Add/remove space between buttons and labels in toolbox*/
 #MyExpander combobox:not(:first-child):not(:only-child),
-#MyExpander button:not(.flat).Left,
+#MyExpander .image-combo:not(:first-child),
 #MyExpander button:not(.flat) + combobox,
 #MyExpander combobox + button:not(.flat),
-#MyExpander combobox + combobox
-/* Crash
+#MyExpander combobox + combobox,
 #MyExpander button + label,
-#MyExpander combobox + label */ {
+#MyExpander combobox + label {
     margin-left: 0.16667em;
 }
 
@@ -1508,8 +1522,8 @@ buttonbox:not(.dialog-action-area) button{
 }
 
 /* Arrow toggle combo button */
-#IopsPanel button:not(.flat).Left + button:not(.flat).Right,
-#MyExpander button:not(.flat).Left + button:not(.flat).Right {
+#IopsPanel .image-combo button.Right,
+#MyExpander .image-combo button.Right {
     border-left: none;
     margin-left: 0;
     padding-left: 0;
@@ -1518,8 +1532,8 @@ buttonbox:not(.dialog-action-area) button{
     border-bottom-left-radius: 0;
     min-width: 1.33334em;
 }
-#IopsPanel button:not(.flat).Left,
-#MyExpander button:not(.flat).Left {
+#IopsPanel .image-combo button.Left,
+#MyExpander .image-combo button.Left {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
     min-width: 2.33334em;
@@ -1531,7 +1545,7 @@ buttonbox:not(.dialog-action-area) button{
     margin: 0;/* x */
 }
 /* Graduated filter big button */
-#ExpanderBox > box > box:first-child > button:not(.flat):not(.text-button):first-child {
+#ExpanderBox button.independent:only-child {
     min-height: 2.33334em;
     min-width: 2.33334em;
     padding: 0;