Fixes for the toolbar

This commit is contained in:
Satyajit Sahoo
2013-03-07 19:04:42 +05:30
parent 8a14d676c0
commit 1975e4bf9a
3 changed files with 107 additions and 54 deletions
+58 -49
View File
@@ -201,7 +201,13 @@ style "murrine-scrollbar" = "murrine-button" {
}
}
# TODO
style "murrine-overlay-scrollbar" {
bg[ACTIVE] = shade (0.8, @bg_color)
bg[INSENSITIVE] = shade (0.97, @bg_color)
base[SELECTED] = shade (0.6, @base_color)
base[INSENSITIVE] = shade (0.85, @base_color)
}
style "murrine-scale" = "murrine-default" {
xthickness = 0
ythickness = 0
@@ -285,14 +291,6 @@ style "murrine-entry" = "murrine-wider" {
}
}
# TODO
style "murrine-overlay-scrollbar" {
bg[ACTIVE] = shade (0.8, @bg_color)
bg[INSENSITIVE] = shade (0.97, @bg_color)
base[SELECTED] = shade (0.6, @base_color)
base[INSENSITIVE] = shade (0.85, @base_color)
}
style "metacity-frame" = "murrine-default" {
bg[SELECTED] = @selected_bg_color
}
@@ -310,15 +308,16 @@ style "murrine-menu" {
bg[SELECTED] = @selected_bg_color
bg[NORMAL] = @menu_bg_color
bg[PRELIGHT] = @selected_bg_color
bg[ACTIVE] = @menu_bg_color
bg[INSENSITIVE] = @menu_bg_color
bg[ACTIVE] = @menu_bg_color
fg[NORMAL] = @menu_fg_color
fg[PRELIGHT] = @selected_fg_color
fg[SELECTED] = @selected_fg_color
fg[ACTIVE] = @selected_fg_color
fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
text[NORMAL] = @text_color
base[NORMAL] = @menu_fg_color
fg[ACTIVE] = @selected_fg_color
text[NORMAL] = @menu_fg_color
text[PRELIGHT] = @selected_fg_color
text[SELECTED] = @selected_fg_color
text[ACTIVE] = @selected_fg_color
@@ -332,7 +331,7 @@ style "murrine-menu" {
style "murrine-menu-item" = "murrine-wider" {
bg[SELECTED] = @selected_bg_color
bg[PRELIGHT] = @selected_bg_color
fg[NORMAL] = @text_color # Fix for XFCE menu text
fg[NORMAL] = @menu_fg_color # Fix for XFCE menu text
fg[PRELIGHT] = @selected_fg_color
fg[SELECTED] = @selected_fg_color
@@ -349,36 +348,36 @@ style "murrine-separator-menu-item" {
}
style "murrine-menubar" {
fg[NORMAL] = @menubar_fg_color
fg[PRELIGHT] = shade (1.08, @menubar_fg_color)
fg[SELECTED] = shade (1.08, @menubar_fg_color)
fg[ACTIVE] = @menubar_fg_color
fg[INSENSITIVE] = mix (0.5, @menubar_bg_color, @menubar_fg_color)
bg[NORMAL] = @menubar_bg_color
bg[PRELIGHT] = mix (0.21, @menubar_fg_color, @menubar_bg_color)
bg[SELECTED] = mix (0.21, @menubar_fg_color, @menubar_bg_color)
bg[INSENSITIVE] = @menubar_bg_color
bg[ACTIVE] = shade (0.9, @menubar_bg_color)
fg[NORMAL] = @menubar_fg_color
fg[PRELIGHT] = shade (1.08, @menubar_fg_color)
fg[SELECTED] = shade (1.08, @menubar_fg_color)
fg[INSENSITIVE] = mix (0.5, @menubar_bg_color, @menubar_fg_color)
fg[ACTIVE] = @menubar_fg_color
engine "murrine" {
roundness = 0
}
}
style "murrine-menubar-item" {
fg[NORMAL] = @menubar_fg_color
fg[PRELIGHT] = shade (1.08, @menubar_fg_color)
fg[SELECTED] = shade (1.08, @menubar_fg_color)
fg[ACTIVE] = @menubar_fg_color
fg[INSENSITIVE] = mix (0.5, @menubar_bg_color, @menubar_fg_color)
bg[NORMAL] = @menubar_bg_color
bg[PRELIGHT] = mix (0.21, @menubar_fg_color, @menubar_bg_color)
bg[SELECTED] = mix (0.21, @menubar_fg_color, @menubar_bg_color)
bg[INSENSITIVE] = @menubar_bg_color
bg[ACTIVE] = shade (0.9, @menubar_bg_color)
fg[NORMAL] = @menubar_fg_color
fg[PRELIGHT] = shade (1.08, @menubar_fg_color)
fg[SELECTED] = shade (1.08, @menubar_fg_color)
fg[INSENSITIVE] = mix (0.5, @menubar_bg_color, @menubar_fg_color)
fg[ACTIVE] = @menubar_fg_color
engine "murrine" {
roundness = 0
border_shades = { 0.8, 0.8 }
@@ -388,11 +387,6 @@ style "murrine-menubar-item" {
# Toolbars
style "murrine-toolbar" = "murrine-default" {
fg[NORMAL] = @toolbar_fg_color
fg[PRELIGHT] = @toolbar_fg_color
fg[SELECTED] = @selected_fg_color
fg[ACTIVE] = @toolbar_fg_color
fg[INSENSITIVE] = mix (0.5, @toolbar_bg_color, @toolbar_fg_color)
bg[NORMAL] = @toolbar_bg_color
bg[PRELIGHT] = shade (1.02, @toolbar_bg_color)
@@ -400,23 +394,29 @@ style "murrine-toolbar" = "murrine-default" {
bg[INSENSITIVE] = @toolbar_bg_color
bg[ACTIVE] = shade (0.9, @toolbar_bg_color)
fg[NORMAL] = @toolbar_fg_color
fg[PRELIGHT] = @toolbar_fg_color
fg[SELECTED] = @selected_fg_color
fg[INSENSITIVE] = mix (0.5, @toolbar_bg_color, @toolbar_fg_color)
fg[ACTIVE] = @toolbar_fg_color
engine "murrine" {
}
}
style "murrine-toolbutton" = "murrine-button" {
fg[NORMAL] = @toolbar_fg_color
fg[PRELIGHT] = @toolbar_fg_color
fg[SELECTED] = @selected_fg_color
fg[ACTIVE] = @toolbar_fg_color
fg[INSENSITIVE] = mix (0.5, @toolbar_bg_color, @toolbar_fg_color)
bg[NORMAL] = @toolbar_bg_color
bg[PRELIGHT] = shade (1.02, @toolbar_bg_color)
bg[SELECTED] = @selected_bg_color
bg[INSENSITIVE] = @toolbar_bg_color
bg[ACTIVE] = shade (0.9, @toolbar_bg_color)
fg[NORMAL] = @toolbar_fg_color
fg[PRELIGHT] = @toolbar_fg_color
fg[SELECTED] = @selected_fg_color
fg[INSENSITIVE] = mix (0.5, @toolbar_bg_color, @toolbar_fg_color)
fg[ACTIVE] = @toolbar_fg_color
engine "murrine" {
}
}
@@ -429,20 +429,29 @@ class "GtkHandleBox" style "murrine-toolbar"
style "murrine-panel" {
xthickness = 2
bg[NORMAL] = @bg_color
bg[PRELIGHT] = shade (1.1, @bg_color)
bg[ACTIVE] = shade (0.9, @bg_color)
bg[SELECTED] = shade (0.97, @bg_color)
bg[NORMAL] = @menubar_bg_color
bg[PRELIGHT] = mix (0.21, @menubar_fg_color, @menubar_bg_color)
bg[SELECTED] = mix (0.21, @menubar_fg_color, @menubar_bg_color)
bg[INSENSITIVE] = @menubar_bg_color
bg[ACTIVE] = shade (0.9, @menubar_bg_color)
fg[NORMAL] = @fg_color
fg[PRELIGHT] = @fg_color
fg[SELECTED] = @fg_color
fg[ACTIVE] = @fg_color
fg[NORMAL] = @menubar_fg_color
fg[PRELIGHT] = shade (1.08, @menubar_fg_color)
fg[SELECTED] = shade (1.08, @menubar_fg_color)
fg[INSENSITIVE] = mix (0.5, @menubar_bg_color, @menubar_fg_color)
fg[ACTIVE] = @menubar_fg_color
text[NORMAL] = @text_color
text[PRELIGHT] = @text_color
text[SELECTED] = @text_color
text[ACTIVE] = @text_color
base[NORMAL] = @menubar_bg_color
base[PRELIGHT] = mix (0.21, @menubar_fg_color, @menubar_bg_color)
base[SELECTED] = mix (0.21, @menubar_fg_color, @menubar_bg_color)
base[INSENSITIVE] = @menubar_bg_color
base[ACTIVE] = shade (0.9, @menubar_bg_color)
text[NORMAL] = @menubar_fg_color
text[PRELIGHT] = shade (1.08, @menubar_fg_color)
text[SELECTED] = shade (1.08, @menubar_fg_color)
text[INSENSITIVE] = mix (0.5, @menubar_bg_color, @menubar_fg_color)
text[ACTIVE] = @menubar_fg_color
engine "murrine" {
roundness = 0