[gtk+] Adwaita: fix Gedit style tabs color.
- From: Lapo Calamandrei <lapo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Adwaita: fix Gedit style tabs color.
- Date: Wed, 2 Jul 2014 15:53:58 +0000 (UTC)
commit 8116e3e7b9de16481ad86c695a33578a7c0393aa
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Wed Jul 2 17:52:36 2014 +0200
Adwaita: fix Gedit style tabs color.
I also introduced a gab between tabs as in the mockups.
gtk/resources/theme/Adwaita/_common.scss | 20 ++++++++++----------
gtk/resources/theme/Adwaita/gtk-contained-dark.css | 16 ++++++++--------
gtk/resources/theme/Adwaita/gtk-contained.css | 16 ++++++++--------
3 files changed, 26 insertions(+), 26 deletions(-)
---
diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 296ae99..7be7a67 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -890,7 +890,7 @@ column-header {
-GtkNotebook-initial-gap: 10;
-GtkNotebook-arrow-spacing: 5;
-GtkNotebook-tab-curvature: 0;
- -GtkNotebook-tab-overlap: 1;
+ -GtkNotebook-tab-overlap: -8;
-GtkNotebook-has-tab-gap: false;
-GtkWidget-focus-padding: 0;
-GtkWidget-focus-line-width: 0;
@@ -970,6 +970,7 @@ column-header {
&.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 {
@@ -1066,22 +1067,21 @@ column-header {
}
}
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 {
+ &:backdrop, &.prelight-page:backdrop {
color: mix($backdrop_fg_color, $backdrop_insensitive_color, 50%);
}
+ }
+ &.prelight-page GtkLabel, GtkLabel.prelight-page {
// prelight tab text
- &.prelight-page {
- color: mix($fg_color, $insensitive_fg_color, 50%);
- }
+ color: mix($fg_color, $insensitive_fg_color, 50%);
+ }
+ &.active-page GtkLabel, GtkLabel.active-page {
// active tab text
- &.active-page {
- color: $fg_color;
- &:backdrop { color: $backdrop_fg_color; }
- }
+ color: $fg_color;
+ &:backdrop { color: $backdrop_fg_color; }
}
.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 9985188..503441a 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -1100,7 +1100,7 @@ column-header .button, column-header .button:hover, column-header .button:active
-GtkNotebook-initial-gap: 10;
-GtkNotebook-arrow-spacing: 5;
-GtkNotebook-tab-curvature: 0;
- -GtkNotebook-tab-overlap: 1;
+ -GtkNotebook-tab-overlap: -8;
-GtkNotebook-has-tab-gap: false;
-GtkWidget-focus-padding: 0;
-GtkWidget-focus-line-width: 0;
@@ -1297,14 +1297,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 {
+ .notebook tab GtkLabel:backdrop, .notebook tab GtkLabel.prelight-page: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.prelight-page GtkLabel, .notebook tab GtkLabel.prelight-page {
+ color: #c0c2c0; }
+ .notebook tab.active-page GtkLabel, .notebook tab GtkLabel.active-page {
+ color: #eeeeec; }
+ .notebook tab.active-page GtkLabel:backdrop, .notebook tab GtkLabel.active-page:backdrop {
+ color: #c9cbc9; }
.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 da9dd26..16a9217 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -1100,7 +1100,7 @@ column-header .button, column-header .button:hover, column-header .button:active
-GtkNotebook-initial-gap: 10;
-GtkNotebook-arrow-spacing: 5;
-GtkNotebook-tab-curvature: 0;
- -GtkNotebook-tab-overlap: 1;
+ -GtkNotebook-tab-overlap: -8;
-GtkNotebook-has-tab-gap: false;
-GtkWidget-focus-padding: 0;
-GtkWidget-focus-line-width: 0;
@@ -1297,14 +1297,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 {
+ .notebook tab GtkLabel:backdrop, .notebook tab GtkLabel.prelight-page: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.prelight-page GtkLabel, .notebook tab GtkLabel.prelight-page {
+ color: #5d6263; }
+ .notebook tab.active-page GtkLabel, .notebook tab GtkLabel.active-page {
+ color: #2e3436; }
+ .notebook tab.active-page GtkLabel:backdrop, .notebook tab GtkLabel.active-page:backdrop {
+ color: #54595a; }
.notebook tab .button {
border: 1px solid transparent;
icon-shadow: none;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]