[gtk+] Adwaita: minor fixes.
- From: Lapo Calamandrei <lapo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Adwaita: minor fixes.
- Date: Wed, 18 Jun 2014 08:01:55 +0000 (UTC)
commit 0011c5c5e3024bbc970806618f3db79dec7015c4
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Wed Jun 18 10:01:24 2014 +0200
Adwaita: minor fixes.
gtk/resources/theme/Adwaita/_common.scss | 7 ++++---
gtk/resources/theme/Adwaita/gtk-contained-dark.css | 10 ++++++----
gtk/resources/theme/Adwaita/gtk-contained.css | 10 ++++++----
3 files changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 93f685e..c15c631 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -917,7 +917,7 @@ GtkPopover {
}
//here's the interesting stuff
- &:hover {
+ &:hover, &:prelight-page {
border-color: $borders_color;
}
&:active, &:backdrop:active {
@@ -931,7 +931,7 @@ GtkPopover {
border-color: transparent;
border-left: 1px solid transparent;
border-right: 1px solid transparent;
- &:hover {
+ &:hover, &.prelight-page {
border-color: transparentize($borders_color,0.7);
border-bottom-color: transparentize($borders_color,0.7);
background-color: transparentize($bg_color,0.8);
@@ -959,7 +959,7 @@ GtkPopover {
// 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: $insensitive_fg_color; /* color: inherit doesn't work here */
// prelight tab text
&.prelight-page {
@@ -1748,6 +1748,7 @@ GtkInfoBar {
.tooltip * { //Yeah this is ugly
padding: 4px;
background-color: transparent;
+ color: inherit; // just to be sure
}
/*****************
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 04b7b41..98658fb 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -1062,7 +1062,7 @@ GtkPopover {
.notebook tab.right {
padding-left: 17px;
border-left-width: 3px; }
- .notebook tab:hover {
+ .notebook tab:hover, .notebook tab:prelight-page {
border-color: #1c1f1f; }
.notebook tab:active, .notebook tab:backdrop:active {
border-color: #215d9c; }
@@ -1073,7 +1073,7 @@ GtkPopover {
border-color: transparent;
border-left: 1px solid transparent;
border-right: 1px solid transparent; }
- .notebook tab.reorderable-page:hover {
+ .notebook tab.reorderable-page:hover, .notebook tab.reorderable-page.prelight-page {
border-color: rgba(28, 31, 31, 0.3);
border-bottom-color: rgba(28, 31, 31, 0.3);
background-color: rgba(57, 63, 63, 0.2); }
@@ -1094,7 +1094,8 @@ GtkPopover {
.notebook tab GtkLabel {
padding: 0 2px;
font-weight: bold;
- color: #939695; }
+ color: #939695;
+ /* color: inherit doesn't work here */ }
.notebook tab GtkLabel.prelight-page {
color: #c0c2c0; }
.notebook tab GtkLabel.active-page {
@@ -2329,7 +2330,8 @@ GtkInfoBar {
.tooltip * {
padding: 4px;
- background-color: transparent; }
+ background-color: transparent;
+ color: inherit; }
/*****************
* Color Chooser *
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 14356bc..ffcd773 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -1062,7 +1062,7 @@ GtkPopover {
.notebook tab.right {
padding-left: 17px;
border-left-width: 3px; }
- .notebook tab:hover {
+ .notebook tab:hover, .notebook tab:prelight-page {
border-color: #a1a1a1; }
.notebook tab:active, .notebook tab:backdrop:active {
border-color: #4a90d9; }
@@ -1073,7 +1073,7 @@ GtkPopover {
border-color: transparent;
border-left: 1px solid transparent;
border-right: 1px solid transparent; }
- .notebook tab.reorderable-page:hover {
+ .notebook tab.reorderable-page:hover, .notebook tab.reorderable-page.prelight-page {
border-color: rgba(161, 161, 161, 0.3);
border-bottom-color: rgba(161, 161, 161, 0.3);
background-color: rgba(237, 237, 237, 0.2); }
@@ -1094,7 +1094,8 @@ GtkPopover {
.notebook tab GtkLabel {
padding: 0 2px;
font-weight: bold;
- color: #8d9091; }
+ color: #8d9091;
+ /* color: inherit doesn't work here */ }
.notebook tab GtkLabel.prelight-page {
color: #5d6263; }
.notebook tab GtkLabel.active-page {
@@ -2327,7 +2328,8 @@ GtkInfoBar {
.tooltip * {
padding: 4px;
- background-color: transparent; }
+ background-color: transparent;
+ color: inherit; }
/*****************
* Color Chooser *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]