From 66c0cc14d61a5af2cca59af533cd8b08733a75a4 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Wed, 23 Mar 2016 22:58:42 +0100 Subject: [PATCH] fix attached osd toolbars --- common/gtk-3.0/3.20/gtk-dark.css | 8 ++++++++ common/gtk-3.0/3.20/gtk-darker.css | 8 ++++++++ common/gtk-3.0/3.20/gtk-solid-dark.css | 8 ++++++++ common/gtk-3.0/3.20/gtk-solid-darker.css | 8 ++++++++ common/gtk-3.0/3.20/gtk-solid.css | 8 ++++++++ common/gtk-3.0/3.20/gtk.css | 8 ++++++++ common/gtk-3.0/3.20/sass/_common.scss | 5 +++++ 7 files changed, 53 insertions(+) diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index 8d69b6b..552005e 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -819,6 +819,14 @@ toolbar, .inline-toolbar { background-color: rgba(53, 57, 69, 0.85); } toolbar.osd.left, .osd.left.inline-toolbar, toolbar.osd.right, .osd.right.inline-toolbar, toolbar.osd.top, .osd.top.inline-toolbar, toolbar.osd.bottom, .osd.bottom.inline-toolbar { border-radius: 0; } + toolbar.osd.top, .osd.top.inline-toolbar { + border-width: 0 0 1px 0; } + toolbar.osd.bottom, .osd.bottom.inline-toolbar { + border-width: 1px 0 0 0; } + toolbar.osd.left, .osd.left.inline-toolbar { + border-width: 0 1px 0 0; } + toolbar.osd.right, .osd.right.inline-toolbar { + border-width: 0 0 0 1px; } toolbar:not(.inline-toolbar):not(.osd) switch, .inline-toolbar:not(.inline-toolbar):not(.osd) switch, toolbar:not(.inline-toolbar):not(.osd) scale, .inline-toolbar:not(.inline-toolbar):not(.osd) scale, toolbar:not(.inline-toolbar):not(.osd) entry, .inline-toolbar:not(.inline-toolbar):not(.osd) entry, diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index 3cae6f5..b1deddb 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -818,6 +818,14 @@ toolbar, .inline-toolbar { background-color: rgba(53, 57, 69, 0.85); } toolbar.osd.left, .osd.left.inline-toolbar, toolbar.osd.right, .osd.right.inline-toolbar, toolbar.osd.top, .osd.top.inline-toolbar, toolbar.osd.bottom, .osd.bottom.inline-toolbar { border-radius: 0; } + toolbar.osd.top, .osd.top.inline-toolbar { + border-width: 0 0 1px 0; } + toolbar.osd.bottom, .osd.bottom.inline-toolbar { + border-width: 1px 0 0 0; } + toolbar.osd.left, .osd.left.inline-toolbar { + border-width: 0 1px 0 0; } + toolbar.osd.right, .osd.right.inline-toolbar { + border-width: 0 0 0 1px; } toolbar:not(.inline-toolbar):not(.osd) switch, .inline-toolbar:not(.inline-toolbar):not(.osd) switch, toolbar:not(.inline-toolbar):not(.osd) scale, .inline-toolbar:not(.inline-toolbar):not(.osd) scale, toolbar:not(.inline-toolbar):not(.osd) entry, .inline-toolbar:not(.inline-toolbar):not(.osd) entry, diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index 96e282f..4cc17e7 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -819,6 +819,14 @@ toolbar, .inline-toolbar { background-color: rgba(53, 57, 69, 0.9); } toolbar.osd.left, .osd.left.inline-toolbar, toolbar.osd.right, .osd.right.inline-toolbar, toolbar.osd.top, .osd.top.inline-toolbar, toolbar.osd.bottom, .osd.bottom.inline-toolbar { border-radius: 0; } + toolbar.osd.top, .osd.top.inline-toolbar { + border-width: 0 0 1px 0; } + toolbar.osd.bottom, .osd.bottom.inline-toolbar { + border-width: 1px 0 0 0; } + toolbar.osd.left, .osd.left.inline-toolbar { + border-width: 0 1px 0 0; } + toolbar.osd.right, .osd.right.inline-toolbar { + border-width: 0 0 0 1px; } toolbar:not(.inline-toolbar):not(.osd) switch, .inline-toolbar:not(.inline-toolbar):not(.osd) switch, toolbar:not(.inline-toolbar):not(.osd) scale, .inline-toolbar:not(.inline-toolbar):not(.osd) scale, toolbar:not(.inline-toolbar):not(.osd) entry, .inline-toolbar:not(.inline-toolbar):not(.osd) entry, diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index b615a22..8601f95 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -818,6 +818,14 @@ toolbar, .inline-toolbar { background-color: rgba(53, 57, 69, 0.9); } toolbar.osd.left, .osd.left.inline-toolbar, toolbar.osd.right, .osd.right.inline-toolbar, toolbar.osd.top, .osd.top.inline-toolbar, toolbar.osd.bottom, .osd.bottom.inline-toolbar { border-radius: 0; } + toolbar.osd.top, .osd.top.inline-toolbar { + border-width: 0 0 1px 0; } + toolbar.osd.bottom, .osd.bottom.inline-toolbar { + border-width: 1px 0 0 0; } + toolbar.osd.left, .osd.left.inline-toolbar { + border-width: 0 1px 0 0; } + toolbar.osd.right, .osd.right.inline-toolbar { + border-width: 0 0 0 1px; } toolbar:not(.inline-toolbar):not(.osd) switch, .inline-toolbar:not(.inline-toolbar):not(.osd) switch, toolbar:not(.inline-toolbar):not(.osd) scale, .inline-toolbar:not(.inline-toolbar):not(.osd) scale, toolbar:not(.inline-toolbar):not(.osd) entry, .inline-toolbar:not(.inline-toolbar):not(.osd) entry, diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index 74d573f..6f8cfec 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -818,6 +818,14 @@ toolbar, .inline-toolbar { background-color: rgba(53, 57, 69, 0.9); } toolbar.osd.left, .osd.left.inline-toolbar, toolbar.osd.right, .osd.right.inline-toolbar, toolbar.osd.top, .osd.top.inline-toolbar, toolbar.osd.bottom, .osd.bottom.inline-toolbar { border-radius: 0; } + toolbar.osd.top, .osd.top.inline-toolbar { + border-width: 0 0 1px 0; } + toolbar.osd.bottom, .osd.bottom.inline-toolbar { + border-width: 1px 0 0 0; } + toolbar.osd.left, .osd.left.inline-toolbar { + border-width: 0 1px 0 0; } + toolbar.osd.right, .osd.right.inline-toolbar { + border-width: 0 0 0 1px; } toolbar:not(.inline-toolbar):not(.osd) switch, .inline-toolbar:not(.inline-toolbar):not(.osd) switch, toolbar:not(.inline-toolbar):not(.osd) scale, .inline-toolbar:not(.inline-toolbar):not(.osd) scale, toolbar:not(.inline-toolbar):not(.osd) entry, .inline-toolbar:not(.inline-toolbar):not(.osd) entry, diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index 33d8107..4af1e14 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -818,6 +818,14 @@ toolbar, .inline-toolbar { background-color: rgba(53, 57, 69, 0.85); } toolbar.osd.left, .osd.left.inline-toolbar, toolbar.osd.right, .osd.right.inline-toolbar, toolbar.osd.top, .osd.top.inline-toolbar, toolbar.osd.bottom, .osd.bottom.inline-toolbar { border-radius: 0; } + toolbar.osd.top, .osd.top.inline-toolbar { + border-width: 0 0 1px 0; } + toolbar.osd.bottom, .osd.bottom.inline-toolbar { + border-width: 1px 0 0 0; } + toolbar.osd.left, .osd.left.inline-toolbar { + border-width: 0 1px 0 0; } + toolbar.osd.right, .osd.right.inline-toolbar { + border-width: 0 0 0 1px; } toolbar:not(.inline-toolbar):not(.osd) switch, .inline-toolbar:not(.inline-toolbar):not(.osd) switch, toolbar:not(.inline-toolbar):not(.osd) scale, .inline-toolbar:not(.inline-toolbar):not(.osd) scale, toolbar:not(.inline-toolbar):not(.osd) entry, .inline-toolbar:not(.inline-toolbar):not(.osd) entry, diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index 98d8bf5..21327e5 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -858,6 +858,11 @@ toolbar { &.right, &.top, &.bottom { border-radius: 0; } // positional classes for `attached` osd toolbars + + &.top { border-width: 0 0 1px 0; } + &.bottom { border-width: 1px 0 0 0; } + &.left { border-width: 0 1px 0 0; } + &.right { border-width: 0 0 0 1px; } } &:not(.inline-toolbar):not(.osd) {