[gtk+] Adwaita: column header dnd style.
- From: Lapo Calamandrei <lapo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Adwaita: column header dnd style.
- Date: Tue, 8 Jul 2014 12:36:36 +0000 (UTC)
commit abb72efe8b99c53e92efc80f6d37724561565ca7
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Tue Jul 8 14:35:06 2014 +0200
Adwaita: column header dnd style.
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=731663
gtk/resources/theme/Adwaita/_common.scss | 16 ++++++++++++++++
gtk/resources/theme/Adwaita/gtk-contained-dark.css | 11 +++++++++--
gtk/resources/theme/Adwaita/gtk-contained.css | 11 +++++++++--
3 files changed, 34 insertions(+), 4 deletions(-)
---
diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 830ca3e..73a391f 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -815,10 +815,15 @@ column-header {
@extend %column_header_button;
color: mix($_column_header_color,$fg_color,50%);
box-shadow: none;
+ transition: none; //I shouldn't need this
}
&:active {
@extend %column_header_button;
color: $fg_color;
+ transition: none; //I shouldn't need this
+ }
+ &.dnd {
+ @extend column-header.button.dnd;
}
}
&:last-child .button,
@@ -827,6 +832,17 @@ column-header {
}
}
+column-header.button.dnd { // for treeview-like derive widgets
+ transition: none;
+ color: $selected_bg_color;
+ box-shadow: inset 1px 1px 0 1px $selected_bg_color,
+ inset -1px 0 0 1px $selected_bg_color,
+ inset 1px 1px $base_color, inset -1px 0 $base_color;;
+ &:active { @extend column-header.button.dnd; }
+ &:selected { @extend column-header.button.dnd; }
+ &:hover { @extend column-header.button.dnd; }
+}
+
%column_header_button {
border-width: 0 1px 1px 0;
border-radius: 0;
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 56622c6..bc3ccbd 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -1007,12 +1007,19 @@ column-header .button {
box-shadow: none; }
column-header .button:hover {
color: #bcbcbb;
- box-shadow: none; }
+ box-shadow: none;
+ transition: none; }
column-header .button:active {
- color: #eeeeec; }
+ color: #eeeeec;
+ transition: none; }
column-header:last-child .button, column-header:last-child.button {
border-right-style: none; }
+column-header.button.dnd, column-header .button.dnd, column-header.button.dnd:active,
column-header.button.dnd:selected, column-header.button.dnd:hover {
+ transition: none;
+ color: #215d9c;
+ box-shadow: inset 1px 1px 0 1px #215d9c, inset -1px 0 0 1px #215d9c, inset 1px 1px #292929, inset -1px 0
#292929; }
+
column-header .button, column-header .button:hover, column-header .button:active {
border-width: 0 1px 1px 0;
border-radius: 0;
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 960e531..f872cbe 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -999,12 +999,19 @@ column-header .button {
box-shadow: none; }
column-header .button:hover {
color: #626668;
- box-shadow: none; }
+ box-shadow: none;
+ transition: none; }
column-header .button:active {
- color: #2e3436; }
+ color: #2e3436;
+ transition: none; }
column-header:last-child .button, column-header:last-child.button {
border-right-style: none; }
+column-header.button.dnd, column-header .button.dnd, column-header.button.dnd:active,
column-header.button.dnd:selected, column-header.button.dnd:hover {
+ transition: none;
+ color: #4a90d9;
+ box-shadow: inset 1px 1px 0 1px #4a90d9, inset -1px 0 0 1px #4a90d9, inset 1px 1px white, inset -1px 0
white; }
+
column-header .button, column-header .button:hover, column-header .button:active {
border-width: 0 1px 1px 0;
border-radius: 0;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]