Merge pull request #29 from shimmerproject/master

Fixes for GTK 3.8
pull/34/merge
Satyajit Sahoo 2013-04-22 02:54:02 -07:00
commit d188951d09
12 changed files with 328 additions and 327 deletions

View File

@ -13,12 +13,12 @@
.dynamic-notebook .notebook { .dynamic-notebook .notebook {
-GtkNotebook-tab-overlap: 3px; -GtkNotebook-tab-overlap: 3px;
-GtkNotebook-initial-gap: 5px; -GtkNotebook-initial-gap: 12px;
border-width: 1px 0 0 0; border-width: 1px 0 0 0;
border-color: shade(@theme_bg_color, 0.8); border-color: shade(@theme_bg_color, 0.8);
border-radius: 0; border-radius: 0;
padding: 1px 0 0 0; padding: 0;
} }
.dynamic-notebook .notebook tab { .dynamic-notebook .notebook tab {

View File

@ -70,33 +70,13 @@
* base states * * base states *
***************/ ***************/
GtkWindow { GtkWindow {
color: @theme_fg_color; color: @fg_color;
} }
* { * {
background-color: @theme_bg_color; /* inherit the color from parent by default */
color: inherit; color: inherit;
} background-color: @bg_color;
*:insensitive,
*:insensitive:insensitive {
color: mix(@theme_fg_color, @theme_bg_color, 0.5);
}
*:active {
background-color: shade(@theme_bg_color, 0.85);
}
*:active:hover:insensitive {
}
*:active:insensitive {
}
*:hover {
}
*:hover:insensitive {
} }
*:selected, *:selected,
@ -105,11 +85,58 @@ GtkWindow {
color: @theme_selected_fg_color; color: @theme_selected_fg_color;
} }
*:active {
background-color: shade(@theme_bg_color, 0.85);
}
*:insensitive,
*:insensitive:insensitive {
color: mix(@theme_fg_color, @theme_bg_color, 0.5);
}
.background { .background {
color: @theme_fg_color; color: @theme_fg_color;
background-color: @theme_bg_color; background-color: @theme_bg_color;
} }
.background.client-decorated {
background-color: transparent;
}
.background.window-content {
background-color: @theme_bg_color;
}
GtkClutterOffscreen {
background-color: @theme_bg_color;
color: @theme_fg_color;
}
.gtkstyle-fallback {
background-color: @theme_bg_color;
color: @theme_fg_color;
}
.gtkstyle-fallback:prelight {
background-color: shade(@theme_bg_color, 1.1);
color: @theme_fg_color;
}
.gtkstyle-fallback:active {
background-color: shade(@theme_bg_color, 0.9);
color: @theme_fg_color;
}
.gtkstyle-fallback:insensitive {
background-color: shade(shade(@theme_bg_color, 0.95), 1.05);
color: mix(@theme_fg_color, @theme_bg_color, 0.5);
}
.gtkstyle-fallback:selected {
background-color: @theme_selected_bg_color;
color: @theme_selected_fg_color;
}
/****************** /******************
* common effects * * common effects *
******************/ ******************/
@ -174,14 +201,6 @@ GtkAssistant .sidebar {
color: mix(@theme_fg_color, @theme_bg_color, 0.1); color: mix(@theme_fg_color, @theme_bg_color, 0.1);
} }
/**************
* background *
**************/
.background {
border-width: 0;
background-color: @theme_bg_color;
}
/********** /**********
* button * * button *
**********/ **********/
@ -717,34 +736,6 @@ GtkInfoBar {
color: @error_fg_color; color: @error_fg_color;
} }
/************
* gtkstyle *
************/
.gtkstyle-fallback {
background-color: @theme_bg_color;
color: @theme_fg_color;
}
.gtkstyle-fallback:prelight {
background-color: shade(@theme_bg_color, 1.1);
color: @theme_fg_color;
}
.gtkstyle-fallback:active {
background-color: shade(@theme_bg_color, 0.9);
color: @theme_fg_color;
}
.gtkstyle-fallback:insensitive {
background-color: shade(shade(@theme_bg_color, 0.95), 1.05);
color: mix(@theme_fg_color, @theme_bg_color, 0.5);
}
.gtkstyle-fallback:selected {
background-color: @theme_selected_bg_color;
color: @theme_selected_fg_color;
}
/******************* /*******************
* symbolic images * * symbolic images *
*******************/ *******************/
@ -869,7 +860,7 @@ GtkComboBox .menu {
.menubar { .menubar {
-GtkWidget-window-dragging: true; -GtkWidget-window-dragging: true;
border-width: 0; border-style: none;
background-color: @menubar_bg_color; background-color: @menubar_bg_color;
background-image: none; background-image: none;
color: @menubar_fg_color; color: @menubar_fg_color;
@ -880,8 +871,13 @@ GtkComboBox .menu {
***************/ ***************/
.menubar.menuitem, .menubar.menuitem,
.menubar .menuitem { .menubar .menuitem {
padding: 3px; padding: 3px 5px;
border-width: 1px 1px 0 1px; border-style: solid;
border-width: 1px;
border-color: transparent;
background-color: @menubar_bg_color;
background-image: none;
color: @menubar_fg_color;
} }
.menubar.menuitem:hover, .menubar.menuitem:hover,
@ -910,15 +906,18 @@ GtkTreeMenu .menuitem * {
.menuitem, .menuitem,
.menu .menuitem { .menu .menuitem {
padding: 3px; padding: 3px;
border-width: 1px;
border-style: solid; border-style: solid;
border-width: 1px;
border-color: transparent;
border-radius: 0; border-radius: 0;
background-color: @menu_bg_color;
background-image: none;
color: @menu_fg_color;
} }
.menu .menuitem:active, .menu .menuitem:active,
.menu .menuitem:hover { .menu .menuitem:hover {
border-color: shade(@theme_selected_bg_color, 0.9); border-color: shade(@theme_selected_bg_color, 0.9);
border-radius: 0;
background-color: @theme_selected_bg_color; background-color: @theme_selected_bg_color;
background-image: none; background-image: none;
} }
@ -1389,6 +1388,8 @@ GtkScrolledWindow GtkViewport.frame {
-GtkMenuItem-horizontal-padding: 0; -GtkMenuItem-horizontal-padding: 0;
-GtkWidget-separator-height: 1; -GtkWidget-separator-height: 1;
padding: 0;
border-image: -gtk-gradient(linear, border-image: -gtk-gradient(linear,
left top, left bottom, left top, left bottom,
from (shade(@menu_bg_color, 0.9)), from (shade(@menu_bg_color, 0.9)),
@ -1686,7 +1687,7 @@ GtkTextView {
-GtkWidget-window-dragging: true; -GtkWidget-window-dragging: true;
padding: 3px; padding: 3px;
border-width: 1px 0 1px 0; border-width: 0 0 1px 0;
border-style: solid; border-style: solid;
border-color: shade(@toolbar_bg_color, 0.8); border-color: shade(@toolbar_bg_color, 0.8);
background-color: @toolbar_bg_color; background-color: @toolbar_bg_color;

View File

@ -1,31 +1,31 @@
/* XPM */ /* XPM */
static char * title_1_active_xpm[] = { static char * title_1_active_xpm[] = {
"1 25 3 1", "2 25 3 1",
" c None", " c None",
". c #484848", ". c #484848",
"+ c #2D2D2D", "+ c #2D2D2D",
".", "..",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+"}; "++"};

View File

@ -1,31 +1,31 @@
/* XPM */ /* XPM */
static char * title_1_inactive_xpm[] = { static char * title_1_inactive_xpm[] = {
"1 25 3 1", "2 25 3 1",
" c None", " c None",
". c #393939", ". c #393939",
"+ c #2D2D2D", "+ c #2D2D2D",
".", "..",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+"}; "++"};

View File

@ -1,31 +1,31 @@
/* XPM */ /* XPM */
static char * title_2_active_xpm[] = { static char * title_2_active_xpm[] = {
"1 25 3 1", "2 25 3 1",
" c None", " c None",
". c #484848", ". c #484848",
"+ c #2D2D2D", "+ c #2D2D2D",
".", "..",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+"}; "++"};

View File

@ -1,31 +1,31 @@
/* XPM */ /* XPM */
static char * title_2_inactive_xpm[] = { static char * title_2_inactive_xpm[] = {
"1 25 3 1", "2 25 3 1",
" c None", " c None",
". c #393939", ". c #393939",
"+ c #2D2D2D", "+ c #2D2D2D",
".", "..",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+"}; "++"};

View File

@ -1,31 +1,31 @@
/* XPM */ /* XPM */
static char * title_3_active_xpm[] = { static char * title_3_active_xpm[] = {
"1 25 3 1", "2 25 3 1",
" c None", " c None",
". c #484848", ". c #484848",
"+ c #2D2D2D", "+ c #2D2D2D",
".", "..",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+"}; "++"};

View File

@ -1,31 +1,31 @@
/* XPM */ /* XPM */
static char * title_3_inactive_xpm[] = { static char * title_3_inactive_xpm[] = {
"1 25 3 1", "2 25 3 1",
" c None", " c None",
". c #393939", ". c #393939",
"+ c #2D2D2D", "+ c #2D2D2D",
".", "..",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+"}; "++"};

View File

@ -1,31 +1,31 @@
/* XPM */ /* XPM */
static char * title_4_active_xpm[] = { static char * title_4_active_xpm[] = {
"1 25 3 1", "2 25 3 1",
" c None", " c None",
". c #484848", ". c #484848",
"+ c #2D2D2D", "+ c #2D2D2D",
".", "..",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+"}; "++"};

View File

@ -1,31 +1,31 @@
/* XPM */ /* XPM */
static char * title_4_inactive_xpm[] = { static char * title_4_inactive_xpm[] = {
"1 25 3 1", "2 25 3 1",
" c None", " c None",
". c #393939", ". c #393939",
"+ c #2D2D2D", "+ c #2D2D2D",
".", "..",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+"}; "++"};

View File

@ -1,31 +1,31 @@
/* XPM */ /* XPM */
static char * title_5_active_xpm[] = { static char * title_5_active_xpm[] = {
"1 25 3 1", "2 25 3 1",
" c None", " c None",
". c #484848", ". c #484848",
"+ c #2D2D2D", "+ c #2D2D2D",
".", "..",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+"}; "++"};

View File

@ -1,31 +1,31 @@
/* XPM */ /* XPM */
static char * title_5_inactive_xpm[] = { static char * title_5_inactive_xpm[] = {
"1 25 3 1", "2 25 3 1",
" c None", " c None",
". c #393939", ". c #393939",
"+ c #2D2D2D", "+ c #2D2D2D",
".", "..",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+", "++",
"+"}; "++"};