Merge branch 'master' into wip/3.18

1 files changed, 16 insertions, 13 deletions

diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css
index 6527a56..907ac95 100644
--- a/common/gtk-3.0/3.14/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-darker.css
@@ -141,14 +141,14 @@ GtkFlowBox .grid-child {
 .entry {
   border: 1px solid;
   padding: 5px 8px 6px;
-  border-radius: 15px;
+  border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: #5c616c;
   border-color: #cfd6e6;
   background-color: #ffffff;
   background-image: linear-gradient(to bottom, #ffffff); }
   .header-bar .entry {
-    padding: 6px 11px; }
+    padding: 6px; }
   .entry.image {
     padding-left: 3px;
     padding-right: 3px; }
@@ -257,6 +257,9 @@ GtkFlowBox .grid-child {
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
 
+GtkSearchEntry.entry {
+  border-radius: 20px; }
+
 /***********
  * Buttons *
  ***********/
@@ -316,9 +319,9 @@ GtkFlowBox .grid-child {
     .button:insensitive > GtkLabel {
       color: inherit; }
     .button:insensitive:active, .button:insensitive:checked {
-      color: rgba(255, 255, 255, 0.55);
-      border-color: rgba(82, 148, 226, 0.55);
-      background-color: rgba(82, 148, 226, 0.55);
+      color: rgba(255, 255, 255, 0.8);
+      border-color: rgba(82, 148, 226, 0.75);
+      background-color: rgba(82, 148, 226, 0.75);
       opacity: 0.6; }
       .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel {
         color: inherit; }
@@ -544,9 +547,9 @@ GtkFlowBox .grid-child {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:insensitive:active,
   .inline-toolbar GtkToolButton > .button:insensitive:checked {
-    color: rgba(255, 255, 255, 0.55);
-    border-color: rgba(82, 148, 226, 0.55);
-    background-color: rgba(82, 148, 226, 0.55);
+    color: rgba(255, 255, 255, 0.8);
+    border-color: rgba(82, 148, 226, 0.75);
+    background-color: rgba(82, 148, 226, 0.75);
     opacity: 0.6; }
     .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel,
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
@@ -2814,15 +2817,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
 
 GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) {
   border-left-style: none;
-  border-radius: 0 14.5px 14.5px 0;
-  outline-radius: 0 12.5px 12.5px 0; }
+  border-radius: 0 3px 3px 0;
+  outline-radius: 0 1px 1px 0; }
   GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover {
     box-shadow: -1px 0 #5294E2; }
 
 GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
   border-right-style: none;
-  border-radius: 14.5px 0 0 14.5px;
-  outline-radius: 12.5px 0 0 12.5px; }
+  border-radius: 3px 0 0 3px;
+  outline-radius: 1px 0 0 1px; }
   GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
     box-shadow: 1px 0 #5294E2; }
 
@@ -3034,7 +3037,7 @@ MarlinViewWindow *:selected:focus {
   outline-color: transparent; }
 
 .marlin-pathbar.pathbar {
-  border-radius: 14.5px;
+  border-radius: 3px;
   color: rgba(207, 218, 231, 0.8);
   border-color: rgba(24, 27, 31, 0.97);
   background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87));