[gtk+] Adwaita: set the correct indicator color for reorderable hover tabs
- From: Lapo Calamandrei <lapo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Adwaita: set the correct indicator color for reorderable hover tabs
- Date: Tue, 24 Jun 2014 12:05:25 +0000 (UTC)
commit 739dacf12acb90acda8c107a2e9c1ab92b34bd46
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Tue Jun 24 14:04:26 2014 +0200
Adwaita: set the correct indicator color for reorderable hover tabs
gtk/resources/theme/Adwaita/_common.scss | 51 +++++++++----------
gtk/resources/theme/Adwaita/gtk-contained-dark.css | 16 +++---
gtk/resources/theme/Adwaita/gtk-contained.css | 16 +++---
3 files changed, 40 insertions(+), 43 deletions(-)
---
diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 861122c..7138de6 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -977,10 +977,10 @@ column-header {
}
//here's the interesting stuff
- &:hover, &:prelight-page {
+ &:hover, &.prelight-page {
border-color: $borders_color;
}
- &:active, &:backdrop:active {
+ &:active, &.active-page, &:backdrop:active {
border-color: $selected_bg_color;
}
&:backdrop {
@@ -991,38 +991,38 @@ column-header {
(bottom, top),
(left, right),
(right, left) {
- &.reorderable-page.#{$_tab}, {
- border-color: transparent;
- &:hover, &.prelight-page {
- border-color: transparentize($borders_color,0.7);
- border-#{$_border}-color: transparentize($borders_color,0.7);
- background-color: transparentize($bg_color,0.8);
- }
- &:active, &.active-page {
- background-color: transparentize($bg_color,0.5);
- border-color: transparentize($borders_color,0.5);
- border-#{$_border}-color: $selected_bg_color;
- &:hover {
- background-color: transparentize($bg_color,0.3);
+ &.reorderable-page.#{$_tab} {
+ border-color: transparent;
+ &:hover, &.prelight-page {
+ border-color: transparentize($borders_color,0.7);
+ border-#{$_border}-color: $borders_color;
+ background-color: transparentize($bg_color,0.8);
}
- &:backdrop {
- border-color: $backdrop_borders_color;
- background-color: $backdrop_bg_color;
+ &:active, &.active-page {
+ background-color: transparentize($bg_color,0.5);
+ border-color: transparentize($borders_color,0.5);
border-#{$_border}-color: $selected_bg_color;
+ &:hover { background-color: transparentize($bg_color,0.3); }
+ &:backdrop {
+ border-color: $backdrop_borders_color;
+ background-color: $backdrop_bg_color;
+ border-#{$_border}-color: $selected_bg_color;
+ }
+ }
+ &:backdrop {
+ border-color: transparent;
+ background-color: transparent;
}
}
- &:backdrop {
- border-color: transparent;
- background-color: transparent;
- }
- }
}
GtkLabel { //tab text
// this doesn't affect labels on reorderable pages, not css fault.
padding: 0 2px; // needed for a nicer focus ring
font-weight: bold;
color: $insensitive_fg_color; /* color: inherit doesn't work here */
-
+ &:backdrop {
+ color: mix($backdrop_fg_color, $backdrop_insensitive_color, 50%);
+ }
// prelight tab text
&.prelight-page {
color: mix($fg_color, $insensitive_fg_color, 50%);
@@ -1032,9 +1032,6 @@ column-header {
color: $fg_color;
&:backdrop { color: $backdrop_fg_color; }
}
- &:backdrop {
- color: mix($backdrop_fg_color, $backdrop_insensitive_color, 50%);
- }
}
.button { //tab close button
border: 1px solid transparent;
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 23e08e9..62b5a3a 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -1120,9 +1120,9 @@ column-header .button, column-header .button:hover, column-header .button:active
.notebook tab.right {
padding-left: 17px;
border-left-width: 3px; }
- .notebook tab:hover, .notebook tab:prelight-page {
+ .notebook tab:hover, .notebook tab.prelight-page {
border-color: #1c1f1f; }
- .notebook tab:active, .notebook tab:backdrop:active {
+ .notebook tab:active, .notebook tab.active-page, .notebook tab:backdrop:active {
border-color: #215d9c; }
.notebook tab:backdrop {
background-color: transparent;
@@ -1131,7 +1131,7 @@ column-header .button, column-header .button:hover, column-header .button:active
border-color: transparent; }
.notebook tab.reorderable-page.top:hover, .notebook tab.reorderable-page.top.prelight-page {
border-color: rgba(28, 31, 31, 0.3);
- border-bottom-color: rgba(28, 31, 31, 0.3);
+ border-bottom-color: #1c1f1f;
background-color: rgba(57, 63, 63, 0.2); }
.notebook tab.reorderable-page.top:active, .notebook tab.reorderable-page.top.active-page {
background-color: rgba(57, 63, 63, 0.5);
@@ -1150,7 +1150,7 @@ column-header .button, column-header .button:hover, column-header .button:active
border-color: transparent; }
.notebook tab.reorderable-page.bottom:hover, .notebook tab.reorderable-page.bottom.prelight-page {
border-color: rgba(28, 31, 31, 0.3);
- border-top-color: rgba(28, 31, 31, 0.3);
+ border-top-color: #1c1f1f;
background-color: rgba(57, 63, 63, 0.2); }
.notebook tab.reorderable-page.bottom:active, .notebook tab.reorderable-page.bottom.active-page {
background-color: rgba(57, 63, 63, 0.5);
@@ -1169,7 +1169,7 @@ column-header .button, column-header .button:hover, column-header .button:active
border-color: transparent; }
.notebook tab.reorderable-page.left:hover, .notebook tab.reorderable-page.left.prelight-page {
border-color: rgba(28, 31, 31, 0.3);
- border-right-color: rgba(28, 31, 31, 0.3);
+ border-right-color: #1c1f1f;
background-color: rgba(57, 63, 63, 0.2); }
.notebook tab.reorderable-page.left:active, .notebook tab.reorderable-page.left.active-page {
background-color: rgba(57, 63, 63, 0.5);
@@ -1188,7 +1188,7 @@ column-header .button, column-header .button:hover, column-header .button:active
border-color: transparent; }
.notebook tab.reorderable-page.right:hover, .notebook tab.reorderable-page.right.prelight-page {
border-color: rgba(28, 31, 31, 0.3);
- border-left-color: rgba(28, 31, 31, 0.3);
+ border-left-color: #1c1f1f;
background-color: rgba(57, 63, 63, 0.2); }
.notebook tab.reorderable-page.right:active, .notebook tab.reorderable-page.right.active-page {
background-color: rgba(57, 63, 63, 0.5);
@@ -1208,14 +1208,14 @@ column-header .button, column-header .button:hover, column-header .button:active
font-weight: bold;
color: #939695;
/* color: inherit doesn't work here */ }
+ .notebook tab GtkLabel:backdrop {
+ color: #878b8a; }
.notebook tab GtkLabel.prelight-page {
color: #c0c2c0; }
.notebook tab GtkLabel.active-page {
color: #eeeeec; }
.notebook tab GtkLabel.active-page:backdrop {
color: #c9cbc9; }
- .notebook tab GtkLabel:backdrop {
- color: #878b8a; }
.notebook tab .button {
border: 1px solid transparent;
icon-shadow: none;
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 53c4d65..6c3c1ce 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -1120,9 +1120,9 @@ column-header .button, column-header .button:hover, column-header .button:active
.notebook tab.right {
padding-left: 17px;
border-left-width: 3px; }
- .notebook tab:hover, .notebook tab:prelight-page {
+ .notebook tab:hover, .notebook tab.prelight-page {
border-color: #a1a1a1; }
- .notebook tab:active, .notebook tab:backdrop:active {
+ .notebook tab:active, .notebook tab.active-page, .notebook tab:backdrop:active {
border-color: #4a90d9; }
.notebook tab:backdrop {
background-color: transparent;
@@ -1131,7 +1131,7 @@ column-header .button, column-header .button:hover, column-header .button:active
border-color: transparent; }
.notebook tab.reorderable-page.top:hover, .notebook tab.reorderable-page.top.prelight-page {
border-color: rgba(161, 161, 161, 0.3);
- border-bottom-color: rgba(161, 161, 161, 0.3);
+ border-bottom-color: #a1a1a1;
background-color: rgba(237, 237, 237, 0.2); }
.notebook tab.reorderable-page.top:active, .notebook tab.reorderable-page.top.active-page {
background-color: rgba(237, 237, 237, 0.5);
@@ -1150,7 +1150,7 @@ column-header .button, column-header .button:hover, column-header .button:active
border-color: transparent; }
.notebook tab.reorderable-page.bottom:hover, .notebook tab.reorderable-page.bottom.prelight-page {
border-color: rgba(161, 161, 161, 0.3);
- border-top-color: rgba(161, 161, 161, 0.3);
+ border-top-color: #a1a1a1;
background-color: rgba(237, 237, 237, 0.2); }
.notebook tab.reorderable-page.bottom:active, .notebook tab.reorderable-page.bottom.active-page {
background-color: rgba(237, 237, 237, 0.5);
@@ -1169,7 +1169,7 @@ column-header .button, column-header .button:hover, column-header .button:active
border-color: transparent; }
.notebook tab.reorderable-page.left:hover, .notebook tab.reorderable-page.left.prelight-page {
border-color: rgba(161, 161, 161, 0.3);
- border-right-color: rgba(161, 161, 161, 0.3);
+ border-right-color: #a1a1a1;
background-color: rgba(237, 237, 237, 0.2); }
.notebook tab.reorderable-page.left:active, .notebook tab.reorderable-page.left.active-page {
background-color: rgba(237, 237, 237, 0.5);
@@ -1188,7 +1188,7 @@ column-header .button, column-header .button:hover, column-header .button:active
border-color: transparent; }
.notebook tab.reorderable-page.right:hover, .notebook tab.reorderable-page.right.prelight-page {
border-color: rgba(161, 161, 161, 0.3);
- border-left-color: rgba(161, 161, 161, 0.3);
+ border-left-color: #a1a1a1;
background-color: rgba(237, 237, 237, 0.2); }
.notebook tab.reorderable-page.right:active, .notebook tab.reorderable-page.right.active-page {
background-color: rgba(237, 237, 237, 0.5);
@@ -1208,14 +1208,14 @@ column-header .button, column-header .button:hover, column-header .button:active
font-weight: bold;
color: #8d9091;
/* color: inherit doesn't work here */ }
+ .notebook tab GtkLabel:backdrop {
+ color: #8d9090; }
.notebook tab GtkLabel.prelight-page {
color: #5d6263; }
.notebook tab GtkLabel.active-page {
color: #2e3436; }
.notebook tab GtkLabel.active-page:backdrop {
color: #54595a; }
- .notebook tab GtkLabel:backdrop {
- color: #8d9090; }
.notebook tab .button {
border: 1px solid transparent;
icon-shadow: none;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]