From 7903c1d2a4d317694dc57050d2cab880aaa52e3f Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Tue, 24 Jun 2014 13:42:13 +0200 Subject: [PATCH] Adwaita: only side borders for reorderable tabs --- gtk/resources/theme/Adwaita/_common.scss | 14 +++++ .../theme/Adwaita/gtk-contained-dark.css | 51 ++++++++++++------- gtk/resources/theme/Adwaita/gtk-contained.css | 51 ++++++++++++------- 3 files changed, 80 insertions(+), 36 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index b60b9c9bd2..861122cc38 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -919,6 +919,9 @@ column-header { //notebook content frame... &.top, &.bottom { padding: $vt_vpadding $vt_hpadding; } &.left, &.right { padding: $ht_vpadding $ht_hpadding; } + + /* works for testnotebookdnd, but there's a superfluous border + in gedit or web, commented out for now, needs gtk fixes &.reorderable-page { &.top { padding-top: ($vt_vpadding - 1px); @@ -945,6 +948,17 @@ column-header { border-bottom-width: 1px; } } + */ + &.reorderable-page { + &.top, &.bottom { + border-left-width: 1px; + border-right-width: 1px; + } + &.left, &.right { + border-bottom-width: 1px; + border-top-width: 1px; + } + } &.top { padding-bottom: ($vt_vpadding -$tab_indicator_size); border-bottom-width: $tab_indicator_size; diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 10be433142..23e08e9db8 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -1068,31 +1068,46 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: solid; border-color: transparent; background-color: transparent; - outline-offset: 0; } + outline-offset: 0; + /* works for testnotebookdnd, but there's a superfluous border + in gedit or web, commented out for now, needs gtk fixes + &.reorderable-page { + &.top { + padding-top: ($vt_vpadding - 1px); + border-top-width: 1px; + border-left-width: 1px; + border-right-width: 1px; + } + &.bottom { + padding-bottom: ($vt_vpadding - 1px); + border-bottom-width: 1px; + border-left-width: 1px; + border-right-width: 1px; + } + &.left { + padding-left: ($ht_hpadding - 1px); + border-left-width: 1px; + border-top-width: 1px; + border-bottom-width: 1px; + } + &.right { + padding-right: ($ht_hpadding - 1px); + border-right-width: 1px; + border-top-width: 1px; + border-bottom-width: 1px; + } + } + */ } .notebook tab.top, .notebook tab.bottom { padding: 8px 20px; } .notebook tab.left, .notebook tab.right { padding: 5px 20px; } - .notebook tab.reorderable-page.top { - padding-top: 7px; - border-top-width: 1px; + .notebook tab.reorderable-page.top, .notebook tab.reorderable-page.bottom { border-left-width: 1px; border-right-width: 1px; } - .notebook tab.reorderable-page.bottom { - padding-bottom: 7px; + .notebook tab.reorderable-page.left, .notebook tab.reorderable-page.right { border-bottom-width: 1px; - border-left-width: 1px; - border-right-width: 1px; } - .notebook tab.reorderable-page.left { - padding-left: 19px; - border-left-width: 1px; - border-top-width: 1px; - border-bottom-width: 1px; } - .notebook tab.reorderable-page.right { - padding-right: 19px; - border-right-width: 1px; - border-top-width: 1px; - border-bottom-width: 1px; } + border-top-width: 1px; } .notebook tab.top { padding-bottom: 5px; border-bottom-width: 3px; } diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index 564ed3b08d..53c4d654d4 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -1068,31 +1068,46 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: solid; border-color: transparent; background-color: transparent; - outline-offset: 0; } + outline-offset: 0; + /* works for testnotebookdnd, but there's a superfluous border + in gedit or web, commented out for now, needs gtk fixes + &.reorderable-page { + &.top { + padding-top: ($vt_vpadding - 1px); + border-top-width: 1px; + border-left-width: 1px; + border-right-width: 1px; + } + &.bottom { + padding-bottom: ($vt_vpadding - 1px); + border-bottom-width: 1px; + border-left-width: 1px; + border-right-width: 1px; + } + &.left { + padding-left: ($ht_hpadding - 1px); + border-left-width: 1px; + border-top-width: 1px; + border-bottom-width: 1px; + } + &.right { + padding-right: ($ht_hpadding - 1px); + border-right-width: 1px; + border-top-width: 1px; + border-bottom-width: 1px; + } + } + */ } .notebook tab.top, .notebook tab.bottom { padding: 8px 20px; } .notebook tab.left, .notebook tab.right { padding: 5px 20px; } - .notebook tab.reorderable-page.top { - padding-top: 7px; - border-top-width: 1px; + .notebook tab.reorderable-page.top, .notebook tab.reorderable-page.bottom { border-left-width: 1px; border-right-width: 1px; } - .notebook tab.reorderable-page.bottom { - padding-bottom: 7px; + .notebook tab.reorderable-page.left, .notebook tab.reorderable-page.right { border-bottom-width: 1px; - border-left-width: 1px; - border-right-width: 1px; } - .notebook tab.reorderable-page.left { - padding-left: 19px; - border-left-width: 1px; - border-top-width: 1px; - border-bottom-width: 1px; } - .notebook tab.reorderable-page.right { - padding-right: 19px; - border-right-width: 1px; - border-top-width: 1px; - border-bottom-width: 1px; } + border-top-width: 1px; } .notebook tab.top { padding-bottom: 5px; border-bottom-width: 3px; }