1 files changed, 18 insertions, 21 deletions

diff --git a/themes/ayaya/gtk-3.0/apps/granite-widgets.css b/themes/ayaya/gtk-3.0/apps/granite-widgets.css
index 1ddb61c..0e0f51a 100644
--- a/themes/ayaya/gtk-3.0/apps/granite-widgets.css
+++ b/themes/ayaya/gtk-3.0/apps/granite-widgets.css
@@ -12,9 +12,6 @@
 }
 
 .dynamic-notebook .notebook {
-    -GtkNotebook-tab-overlap: 3px;
-    -GtkNotebook-initial-gap: 12px;
-
     border-width: 1px 0 0 0;
     border-color: shade(@theme_bg_color, 0.8);
     border-radius: 0;
@@ -124,7 +121,7 @@
     color: shade(@theme_text_color, 0.7);
 }
 
-.content-view .button:insensitive {
+.content-view .button:disabled {
     background-color: shade(@theme_base_color, 0.9);
     background-image: none;
 }
@@ -170,21 +167,21 @@
 }
 
 .source-list.view:selected,
-.source-list.view:prelight:selected {
+.source-list.view:hover:selected {
     background-color: @theme_selected_bg_color;
     background-image: none;
     color: @theme_selected_fg_color;
 }
 
-.source-list.view:prelight {
+.source-list.view:hover {
     background-color: shade(@theme_bg_color, 1.08);
     background-image: none;
 }
 
 .source-list.badge,
-.source-list.badge:prelight,
+.source-list.badge:hover,
 .source-list.badge:selected,
-.source-list.badge:prelight:selected {
+.source-list.badge:hover:selected {
     margin: 0 3px;
     padding: 0 6px;
     border-width: 0;
@@ -227,7 +224,7 @@
 }
 
 .button.noundo GtkLabel,
-.button.noundo Gtklabel:prelight {
+.button.noundo Gtklabel:hover {
     color: @error_fg_color;
 }
 
@@ -264,7 +261,7 @@
 }
 
 .button.affirmative GtkLabel,
-.button.affirmative Gtklabel:prelight {
+.button.affirmative Gtklabel:hover {
     color: @theme_selected_fg_color;
 }
 
@@ -308,13 +305,13 @@
     border-color: shade(@toolbar_bg_color, 0.7);
 }
 
-.secondary-toolbar.toolbar .button:insensitive {
+.secondary-toolbar.toolbar .button:disabled {
     border-color: shade(@toolbar_bg_color, 0.85);
     background-color: shade(@toolbar_bg_color, 0.9);
     background-image: none;
 }
 
-.secondary-toolbar.toolbar .button:active *:insensitive {
+.secondary-toolbar.toolbar .button:active *:disabled {
     border-color: shade(@toolbar_bg_color, 0.75);
     background-color: shade(@toolbar_bg_color, 0.80);
     background-image: none;
@@ -361,13 +358,13 @@
     border-color: shade(@theme_bg_color, 0.7);
 }
 
-.bottom-toolbar.toolbar .button:insensitive {
+.bottom-toolbar.toolbar .button:disabled {
     border-color: shade(@theme_bg_color, 0.85);
     background-color: shade(@theme_bg_color, 0.9);
     background-image: none;
 }
 
-.bottom-toolbar.toolbar .button:active *:insensitive {
+.bottom-toolbar.toolbar .button:active *:disabled {
     border-color: shade(@theme_bg_color, 0.75);
     background-color: shade(@theme_bg_color, 0.80);
     background-image: none;
@@ -461,17 +458,17 @@ GraniteWidgetsPopOver .linked .button:active {
                 inset 0 -1px alpha(@dark_shadow, 0.05);
 }
 
-GraniteWidgetsPopOver .linked .button:insensitive {
+GraniteWidgetsPopOver .linked .button:disabled {
     box-shadow: inset -1px 0 shade(@menu_bg_color, 0.9);
 }
 
 /* remove box shadow from last-child and only-child */
 GraniteWidgetsPopOver .linked .button:last-child,
 GraniteWidgetsPopOver .linked .button:only-child,
-GraniteWidgetsPopOver .linked .button:insensitive:last-child,
-GraniteWidgetsPopOver .linked .button:insensitive:only-child,
-GraniteWidgetsPopOver .linked .button:active *:insensitive:last-child,
-GraniteWidgetsPopOver .linked .button:active *:insensitive:only-child {
+GraniteWidgetsPopOver .linked .button:disabled:last-child,
+GraniteWidgetsPopOver .linked .button:disabled:only-child,
+GraniteWidgetsPopOver .linked .button:active *:disabled:last-child,
+GraniteWidgetsPopOver .linked .button:active *:disabled:only-child {
     box-shadow: none;
 }
 
@@ -647,7 +644,7 @@ BirdieWidgetsTweetList * {
     color: white;
     font-weight: bold;
     text-shadow: 0 1px 2px alpha (black, 0.5);
-    icon-shadow: 0 1px 2px alpha (black, 0.5);
+    -gtk-icon-shadow: 0 1px 2px alpha (black, 0.5);
 }
 
 .panel .menu .menuitem {
@@ -670,7 +667,7 @@ BirdieWidgetsTweetList * {
 }
 
 .composited-indicator.menuitem:active,
-.composited-indicator.menuitem:prelight {
+.composited-indicator.menuitem:hover {
     border-style: none;
     background-image: none;
     box-shadow: none;