Merge eff27ebdba
into a3d6042312
commit
a596dce312
gtk-2.0
|
@ -0,0 +1,3 @@
|
|||
Joern Konopka <cldx3000@googlemail.com>
|
||||
Georgi Karavasilev <motorslav@gmail.com>
|
||||
David Barr <dpbarr@gmail.com>
|
|
@ -210,8 +210,8 @@ style "murrine-scale" = "murrine-default" {
|
|||
|
||||
bg[NORMAL] = @bg_color
|
||||
bg[ACTIVE] = @bg_color
|
||||
bg[SELECTED] = @selected_bg_color
|
||||
bg[INSENSITIVE] = shade (0.95, @bg_color)
|
||||
bg[SELECTED] = @selected_bg_color
|
||||
bg[INSENSITIVE] = shade (0.95, @bg_color)
|
||||
|
||||
engine "murrine" {
|
||||
roundness = 7
|
||||
|
@ -332,14 +332,14 @@ style "murrine-menu" {
|
|||
}
|
||||
|
||||
style "murrine-menu-item" = "murrine-wider" {
|
||||
bg[PRELIGHT] = @selected_bg_color
|
||||
bg[SELECTED] = @selected_bg_color
|
||||
bg[ACTIVE] = @selected_bg_color
|
||||
bg[PRELIGHT] = @selected_bg_color
|
||||
bg[SELECTED] = @selected_bg_color
|
||||
bg[ACTIVE] = @selected_bg_color
|
||||
|
||||
fg[NORMAL] = @menu_fg_color # Fix for XFCE menu text
|
||||
fg[PRELIGHT] = @selected_fg_color
|
||||
fg[SELECTED] = @selected_fg_color
|
||||
fg[ACTIVE] = @selected_fg_color
|
||||
fg[NORMAL] = @menu_fg_color # Fix for XFCE menu text
|
||||
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)
|
||||
|
||||
engine "murrine" {
|
||||
|
@ -436,7 +436,8 @@ class "GtkHandleBox" style "murrine-toolbar"
|
|||
# Panels
|
||||
|
||||
style "murrine-panel" {
|
||||
xthickness = 2
|
||||
xthickness = 1
|
||||
ythickness = 1
|
||||
|
||||
bg[NORMAL] = @panel_bg_color
|
||||
bg[PRELIGHT] = mix (0.21, @panel_fg_color, @panel_bg_color)
|
||||
|
@ -501,12 +502,12 @@ widget "*gimmie*" style "bold-panel-item"
|
|||
# XFCE Styles
|
||||
|
||||
style "workspace-switcher" = "murrine-panel" {
|
||||
bg[SELECTED] = @selected_bg_color
|
||||
bg[SELECTED] = @selected_bg_color
|
||||
}
|
||||
|
||||
style "xfce-header" {
|
||||
bg[NORMAL] = shade (0.9, @bg_color)
|
||||
base[NORMAL] = shade (1.18, @bg_color)
|
||||
bg[NORMAL] = shade (0.9, @bg_color)
|
||||
base[NORMAL] = shade (1.18, @bg_color)
|
||||
}
|
||||
|
||||
style "xfdesktop-windowlist" {
|
||||
|
@ -516,30 +517,26 @@ style "xfdesktop-windowlist" {
|
|||
}
|
||||
|
||||
style "xfdesktop-icon-view" {
|
||||
font_name = "normal"
|
||||
XfdesktopIconView::label-alpha = 90
|
||||
XfdesktopIconView::selected-label-alpha = 90
|
||||
XfdesktopIconView::shadow-color = shade (1.05, @panel_bg_color)
|
||||
XfdesktopIconView::selected-shadow-color = @panel_bg_color
|
||||
XfdesktopIconView::shadow-x-offset = -1
|
||||
XfdesktopIconView::selected-shadow-x-offset = -1
|
||||
XfdesktopIconView::shadow-y-offset = -1
|
||||
XfdesktopIconView::selected-shadow-y-offset = -1
|
||||
XfdesktopIconView::label-alpha = 0
|
||||
XfdesktopIconView::selected-label-alpha = 60
|
||||
XfdesktopIconVIew::ellipsize-icon-labels = 1
|
||||
|
||||
base[NORMAL] = @panel_bg_color
|
||||
base[NORMAL] = @selected_bg_color
|
||||
base[SELECTED] = @selected_bg_color
|
||||
base[ACTIVE] = @selected_bg_color
|
||||
|
||||
fg[NORMAL] = @panel_fg_color
|
||||
fg[NORMAL] = @selected_fg_color
|
||||
fg[SELECTED] = @selected_fg_color
|
||||
fg[ACTIVE] = @selected_fg_color
|
||||
|
||||
engine "murrine" {
|
||||
textstyle = 0
|
||||
textstyle = 5
|
||||
text_shade = 0.05
|
||||
}
|
||||
}
|
||||
|
||||
style "xfwm-tabwin" {
|
||||
Xfwm4TabwinWidget::border-width = 1
|
||||
Xfwm4TabwinWidget::border-width = 0
|
||||
Xfwm4TabwinWidget::icon-size = 64
|
||||
|
||||
engine "murrine" {
|
||||
|
@ -550,7 +547,7 @@ style "xfwm-tabwin" {
|
|||
style "xfsm-logout" {
|
||||
|
||||
engine "murrine" {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
widget "*WnckPager*" style "workspace-switcher"
|
||||
|
@ -690,8 +687,8 @@ widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" st
|
|||
|
||||
style "inkscape-toolbar-fix" {
|
||||
engine "murrine" {
|
||||
gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
|
||||
highlight_shade = 1.0
|
||||
gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
|
||||
highlight_shade = 1.0
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +0,0 @@
|
|||
#define bullet_width 4
|
||||
#define bullet_height 8
|
||||
static unsigned char bullet_bits[] = {
|
||||
0x00, 0x00, 0x01, 0x03, 0x07, 0x03, 0x01, 0x00 };
|
|
@ -1,4 +1,4 @@
|
|||
#define desk_width 8
|
||||
#define desk_height 8
|
||||
static unsigned char desk_bits[] = {
|
||||
0x04, 0x0e, 0x3f, 0x1e, 0x1c, 0x24, 0x40, 0x00 };
|
||||
#define desk_toggled_width 8
|
||||
#define desk_toggled_height 8
|
||||
static unsigned char desk_toggled_bits[] = {
|
||||
0xe7, 0xe7, 0xe7, 0x00, 0x00, 0xe7, 0xe7, 0xe7 };
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#define desk_toggled_width 8
|
||||
#define desk_toggled_height 8
|
||||
static unsigned char desk_toggled_bits[] = {
|
||||
0xe7, 0xe7, 0xe7, 0x00, 0x00, 0xe7, 0xe7, 0xe7 };
|
||||
#define desk_width 8
|
||||
#define desk_height 8
|
||||
static unsigned char desk_bits[] = {
|
||||
0x04, 0x0e, 0x3f, 0x1e, 0x1c, 0x24, 0x40, 0x80 };
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#define max_toggled_width 8
|
||||
#define max_toggled_height 8
|
||||
static unsigned char max_toggled_bits[] = {
|
||||
0xff, 0xff, 0xc3, 0xc3, 0xc3, 0xff, 0xff, 0x00 };
|
||||
0xff, 0xff, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0xff };
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#define shade_width 8
|
||||
#define shade_height 8
|
||||
static unsigned char shade_bits[] = {
|
||||
0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
|
||||
0x18, 0x3c, 0x7e, 0xff, 0x18, 0x18, 0x18, 0x18 };
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#define shade_toggled_width 8
|
||||
#define shade_toggled_height 8
|
||||
static unsigned char shade_toggled_bits[] = {
|
||||
0xff, 0xff, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x00 };
|
||||
0x18, 0x18, 0x18, 0x18, 0xff, 0x7e, 0x3c, 0x18 };
|
||||
|
|
|
@ -88,32 +88,34 @@ window.inactive.button.disabled.image.color: #888888
|
|||
|
||||
# OSD
|
||||
osd.border.width: 1
|
||||
osd.border.color: #a5a5a5
|
||||
osd.border.color: #2d2d2d
|
||||
|
||||
osd.bg: flat solid
|
||||
osd.bg.color: #dedede
|
||||
|
||||
osd.label.bg: flat solid
|
||||
osd.label.bg.color: #dedede
|
||||
osd.label.text.color: #222
|
||||
osd.label.text.color: #555555
|
||||
|
||||
osd.hilight.bg: flat solid
|
||||
osd.hilight.bg.color: #d64937
|
||||
|
||||
osd.unhilight.bg: flat solid
|
||||
osd.unhilight.bg.color: #dedede
|
||||
osd.unhilight.bg.color: #888888
|
||||
|
||||
osd.button.unpressed.text.color: #222
|
||||
osd.button.pressed.text.color: #222
|
||||
osd.button.focused.text.color #222
|
||||
osd.button.unpressed.bg: flat border
|
||||
osd.button.unpressed.bg.color: #f0f0f0
|
||||
osd.button.unpressed.*.border.color: #b2b2b2
|
||||
|
||||
osd.button.pressed.box.color: #D3D3D4
|
||||
osd.button.focused.box.color: #bbb
|
||||
osd.button.pressed.bg: flat border
|
||||
osd.button.pressed.bg.color: #d3d3d3
|
||||
osd.button.pressed.*.border.color: #b2b2b2
|
||||
|
||||
osd.button.*.bg: flat border
|
||||
osd.button.pressed.bg: sunken solid
|
||||
osd.button.*.bg.color: #f0f0f0
|
||||
osd.button.*.border.color: #b2b2b2
|
||||
osd.button.focused.bg: flat solid border
|
||||
osd.button.focused.bg.color: #f0f0f0
|
||||
osd.button.focused.*.border.color: #9c9c9c
|
||||
|
||||
osd.button.focused.box.color: #d64937
|
||||
|
||||
|
||||
# Fonts
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* XPM */
|
||||
static char * title_1_active_xpm[] = {
|
||||
"1 21 3 1",
|
||||
"1 25 3 1",
|
||||
" c None",
|
||||
". c #484848",
|
||||
"+ c #2D2D2D",
|
||||
|
@ -24,4 +24,8 @@ static char * title_1_active_xpm[] = {
|
|||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+"};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* XPM */
|
||||
static char * title_1_inactive_xpm[] = {
|
||||
"1 21 3 1",
|
||||
"1 25 3 1",
|
||||
" c None",
|
||||
". c #393939",
|
||||
"+ c #2D2D2D",
|
||||
|
@ -24,4 +24,8 @@ static char * title_1_inactive_xpm[] = {
|
|||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+"};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* XPM */
|
||||
static char * title_2_active_xpm[] = {
|
||||
"1 21 3 1",
|
||||
"1 25 3 1",
|
||||
" c None",
|
||||
". c #484848",
|
||||
"+ c #2D2D2D",
|
||||
|
@ -24,4 +24,8 @@ static char * title_2_active_xpm[] = {
|
|||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+"};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* XPM */
|
||||
static char * title_2_inactive_xpm[] = {
|
||||
"1 21 3 1",
|
||||
"1 25 3 1",
|
||||
" c None",
|
||||
". c #393939",
|
||||
"+ c #2D2D2D",
|
||||
|
@ -24,4 +24,8 @@ static char * title_2_inactive_xpm[] = {
|
|||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+"};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* XPM */
|
||||
static char * title_3_active_xpm[] = {
|
||||
"1 21 3 1",
|
||||
"1 25 3 1",
|
||||
" c None",
|
||||
". c #484848",
|
||||
"+ c #2D2D2D",
|
||||
|
@ -24,4 +24,8 @@ static char * title_3_active_xpm[] = {
|
|||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+"};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* XPM */
|
||||
static char * title_3_inactive_xpm[] = {
|
||||
"1 21 3 1",
|
||||
"1 25 3 1",
|
||||
" c None",
|
||||
". c #393939",
|
||||
"+ c #2D2D2D",
|
||||
|
@ -24,4 +24,8 @@ static char * title_3_inactive_xpm[] = {
|
|||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+"};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* XPM */
|
||||
static char * title_4_active_xpm[] = {
|
||||
"1 21 3 1",
|
||||
"1 25 3 1",
|
||||
" c None",
|
||||
". c #484848",
|
||||
"+ c #2D2D2D",
|
||||
|
@ -24,4 +24,8 @@ static char * title_4_active_xpm[] = {
|
|||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+"};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* XPM */
|
||||
static char * title_4_inactive_xpm[] = {
|
||||
"1 21 3 1",
|
||||
"1 25 3 1",
|
||||
" c None",
|
||||
". c #393939",
|
||||
"+ c #2D2D2D",
|
||||
|
@ -24,4 +24,8 @@ static char * title_4_inactive_xpm[] = {
|
|||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+"};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* XPM */
|
||||
static char * title_5_active_xpm[] = {
|
||||
"1 21 3 1",
|
||||
"1 25 3 1",
|
||||
" c None",
|
||||
". c #484848",
|
||||
"+ c #2D2D2D",
|
||||
|
@ -24,4 +24,8 @@ static char * title_5_active_xpm[] = {
|
|||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+"};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* XPM */
|
||||
static char * title_5_inactive_xpm[] = {
|
||||
"1 21 3 1",
|
||||
"1 25 3 1",
|
||||
" c None",
|
||||
". c #393939",
|
||||
"+ c #2D2D2D",
|
||||
|
@ -24,4 +24,8 @@ static char * title_5_inactive_xpm[] = {
|
|||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+",
|
||||
"+"};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* XPM */
|
||||
static char * top_left_active_xpm[] = {
|
||||
"2 21 3 1",
|
||||
"2 25 3 1",
|
||||
" c None",
|
||||
". c #484848",
|
||||
"+ c #2D2D2D",
|
||||
|
@ -24,4 +24,8 @@ static char * top_left_active_xpm[] = {
|
|||
".+",
|
||||
".+",
|
||||
".+",
|
||||
".+",
|
||||
".+",
|
||||
".+",
|
||||
".+",
|
||||
".+"};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* XPM */
|
||||
static char * top_left_inactive_xpm[] = {
|
||||
"2 21 3 1",
|
||||
"2 25 3 1",
|
||||
" c None",
|
||||
". c #393939",
|
||||
"+ c #2D2D2D",
|
||||
|
@ -24,4 +24,8 @@ static char * top_left_inactive_xpm[] = {
|
|||
".+",
|
||||
".+",
|
||||
".+",
|
||||
".+",
|
||||
".+",
|
||||
".+",
|
||||
".+",
|
||||
".+"};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* XPM */
|
||||
static char * top_right_active_xpm[] = {
|
||||
"2 21 3 1",
|
||||
"2 25 3 1",
|
||||
" c None",
|
||||
". c #484848",
|
||||
"+ c #2D2D2D",
|
||||
|
@ -24,4 +24,8 @@ static char * top_right_active_xpm[] = {
|
|||
"+.",
|
||||
"+.",
|
||||
"+.",
|
||||
"+.",
|
||||
"+.",
|
||||
"+.",
|
||||
"+.",
|
||||
"+."};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* XPM */
|
||||
static char * top_right_inactive_xpm[] = {
|
||||
"2 21 3 1",
|
||||
"2 25 3 1",
|
||||
" c None",
|
||||
". c #393939",
|
||||
"+ c #2D2D2D",
|
||||
|
@ -24,4 +24,8 @@ static char * top_right_inactive_xpm[] = {
|
|||
"+.",
|
||||
"+.",
|
||||
"+.",
|
||||
"+.",
|
||||
"+.",
|
||||
"+.",
|
||||
"+.",
|
||||
"+."};
|
||||
|
|
Loading…
Reference in New Issue