some tweaks

8 files changed, 52 insertions, 17 deletions

diff --git a/common/gtk-3.0/3.18/gtk-contained-dark.css b/common/gtk-3.0/3.18/gtk-contained-dark.css
index 6a5bcda..fa44bae 100644
--- a/common/gtk-3.0/3.18/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.18/gtk-contained-dark.css
@@ -1954,7 +1954,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   -GtkRange-slider-width: 15;
   -GtkRange-trough-border: 0;
   outline-offset: -1px;
-  outline-radius: 2px; }
+  outline-radius: 2px;
+  color: alpha(currentColor,0.7); }
   .scale.trough {
     margin: 5px; }
   .scale.fine-tune.trough {
@@ -3734,10 +3735,15 @@ NautilusWindow .sidebar-button.button {
   color: #BAC3CF; }
   GtkFileChooserDialog .sidebar-button.button:hover,
   NautilusWindow .sidebar-button.button:hover {
-    background-color: rgba(0, 0, 0, 0.1); }
+    color: #BAC3CF;
+    outline-color: rgba(186, 195, 207, 0.3);
+    border-color: rgba(26, 28, 34, 0.35);
+    background-color: rgba(119, 127, 151, 0.45); }
   GtkFileChooserDialog .sidebar-button.button:active,
   NautilusWindow .sidebar-button.button:active {
     color: #ffffff;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #5294E2;
     background-color: #5294E2; }
   GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage,
   NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage {
diff --git a/common/gtk-3.0/3.18/gtk-contained-darker.css b/common/gtk-3.0/3.18/gtk-contained-darker.css
index 8f07b29..9956d5f 100644
--- a/common/gtk-3.0/3.18/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.18/gtk-contained-darker.css
@@ -1954,7 +1954,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   -GtkRange-slider-width: 15;
   -GtkRange-trough-border: 0;
   outline-offset: -1px;
-  outline-radius: 2px; }
+  outline-radius: 2px;
+  color: alpha(currentColor,0.7); }
   .scale.trough {
     margin: 5px; }
   .scale.fine-tune.trough {
@@ -3724,10 +3725,15 @@ NautilusWindow .sidebar-button.button {
   color: #BAC3CF; }
   GtkFileChooserDialog .sidebar-button.button:hover,
   NautilusWindow .sidebar-button.button:hover {
-    background-color: rgba(0, 0, 0, 0.1); }
+    color: #BAC3CF;
+    outline-color: rgba(186, 195, 207, 0.3);
+    border-color: rgba(26, 28, 34, 0.35);
+    background-color: rgba(119, 127, 151, 0.45); }
   GtkFileChooserDialog .sidebar-button.button:active,
   NautilusWindow .sidebar-button.button:active {
     color: #ffffff;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #5294E2;
     background-color: #5294E2; }
   GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage,
   NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage {
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
index 22e46cc..e1cd756 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
@@ -1954,7 +1954,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   -GtkRange-slider-width: 15;
   -GtkRange-trough-border: 0;
   outline-offset: -1px;
-  outline-radius: 2px; }
+  outline-radius: 2px;
+  color: alpha(currentColor,0.7); }
   .scale.trough {
     margin: 5px; }
   .scale.fine-tune.trough {
@@ -3734,10 +3735,15 @@ NautilusWindow .sidebar-button.button {
   color: #BAC3CF; }
   GtkFileChooserDialog .sidebar-button.button:hover,
   NautilusWindow .sidebar-button.button:hover {
-    background-color: rgba(0, 0, 0, 0.1); }
+    color: #BAC3CF;
+    outline-color: rgba(186, 195, 207, 0.3);
+    border-color: rgba(26, 28, 34, 0.4);
+    background-color: rgba(119, 127, 151, 0.5); }
   GtkFileChooserDialog .sidebar-button.button:active,
   NautilusWindow .sidebar-button.button:active {
     color: #ffffff;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #5294E2;
     background-color: #5294E2; }
   GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage,
   NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage {
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
index 5d2e714..a822cdf 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
@@ -1954,7 +1954,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   -GtkRange-slider-width: 15;
   -GtkRange-trough-border: 0;
   outline-offset: -1px;
-  outline-radius: 2px; }
+  outline-radius: 2px;
+  color: alpha(currentColor,0.7); }
   .scale.trough {
     margin: 5px; }
   .scale.fine-tune.trough {
@@ -3724,10 +3725,15 @@ NautilusWindow .sidebar-button.button {
   color: #BAC3CF; }
   GtkFileChooserDialog .sidebar-button.button:hover,
   NautilusWindow .sidebar-button.button:hover {
-    background-color: rgba(0, 0, 0, 0.1); }
+    color: #BAC3CF;
+    outline-color: rgba(186, 195, 207, 0.3);
+    border-color: rgba(26, 28, 34, 0.4);
+    background-color: rgba(119, 127, 151, 0.5); }
   GtkFileChooserDialog .sidebar-button.button:active,
   NautilusWindow .sidebar-button.button:active {
     color: #ffffff;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #5294E2;
     background-color: #5294E2; }
   GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage,
   NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage {
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid.css b/common/gtk-3.0/3.18/gtk-contained-solid.css
index b75626d..1c583c3 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid.css
@@ -1954,7 +1954,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   -GtkRange-slider-width: 15;
   -GtkRange-trough-border: 0;
   outline-offset: -1px;
-  outline-radius: 2px; }
+  outline-radius: 2px;
+  color: alpha(currentColor,0.7); }
   .scale.trough {
     margin: 5px; }
   .scale.fine-tune.trough {
@@ -3724,10 +3725,15 @@ NautilusWindow .sidebar-button.button {
   color: #BAC3CF; }
   GtkFileChooserDialog .sidebar-button.button:hover,
   NautilusWindow .sidebar-button.button:hover {
-    background-color: rgba(0, 0, 0, 0.1); }
+    color: #BAC3CF;
+    outline-color: rgba(186, 195, 207, 0.3);
+    border-color: rgba(26, 28, 34, 0.4);
+    background-color: rgba(119, 127, 151, 0.5); }
   GtkFileChooserDialog .sidebar-button.button:active,
   NautilusWindow .sidebar-button.button:active {
     color: #ffffff;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #5294E2;
     background-color: #5294E2; }
   GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage,
   NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage {
diff --git a/common/gtk-3.0/3.18/gtk-contained.css b/common/gtk-3.0/3.18/gtk-contained.css
index d02ccd5..45f22fc 100644
--- a/common/gtk-3.0/3.18/gtk-contained.css
+++ b/common/gtk-3.0/3.18/gtk-contained.css
@@ -1954,7 +1954,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   -GtkRange-slider-width: 15;
   -GtkRange-trough-border: 0;
   outline-offset: -1px;
-  outline-radius: 2px; }
+  outline-radius: 2px;
+  color: alpha(currentColor,0.7); }
   .scale.trough {
     margin: 5px; }
   .scale.fine-tune.trough {
@@ -3724,10 +3725,15 @@ NautilusWindow .sidebar-button.button {
   color: #BAC3CF; }
   GtkFileChooserDialog .sidebar-button.button:hover,
   NautilusWindow .sidebar-button.button:hover {
-    background-color: rgba(0, 0, 0, 0.1); }
+    color: #BAC3CF;
+    outline-color: rgba(186, 195, 207, 0.3);
+    border-color: rgba(26, 28, 34, 0.35);
+    background-color: rgba(119, 127, 151, 0.45); }
   GtkFileChooserDialog .sidebar-button.button:active,
   NautilusWindow .sidebar-button.button:active {
     color: #ffffff;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #5294E2;
     background-color: #5294E2; }
   GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage,
   NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage {
diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss
index 25335bd..d555aef 100644
--- a/common/gtk-3.0/3.18/sass/_common.scss
+++ b/common/gtk-3.0/3.18/sass/_common.scss
@@ -2096,6 +2096,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   outline-offset: -1px;
   outline-radius: 2px;
 
+  color: gtkalpha(currentColor, 0.7);
+
   &.trough { margin: 5px; }
   &.fine-tune {
     &.trough { border-radius: 5px; margin: 3px; }
diff --git a/common/gtk-3.0/3.18/sass/_transparent_widgets.scss b/common/gtk-3.0/3.18/sass/_transparent_widgets.scss
index b2e1c1e..49d0436 100644
--- a/common/gtk-3.0/3.18/sass/_transparent_widgets.scss
+++ b/common/gtk-3.0/3.18/sass/_transparent_widgets.scss
@@ -55,11 +55,8 @@ NautilusWindow {
   .sidebar-button.button {
     color: $dark_sidebar_fg;
 
-    &:hover { background-color: transparentize(black, 0.9); }
-    &:active {
-      color: $selected_fg_color;
-      background-color: $selected_bg_color;
-    }
+    &:hover { @include button(osd-hover); }
+    &:active { @include button(osd-active); }
 
     &:not(:hover):not(:active) > GtkImage { opacity: 0.5 };
   }