Skip to content

Commit

Permalink
Added and refined CSD support
Browse files Browse the repository at this point in the history
  • Loading branch information
xyl0n committed Oct 26, 2013
1 parent 8697dc0 commit ca8c768
Show file tree
Hide file tree
Showing 13 changed files with 392 additions and 67 deletions.
30 changes: 15 additions & 15 deletions gtk-2.0/gtkrc
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ style "murrine-default" {
colorize_scrollbar = FALSE
comboboxstyle = 0 # 0 = normal combobox, 1 = colorized combobox below arrow
contrast = 0.8
focusstyle = 3 # 0 = none, 1 = grey dotted, 2 = colored with fill, 3 = colored glow
focusstyle = 2 # 0 = none, 1 = grey dotted, 2 = colored with fill, 3 = colored glow
glazestyle = 0 # 0 = flat highlight, 1 = curved highlight, 2 = concave, 3 = top curved highlight, 4 = beryl highlight
glowstyle = 0
gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
Expand All @@ -133,7 +133,7 @@ style "murrine-default" {
menustyle = 0 # 0 = none, 1 = vertical striped
progressbarstyle = 0 # 0 = none, 1 = diagonal striped, 2 = vertical striped
reliefstyle = 0 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
roundness = 2
roundness = 0
scrollbarstyle = 0 # 0 = none, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
sliderstyle = 0 # 0 = none, 1 = handles
stepperstyle = 0 # 0 = standard, 1 = integrated stepper handles
Expand Down Expand Up @@ -173,7 +173,7 @@ style "murrine-notebook" = "murrine-notebook-bg" {

# Various Standard Widgets

style "murrine-button" = "murrine-wider" {
style "button" {
bg[NORMAL] = shade (1.08, @bg_color)
bg[PRELIGHT] = shade (1.10, @bg_color)
bg[ACTIVE] = shade (0.95, @bg_color)
Expand Down Expand Up @@ -309,15 +309,15 @@ style "murrine-menu" {
xthickness = 0

bg[NORMAL] = @menu_bg_color
bg[PRELIGHT] = @selected_bg_color
bg[SELECTED] = @selected_bg_color
bg[PRELIGHT] = @menu_bg_color
bg[SELECTED] = @menu_bg_color
bg[ACTIVE] = @menu_bg_color
bg[INSENSITIVE] = @menu_bg_color

fg[NORMAL] = @menu_fg_color
fg[PRELIGHT] = @selected_fg_color
fg[SELECTED] = @selected_fg_color
fg[ACTIVE] = @selected_fg_color
fg[PRELIGHT] = @selected_bg_color
fg[SELECTED] = @selected_bg_color
fg[ACTIVE] = @selected_bg_color
fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)

text[NORMAL] = @menu_fg_color
Expand All @@ -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] = @menu_bg_color
bg[SELECTED] = @menu_bg_color
bg[ACTIVE] = @menu_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[PRELIGHT] = @selected_bg_color
fg[SELECTED] = @selected_bg_color
fg[ACTIVE] = @selected_bg_color
fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)

engine "murrine" {
Expand Down Expand Up @@ -621,7 +621,7 @@ widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "murrine-notebook-bg"
widget_class "*<GtkNotebook>*<GtkLayout>" style "murrine-notebook-bg"
widget_class "*.GtkNotebook.*.GtkViewport" style "murrine-notebook"

widget_class "*<GtkButton>" style "murrine-button"
widget_class "*<GtkButton>" style "button"
widget_class "*<GtkStatusbar>*" style "murrine-statusbar"
widget_class "*<GtkProgress>" style "murrine-progressbar"
widget_class "*<GtkProgressBar>" style "murrine-progressbar"
Expand Down
19 changes: 14 additions & 5 deletions gtk-3.0/apps/gnome-applications.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/***********************
* fallback mode panel *
***********************/
@define toolbar_bg_color @theme_bg_color

PanelWidget,
PanelApplet,
Expand Down Expand Up @@ -172,8 +171,17 @@ NautilusNotebook.notebook NautilusQueryEditor .primary-toolbar.toolbar:only-chil
TerminalScreen {
-TerminalScreen-background-darkness: 0.9;

background-color: @theme_bg_color;
color: @theme_fg_color;
background-color: @theme_dark_color;
color: @theme_dark_text;
}

TerminalWindow .menubar .menuitem {
color: @theme_dark_text;
}

TerminalWindow .menubar .menuitem:hover {
color: @theme_dark_selected;
background-color: @theme_dark_color;
}

TerminalWindow GtkNotebook.notebook {
Expand All @@ -190,7 +198,8 @@ TerminalWindow .scrollbar.trough {
TerminalWindow .scrollbar.button,
TerminalWindow .scrollbar.button:active,
TerminalWindow .scrollbar.button:active:hover {
color: shade(@menubar_bg_color, 0.6);
color: shade(#222, 0.85);
background-color: shade(#222, 0.85);
}

TerminalWindow .scrollbar.slider {
Expand Down Expand Up @@ -260,4 +269,4 @@ GeditFloatingSlider .not-found {
***********************/
CcShellItemView.view {
background-color: @theme_bg_color;
}
}
10 changes: 7 additions & 3 deletions gtk-3.0/apps/granite-widgets.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* dynamic notebook *
********************/
.dynamic-notebook {
background-color: shade(@theme_bg_color, 1.08);
background-color: shade(@theme_base_color, 1.0);
background-image: none;
}

Expand Down Expand Up @@ -47,6 +47,8 @@
padding: 4px 3px;
}

.dynami

.dynamic-notebook .button:hover,
.dynamic-notebook .button:hover:active,
.dynamic-notebook .notebook .button,
Expand All @@ -55,12 +57,14 @@
border-color: shade(@theme_bg_color, 0.7);
background-color: shade(@theme_bg_color, 1.10);
background-image: none;
icon-shadow: none;
}

.dynamic-notebook .button:hover:active,
.dynamic-notebook .notebook .button:hover:active {
border-color: shade(@theme_bg_color, 0.7);
color: shade(@theme_fg_color, 0.7);
icon-shadow: none;
}

/****************
Expand Down Expand Up @@ -145,7 +149,7 @@
.source-list.view {
border-radius: 0;
border-color: @theme_bg_color;
background-color: shade(@button_bg_color, 1.25); /*shade(@theme_bg_color, 1.10);*/
background-color: shade(@button_bg_color, 1.10); /*shade(@theme_bg_color, 1.10);*/
color: @theme_selected_fg_color;/*mix(@theme_fg_color, @theme_bg_color, 0.1);*/
}

Expand Down Expand Up @@ -385,7 +389,7 @@ GraniteWidgetsPopOver *.separator {
********/

.panel {
background-color: alpha (#000, 0.7);
background-color: @panel_bg_color;
color: #fff;
font-weight: bold;
}
Expand Down
82 changes: 82 additions & 0 deletions gtk-3.0/gtk-dark.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
/* Default color scheme */
@define-color bg_color #333333;
@define-color fg_color #f0f0f0;
@define-color base_color #333333; /*Same as bg color for consistency in asthetics*/
@define-color text_color #f1f1f1;
@define-color selected_bg_color #df253f;
@define-color selected_fg_color #ffffff;
@define-color tooltip_bg_color #2d2d2d;
@define-color tooltip_fg_color #ffffff;

/* colormap actually used by the theme, to be overridden in other css files */
@define-color theme_bg_color @bg_color;
@define-color theme_fg_color @fg_color;
@define-color theme_base_color @base_color;
@define-color theme_text_color @text_color;
@define-color theme_selected_bg_color @selected_bg_color;
@define-color theme_selected_fg_color @selected_fg_color;
@define-color theme_tooltip_bg_color @tooltip_bg_color;
@define-color theme_tooltip_fg_color @tooltip_fg_color;

/* shadow effects */
@define-color light_shadow #000000;
@define-color dark_shadow #ffffff;

/* misc colors used by gtk+ */
@define-color info_fg_color rgb (50, 50, 50);
@define-color info_bg_color rgb (252, 252, 252);
@define-color warning_fg_color rgb (0, 0, 0);
@define-color warning_bg_color rgb (250, 173, 61);
@define-color question_fg_color rgb (255, 255, 255);
@define-color question_bg_color rgb (214, 73, 55);
@define-color error_fg_color rgb (255, 255, 255);
@define-color error_bg_color rgb (237, 54, 54);
@define-color link_color #fc6f5d;
@define-color success_color #4e9a06;
@define-color error_color #cc0000;

/* widget colors */
@define-color button_bg_color #464646;
@define-color menubar_bg_color shade(@button_bg_color, 1.15);
@define-color menubar_fg_color @theme_text_color;
@define-color toolbar_bg_color shade(@button_bg_color, 1.15);
@define-color toolbar_fg_color @theme_text_color;
@define-color menu_bg_color shade(@button_bg_color, 1.15);
@define-color menu_fg_color @theme_text_color;
@define-color panel_bg_color alpha(#000, 0.5);
@define-color panel_fg_color #f2f2f2;
@define-color menu_item_selected shade(#d64937, 1.05);

@define-color plum #ae1253;

/* osd */
@define-color osd_base #ffffff;
@define-color osd_fg #2d2d2d;
@define-color osd_bg alpha(@osd_base, 0.8);

/* window manager colors */
@define-color wm_bg @theme_bg_color;
@define-color wm_title_focused #f9f9f9;
@define-color wm_title_unfocused #888888;
@define-color wm_border_focused @theme_bg_color;
@define-color wm_border_unfocused #333333;

@import url("gtk-widgets.css");
@import url("gtk-widgets-assets.css");
@import url("apps/gnome-applications.css");
@import url("apps/granite-widgets.css");
@import url("apps/unity.css");
@import url("widgets/button.css");
@import url("widgets/entry.css");
@import url("widgets/assistant.css");
@import url("widgets/cell-row.css");
@import url("widgets/column-header.css");
@import url("widgets/calendar.css");
@import url("widgets/toolbar.css");
@import url("widgets/infobar.css");
@import url("widgets/menu.css");
@import url("widgets/notebook.css");
@import url("widgets/scrollbar.css");
@import url("widgets/progress-scale.css");
@import url("widgets/sidebar.css");
@import url("widgets/spinbutton.css");
Loading

0 comments on commit ca8c768

Please sign in to comment.