Adwaita: fix Gedit style tabs color.

I also introduced a gab between tabs as in the mockups.
This commit is contained in:
Lapo Calamandrei 2014-07-02 17:52:36 +02:00
parent 6e89856cc0
commit 8116e3e7b9
3 changed files with 26 additions and 26 deletions

View File

@ -890,7 +890,7 @@ column-header {
-GtkNotebook-initial-gap: 10; -GtkNotebook-initial-gap: 10;
-GtkNotebook-arrow-spacing: 5; -GtkNotebook-arrow-spacing: 5;
-GtkNotebook-tab-curvature: 0; -GtkNotebook-tab-curvature: 0;
-GtkNotebook-tab-overlap: 1; -GtkNotebook-tab-overlap: -8;
-GtkNotebook-has-tab-gap: false; -GtkNotebook-has-tab-gap: false;
-GtkWidget-focus-padding: 0; -GtkWidget-focus-padding: 0;
-GtkWidget-focus-line-width: 0; -GtkWidget-focus-line-width: 0;
@ -970,6 +970,7 @@ column-header {
&.top, &.bottom { padding: $vt_vpadding $vt_hpadding; } &.top, &.bottom { padding: $vt_vpadding $vt_hpadding; }
&.left, &.right { padding: $ht_vpadding $ht_hpadding; } &.left, &.right { padding: $ht_vpadding $ht_hpadding; }
/* works for testnotebookdnd, but there's a superfluous border /* works for testnotebookdnd, but there's a superfluous border
in gedit or web, commented out for now, needs gtk fixes in gedit or web, commented out for now, needs gtk fixes
&.reorderable-page { &.reorderable-page {
@ -1066,22 +1067,21 @@ column-header {
} }
} }
GtkLabel { //tab text GtkLabel { //tab text
// this doesn't affect labels on reorderable pages, not css fault.
padding: 0 2px; // needed for a nicer focus ring padding: 0 2px; // needed for a nicer focus ring
font-weight: bold; font-weight: bold;
color: $insensitive_fg_color; /* color: inherit doesn't work here */ color: $insensitive_fg_color; /* color: inherit doesn't work here */
&:backdrop { &:backdrop, &.prelight-page:backdrop {
color: mix($backdrop_fg_color, $backdrop_insensitive_color, 50%); color: mix($backdrop_fg_color, $backdrop_insensitive_color, 50%);
} }
}
&.prelight-page GtkLabel, GtkLabel.prelight-page {
// prelight tab text // 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 tab text
&.active-page { color: $fg_color;
color: $fg_color; &:backdrop { color: $backdrop_fg_color; }
&:backdrop { color: $backdrop_fg_color; }
}
} }
.button { //tab close button .button { //tab close button
border: 1px solid transparent; border: 1px solid transparent;

View File

@ -1100,7 +1100,7 @@ column-header .button, column-header .button:hover, column-header .button:active
-GtkNotebook-initial-gap: 10; -GtkNotebook-initial-gap: 10;
-GtkNotebook-arrow-spacing: 5; -GtkNotebook-arrow-spacing: 5;
-GtkNotebook-tab-curvature: 0; -GtkNotebook-tab-curvature: 0;
-GtkNotebook-tab-overlap: 1; -GtkNotebook-tab-overlap: -8;
-GtkNotebook-has-tab-gap: false; -GtkNotebook-has-tab-gap: false;
-GtkWidget-focus-padding: 0; -GtkWidget-focus-padding: 0;
-GtkWidget-focus-line-width: 0; -GtkWidget-focus-line-width: 0;
@ -1297,14 +1297,14 @@ column-header .button, column-header .button:hover, column-header .button:active
font-weight: bold; font-weight: bold;
color: #939695; color: #939695;
/* color: inherit doesn't work here */ } /* color: inherit doesn't work here */ }
.notebook tab GtkLabel:backdrop { .notebook tab GtkLabel:backdrop, .notebook tab GtkLabel.prelight-page:backdrop {
color: #878b8a; } color: #878b8a; }
.notebook tab GtkLabel.prelight-page { .notebook tab.prelight-page GtkLabel, .notebook tab GtkLabel.prelight-page {
color: #c0c2c0; } color: #c0c2c0; }
.notebook tab GtkLabel.active-page { .notebook tab.active-page GtkLabel, .notebook tab GtkLabel.active-page {
color: #eeeeec; } color: #eeeeec; }
.notebook tab GtkLabel.active-page:backdrop { .notebook tab.active-page GtkLabel:backdrop, .notebook tab GtkLabel.active-page:backdrop {
color: #c9cbc9; } color: #c9cbc9; }
.notebook tab .button { .notebook tab .button {
border: 1px solid transparent; border: 1px solid transparent;
icon-shadow: none; icon-shadow: none;

View File

@ -1100,7 +1100,7 @@ column-header .button, column-header .button:hover, column-header .button:active
-GtkNotebook-initial-gap: 10; -GtkNotebook-initial-gap: 10;
-GtkNotebook-arrow-spacing: 5; -GtkNotebook-arrow-spacing: 5;
-GtkNotebook-tab-curvature: 0; -GtkNotebook-tab-curvature: 0;
-GtkNotebook-tab-overlap: 1; -GtkNotebook-tab-overlap: -8;
-GtkNotebook-has-tab-gap: false; -GtkNotebook-has-tab-gap: false;
-GtkWidget-focus-padding: 0; -GtkWidget-focus-padding: 0;
-GtkWidget-focus-line-width: 0; -GtkWidget-focus-line-width: 0;
@ -1297,14 +1297,14 @@ column-header .button, column-header .button:hover, column-header .button:active
font-weight: bold; font-weight: bold;
color: #8d9091; color: #8d9091;
/* color: inherit doesn't work here */ } /* color: inherit doesn't work here */ }
.notebook tab GtkLabel:backdrop { .notebook tab GtkLabel:backdrop, .notebook tab GtkLabel.prelight-page:backdrop {
color: #8d9090; } color: #8d9090; }
.notebook tab GtkLabel.prelight-page { .notebook tab.prelight-page GtkLabel, .notebook tab GtkLabel.prelight-page {
color: #5d6263; } color: #5d6263; }
.notebook tab GtkLabel.active-page { .notebook tab.active-page GtkLabel, .notebook tab GtkLabel.active-page {
color: #2e3436; } color: #2e3436; }
.notebook tab GtkLabel.active-page:backdrop { .notebook tab.active-page GtkLabel:backdrop, .notebook tab GtkLabel.active-page:backdrop {
color: #54595a; } color: #54595a; }
.notebook tab .button { .notebook tab .button {
border: 1px solid transparent; border: 1px solid transparent;
icon-shadow: none; icon-shadow: none;