changeset 18:cf44599f0382

Fix more formerly-linked buttons to add borders
author IBBoard <dev@ibboard.co.uk>
date Sat, 09 Jul 2016 17:05:52 +0100
parents ca246bc0af4a
children 14918ee8ecd1
files gtk-3.0/gtk.css gtk-3.0/gtk.scss
diffstat 2 files changed, 14 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/gtk-3.0/gtk.css	Sat Jul 09 15:25:37 2016 +0100
+++ b/gtk-3.0/gtk.css	Sat Jul 09 17:05:52 2016 +0100
@@ -5342,20 +5342,23 @@
   color: #dddddd; }
 
 /* Fix Meld dialog buttons and try not to break anything else */
-.message-dialog.csd .dialog-action-area .button {
-  border-bottom-style: solid; }
-  .message-dialog.csd .dialog-action-area .button:last-child {
+/* FIXME: These should really be joined, but as of v3.18 they're spaced
+.message-dialog.csd .dialog-action-area .button, .message-dialog.csd .dialog-action-area .button:backdrop, .message-dialog.csd .dialog-action-area .button:hover {
+  border-bottom-style: solid;
+  border-right-style: solid;
+  &:last-child {
     border-right-style: solid;
     border-top-right-radius: 7px; }
-  .message-dialog.csd .dialog-action-area .button:first-child {
+  &:first-child {
     border-left-style: solid;
     border-top-left-radius: 7px; }
-  .message-dialog.csd .dialog-action-area .button:hover, .message-dialog.csd .dialog-action-area .button:backdrop {
-    border-bottom-style: solid; }
+  &:hover, &:backdrop { border-bottom-style: solid; }
+}
 
 /* And put "linked" buttons back to Adwaita style */
 .message-dialog.csd .dialog-action-area.linked .button {
-  border-bottom-style: none; }
+  border-bottom-style: none;
+  border-right-style: solid; }
   .message-dialog.csd .dialog-action-area.linked .button:last-child {
     border-right-style: none;
     border-top-right-radius: 0; }
--- a/gtk-3.0/gtk.scss	Sat Jul 09 15:25:37 2016 +0100
+++ b/gtk-3.0/gtk.scss	Sat Jul 09 17:05:52 2016 +0100
@@ -527,9 +527,10 @@
 
 
 /* Fix Meld dialog buttons and try not to break anything else */
-/* FIXME GTK3.18 theme update broke this when used with GTK3.16 */
-.message-dialog.csd .dialog-action-area .button {
+/* FIXME: These should really be joined, but as of v3.18 they're spaced
+.message-dialog.csd .dialog-action-area .button, .message-dialog.csd .dialog-action-area .button:backdrop, .message-dialog.csd .dialog-action-area .button:hover {
   border-bottom-style: solid;
+  border-right-style: solid;
   &:last-child {
     border-right-style: solid;
     border-top-right-radius: 7px; }
@@ -542,6 +543,7 @@
 /* And put "linked" buttons back to Adwaita style */
 .message-dialog.csd .dialog-action-area.linked .button {
   border-bottom-style: none;
+  border-right-style: solid;
   &:last-child {
     border-right-style: none;
     border-top-right-radius: 0; }