1 files changed, 37 insertions, 42 deletions

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 4bfdd04..3f2f5ed 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid.css
@@ -191,6 +191,17 @@ GtkTextView {
     background-image: none;
     background-color: transparent;
     box-shadow: none; }
+  .linked > .entry:first-child {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0; }
+    .linked > .entry:first-child:dir(rtl) {
+      border-right-style: none; }
+  .linked > .entry:last-child {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+    border-left-style: none; }
+    .linked > .entry:last-child:dir(rtl) {
+      border-left-style: solid; }
   .entry.error {
     color: white;
     border-color: #FC4138;
@@ -217,52 +228,38 @@ GtkTextView {
       color: #5c616c; }
     .entry.image:active {
       color: #5294E2; }
-
-.linked > .entry:first-child {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0; }
-  .linked > .entry:first-child:dir(rtl) {
-    border-right-style: none; }
-
-.linked > .entry:last-child {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-  border-left-style: none; }
-  .linked > .entry:last-child:dir(rtl) {
-    border-left-style: solid; }
-
-.linked.vertical > .entry {
-  border-bottom-color: #f4f5f6;
-  box-shadow: none; }
-  .linked.vertical > .entry:focus {
-    border-color: #5294E2;
-    box-shadow: 0 -1px 0 0 #5294E2; }
-  .linked.vertical > .entry:insensitive {
-    border-bottom-color: #f4f5f6; }
-  .linked.vertical > .entry:first-child {
-    border-bottom-color: #f4f5f6; }
-    .linked.vertical > .entry:first-child:focus {
-      border-bottom-color: #5294E2;
-      box-shadow: none; }
-    .linked.vertical > .entry:first-child:insensitive {
-      border-bottom-color: #f4f5f6; }
-  .linked.vertical > .entry:last-child {
-    border-bottom-color: rgba(0, 0, 0, 0.14); }
-    .linked.vertical > .entry:last-child:focus {
-      border-bottom-color: #5294E2;
+  .linked.vertical > .entry {
+    border-bottom-color: #f4f5f6;
+    box-shadow: none; }
+    .linked.vertical > .entry:focus {
+      border-color: #5294E2;
       box-shadow: 0 -1px 0 0 #5294E2; }
-    .linked.vertical > .entry:last-child:insensitive {
+    .linked.vertical > .entry:insensitive {
+      border-bottom-color: #f4f5f6; }
+    .linked.vertical > .entry:first-child {
+      border-bottom-color: #f4f5f6; }
+      .linked.vertical > .entry:first-child:focus {
+        border-bottom-color: #5294E2;
+        box-shadow: none; }
+      .linked.vertical > .entry:first-child:insensitive {
+        border-bottom-color: #f4f5f6; }
+    .linked.vertical > .entry:last-child {
       border-bottom-color: rgba(0, 0, 0, 0.14); }
-  .osd .linked.vertical > .entry {
+      .linked.vertical > .entry:last-child:focus {
+        border-bottom-color: #5294E2;
+        box-shadow: 0 -1px 0 0 #5294E2; }
+      .linked.vertical > .entry:last-child:insensitive {
+        border-bottom-color: rgba(0, 0, 0, 0.14); }
+  .osd .entry {
     color: #BAC3CF;
     border-color: rgba(0, 0, 0, 0.4);
     background-color: transparent;
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
-    .osd .linked.vertical > .entry:focus {
+    .osd .entry:focus {
       color: #BAC3CF;
       border-color: #5294E2;
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
-    .osd .linked.vertical > .entry:insensitive {
+    .osd .entry:insensitive {
       color: #555a62;
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
@@ -526,10 +523,9 @@ GtkTextView {
     .stack-switcher > .button.needs-attention > .label:dir(rtl),
     .stack-switcher > .button.needs-attention > GtkImage:dir(rtl), .button .sidebar-item.needs-attention > GtkLabel:dir(rtl) {
       background-position: left 3px, left 4px; }
-
-.inline-toolbar .button, .inline-toolbar .button:backdrop {
-  border-radius: 2px;
-  border-width: 1px; }
+  .inline-toolbar .button, .inline-toolbar .button:backdrop {
+    border-radius: 2px;
+    border-width: 1px; }
 
 .inline-toolbar GtkToolButton > .button {
   color: #5c616c;
@@ -801,7 +797,6 @@ GtkTextView {
 /* menu buttons */
 .menuitem.button.flat, .menuitem.sidebar-button.button {
   transition: none;
-  color: #5c616c;
   outline-offset: -1px;
   border-radius: 2px; }
   .menuitem.button.flat:hover, .menuitem.sidebar-button.button:hover {