From a3b98eab9259b4dd94c20b7aa2ddc1005b43e239 Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Tue, 8 Jul 2014 10:17:02 +0200
Subject: [PATCH] Adwaita: fix reorderable tab label color once again

---
 gtk/resources/theme/Adwaita/_common.scss           | 6 +++---
 gtk/resources/theme/Adwaita/gtk-contained-dark.css | 9 ++++-----
 gtk/resources/theme/Adwaita/gtk-contained.css      | 9 ++++-----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index ae5435d692..19fc3d7e17 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -1166,16 +1166,16 @@ GtkTreeView.view.progressbar { //Progressbar in treeview cells
     GtkLabel { //tab text
       padding: 0 2px; // needed for a nicer focus ring
       font-weight: bold;
-      color: $insensitive_fg_color; /* color: inherit doesn't work here */
+      color: $insensitive_fg_color;
       &:backdrop, &.prelight-page:backdrop {
         color: mix($backdrop_fg_color, $backdrop_insensitive_color, 50%);
       }
     }
-    &.prelight-page GtkLabel, GtkLabel.prelight-page {
+    .prelight-page GtkLabel, GtkLabel.prelight-page {
       // prelight tab text
       color: mix($fg_color, $insensitive_fg_color, 50%);
     }
-    &.active-page GtkLabel, GtkLabel.active-page {
+    .active-page GtkLabel, GtkLabel.active-page {
       // active tab text
       color: $fg_color;
       &:backdrop { color: $backdrop_fg_color; }
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 51665b396d..be41944ae6 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -1334,15 +1334,14 @@ GtkTreeView.view.progressbar {
     .notebook tab GtkLabel {
       padding: 0 2px;
       font-weight: bold;
-      color: #939695;
-      /* color: inherit doesn't work here */ }
+      color: #939695; }
       .notebook tab GtkLabel:backdrop, .notebook tab GtkLabel.prelight-page:backdrop {
         color: #878b8a; }
-    .notebook tab.prelight-page GtkLabel, .notebook tab GtkLabel.prelight-page {
+    .notebook tab .prelight-page GtkLabel, .notebook tab GtkLabel.prelight-page {
       color: #c0c2c0; }
-    .notebook tab.active-page GtkLabel, .notebook tab GtkLabel.active-page {
+    .notebook tab .active-page GtkLabel, .notebook tab GtkLabel.active-page {
       color: #eeeeec; }
-      .notebook tab.active-page GtkLabel:backdrop, .notebook tab GtkLabel.active-page:backdrop {
+      .notebook tab .active-page GtkLabel:backdrop, .notebook tab GtkLabel.active-page:backdrop {
         color: #c9cbc9; }
     .notebook tab .button {
       border: 1px solid transparent;
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index ff0af2c57c..46e6cd3dc5 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -1327,15 +1327,14 @@ GtkTreeView.view.progressbar {
     .notebook tab GtkLabel {
       padding: 0 2px;
       font-weight: bold;
-      color: #8d9091;
-      /* color: inherit doesn't work here */ }
+      color: #8d9091; }
       .notebook tab GtkLabel:backdrop, .notebook tab GtkLabel.prelight-page:backdrop {
         color: #8d9090; }
-    .notebook tab.prelight-page GtkLabel, .notebook tab GtkLabel.prelight-page {
+    .notebook tab .prelight-page GtkLabel, .notebook tab GtkLabel.prelight-page {
       color: #5d6263; }
-    .notebook tab.active-page GtkLabel, .notebook tab GtkLabel.active-page {
+    .notebook tab .active-page GtkLabel, .notebook tab GtkLabel.active-page {
       color: #2e3436; }
-      .notebook tab.active-page GtkLabel:backdrop, .notebook tab GtkLabel.active-page:backdrop {
+      .notebook tab .active-page GtkLabel:backdrop, .notebook tab GtkLabel.active-page:backdrop {
         color: #54595a; }
     .notebook tab .button {
       border: 1px solid transparent;