From 1aec35117619bef64fc74b53594018e46e805f9e Mon Sep 17 00:00:00 2001 From: bionel Date: Tue, 4 Aug 2015 16:55:48 +0300 Subject: fixed entry, sidepanel improved, fixed terminal and some others --- Kogaion-daylight/gtk-2.0/apps/terminal.rc | 29 +++--------- Kogaion-daylight/gtk-2.0/apps/thunar.rc | 6 +-- Kogaion-daylight/gtk-2.0/gtkrc | 75 +++++------------------------- Kogaion-nighttime/gtk-2.0/apps/terminal.rc | 30 +++--------- Kogaion-nighttime/gtk-2.0/apps/thunar.rc | 6 +-- Kogaion-nighttime/gtk-2.0/gtkrc | 75 +++++------------------------- 6 files changed, 42 insertions(+), 179 deletions(-) diff --git a/Kogaion-daylight/gtk-2.0/apps/terminal.rc b/Kogaion-daylight/gtk-2.0/apps/terminal.rc index aa48c5f..204adec 100755 --- a/Kogaion-daylight/gtk-2.0/apps/terminal.rc +++ b/Kogaion-daylight/gtk-2.0/apps/terminal.rc @@ -1,39 +1,23 @@ style "terminal" { - bg[NORMAL] = @bg_color - bg[ACTIVE] = @bg_color + bg[NORMAL] = @bg_color + bg[ACTIVE] = @bg_color bg[PRELIGHT] = @bg_color bg[SELECTED] = @bg_color base[NORMAL] = @bg_color } -style "terminal-scrollbar" = "scrollbar" -{ - -} - style "terminal-notebook" { - bg[NORMAL] = shade( 0.85, @sidebar_background) - bg[ACTIVE] = shade( 0.70, @sidebar_background) - fg[NORMAL] = shade (0.80, @text_color) # text selected tab - fg[ACTIVE] = shade( 0.28, @sidebar_background) # text unselected tab + bg[NORMAL] = darker(@window_active_color) # bg selected tab + bg[ACTIVE] = @window_active_color + fg[NORMAL] = @bg_color # text selected tab + fg[ACTIVE] = @fg_color engine "murrine" { - gradient_shades = {1.00,0.96,0.92,0.88} - highlight_shade = 1.03 - roundness = 0 contrast = 0.0 - - ## things that don't work: - #glow_shade = 0.8 - #glowstyle = 2 - #focusstyle = 3 - #glazestyle = 3 - #border_shades = { 0.45, 2.5 } - #prelight_shade = 1.5 } } @@ -54,6 +38,5 @@ class "*TerminalWindow" style "terminal" widget_class "TerminalWindow*GtkNotebook" style "terminal-notebook" widget_class "TerminalWindow**" style "terminal-notebook" widget_class "TerminalWindow**" style "notebook-button" -# widget "*TerminalWindow.*.GtkVScrollbar" style "terminal-scrollbar" diff --git a/Kogaion-daylight/gtk-2.0/apps/thunar.rc b/Kogaion-daylight/gtk-2.0/apps/thunar.rc index 8e6ef55..8246c51 100755 --- a/Kogaion-daylight/gtk-2.0/apps/thunar.rc +++ b/Kogaion-daylight/gtk-2.0/apps/thunar.rc @@ -13,14 +13,14 @@ class "ThunarLocationButtons" style "thunar-location-buttons" style "sidepane" { - base[NORMAL] = @sidebar_background # backgroung - bg[NORMAL] = shade (0.91, @base_color) + base[NORMAL] = mix (0.5, @bg_color, @sidebar_background) # backgroung + bg[NORMAL] = shade (0.91, @base_color) bg[PRELIGHT] = @fg_color engine "murrine" { # gradient_shades = {1.00, 1.05, 1.05, 1.10} - contrast = 0.80 + contrast = 0.80 } } diff --git a/Kogaion-daylight/gtk-2.0/gtkrc b/Kogaion-daylight/gtk-2.0/gtkrc index 1bbbee7..9f3efb0 100755 --- a/Kogaion-daylight/gtk-2.0/gtkrc +++ b/Kogaion-daylight/gtk-2.0/gtkrc @@ -3,7 +3,7 @@ gtk-color-scheme = "text_color:#2e3436\nfg_color:#2e3436" gtk-color-scheme = "selected_bg_color:#0096ff\nselected_fg_color:#ffffff" gtk-color-scheme = "tooltip_bg_color:#d2e4f8\ntooltip_fg_color:#2e3436\nlink_color:#4a90f9" gtk-color-scheme = "theme_bg_color:#f4f4f4\nbutton_base:#f4f4f4" -gtk-color-scheme = "sidebar_background:#ffffff" +gtk-color-scheme = "sidebar_background:#a3b5d9" gtk_color_scheme = "window_active_color:#a3b5d9" #Windows decorations gtk_color_scheme = "test1:#ff0000\ntest2:#00ff00" #debug colors @@ -119,11 +119,11 @@ style "default" { # arrowstyle = 2 to draw fat filled arrows. colorize_scrollbar = TRUE contrast = 0.7 - #default_button_color = shade (0.88, @base_color) + # default_button_color = shade (0.88, @base_color) expanderstyle = 0 # expanderstyle = 0 to draw arrows. # expanderstyle = 1 to draw circles with plus and minus. # expanderstyle = 2 to draw buttons with plus and minus. - focusstyle = 3 # 0 to disable focus drawing. + focusstyle = 0 # 0 to disable focus drawing. # 1 to use dots. # 2 to use a small colored rectangle. # 3 to use a colored rectangle that touches the borders. @@ -248,43 +248,16 @@ style "button_label" { fg[ACTIVE] = @selected_fg_color } # Force text color on radiobutton-eclipse style "checkradio_label" { fg[ACTIVE] = @fg_color } -style "entry-1" { # text - xthickness = 2 - ythickness = 2 - - bg[SELECTED] = mix (0.4, @selected_bg_color, @base_color) - fg[SELECTED] = @text_color - - engine "murrine" { - #border_shades = {1.9, 0.8} - contrast = 1.00 - roundness = 0 - focusstyle = 2 - lightborderstyle = 1 - lightborder_shade = 1.90 - } -} - style "entry" { - xthickness = 2 - ythickness = 2 + xthickness = 3 + ythickness = 3 - GtkWidget ::focus-line-width = 1 - GtkWidget ::focus-padding = 1 +# bg[NORMAL] = @window_active_color -# bg[ACTIVE] = @test2 - bg[NORMAL] = @base_color -# bg[PRELIGHT] = shade (1.00, @selected_bg_color) -# bg[SELECTED] = shade (1.20, @selected_bg_color) -# bg[INSENSITIVE] = @test2 - engine "murrine" { - contrast = 0.7 - border_shades = {1.0, 1.0} - lightborderstyle = 1 -# lightborder_shade = 1.65 - reliefstyle = 0 - roundness = 0 + contrast = 0.65 + focusstyle = 3 + focus_color = @selected_bg_color } } @@ -396,31 +369,8 @@ style "notebook" { fg[ACTIVE] = shade (1.05, @fg_color) # text unselected tab fg[INSENSITIVE] = shade (1.10, @fg_color) - engine "murrine" { -# gradient_shades = {1.0,1.0,1.0,1.0} - contrast = 1.2 -# highlight_shade = 1.05 - roundness = 1 - focusstyle = 0 - reliefstyle = 0 # 0 = flat, 1 = inset, 2 = shadow - # 3 = shadow with gradient, 4 = stronger shadow with gradient - } -} - -style "notebook-background" { - xthickness = 2 - ythickness = 2 - - bg[ACTIVE] = shade (1.05, @window_active_color) # unselected tab - - fg[NORMAL] = @text_color - fg[ACTIVE] = @text_color - fg[INSENSITIVE] = @fg_color - - engine "murrine" { - gradient_shades = {0.90,0.98,0.92,0.90} - contrast = 1.0 - roundness = 1 + engine "murrine" { + contrast = 1.3 } } @@ -641,8 +591,7 @@ style "treeview_header" { textstyle = 1 text_shade = 0.7 glow_shade = 1.0 - prelight_shade = 1.9 - focusstyle = 0 + prelight_shade = 1.9 } } diff --git a/Kogaion-nighttime/gtk-2.0/apps/terminal.rc b/Kogaion-nighttime/gtk-2.0/apps/terminal.rc index aa48c5f..609aab5 100755 --- a/Kogaion-nighttime/gtk-2.0/apps/terminal.rc +++ b/Kogaion-nighttime/gtk-2.0/apps/terminal.rc @@ -1,39 +1,23 @@ style "terminal" { - bg[NORMAL] = @bg_color - bg[ACTIVE] = @bg_color + bg[NORMAL] = @bg_color + bg[ACTIVE] = @bg_color bg[PRELIGHT] = @bg_color bg[SELECTED] = @bg_color base[NORMAL] = @bg_color } -style "terminal-scrollbar" = "scrollbar" -{ - -} - style "terminal-notebook" { - bg[NORMAL] = shade( 0.85, @sidebar_background) - bg[ACTIVE] = shade( 0.70, @sidebar_background) - fg[NORMAL] = shade (0.80, @text_color) # text selected tab - fg[ACTIVE] = shade( 0.28, @sidebar_background) # text unselected tab + bg[NORMAL] = darker(@window_active_color) # bg selected tab + bg[ACTIVE] = @window_active_color + fg[NORMAL] = @fg_color # text selected tab + fg[ACTIVE] = @bg_color engine "murrine" { - gradient_shades = {1.00,0.96,0.92,0.88} - highlight_shade = 1.03 - roundness = 0 contrast = 0.0 - - ## things that don't work: - #glow_shade = 0.8 - #glowstyle = 2 - #focusstyle = 3 - #glazestyle = 3 - #border_shades = { 0.45, 2.5 } - #prelight_shade = 1.5 } } @@ -54,6 +38,4 @@ class "*TerminalWindow" style "terminal" widget_class "TerminalWindow*GtkNotebook" style "terminal-notebook" widget_class "TerminalWindow**" style "terminal-notebook" widget_class "TerminalWindow**" style "notebook-button" -# widget "*TerminalWindow.*.GtkVScrollbar" style "terminal-scrollbar" - diff --git a/Kogaion-nighttime/gtk-2.0/apps/thunar.rc b/Kogaion-nighttime/gtk-2.0/apps/thunar.rc index 8e6ef55..33df678 100755 --- a/Kogaion-nighttime/gtk-2.0/apps/thunar.rc +++ b/Kogaion-nighttime/gtk-2.0/apps/thunar.rc @@ -13,14 +13,14 @@ class "ThunarLocationButtons" style "thunar-location-buttons" style "sidepane" { - base[NORMAL] = @sidebar_background # backgroung - bg[NORMAL] = shade (0.91, @base_color) + base[NORMAL] = mix (0.5, @sidebar_background, @bg_color) # backgroung + bg[NORMAL] = shade (0.91, @base_color) bg[PRELIGHT] = @fg_color engine "murrine" { # gradient_shades = {1.00, 1.05, 1.05, 1.10} - contrast = 0.80 + contrast = 0.80 } } diff --git a/Kogaion-nighttime/gtk-2.0/gtkrc b/Kogaion-nighttime/gtk-2.0/gtkrc index ea03523..492fbd1 100755 --- a/Kogaion-nighttime/gtk-2.0/gtkrc +++ b/Kogaion-nighttime/gtk-2.0/gtkrc @@ -3,7 +3,7 @@ gtk-color-scheme = "text_color:#d4d4d4\nfg_color:#bababa" gtk-color-scheme = "selected_bg_color:#496490\nselected_fg_color:#f3f3f3" gtk-color-scheme = "tooltip_bg_color:#303030\ntooltip_fg_color:#ffffff\nlink_color:#4a90f9" gtk-color-scheme = "theme_bg_color:#2e2e2e\nbutton_base:#2e2e2e" -gtk-color-scheme = "sidebar_background:#313233" +gtk-color-scheme = "sidebar_background:#496490" gtk_color_scheme = "window_active_color:#496490" #Windows decorations gtk_color_scheme = "test1:#ff0000\ntest2:#00ff00" #debug colors @@ -123,11 +123,11 @@ style "default" { expanderstyle = 0 # expanderstyle = 0 to draw arrows. # expanderstyle = 1 to draw circles with plus and minus. # expanderstyle = 2 to draw buttons with plus and minus. - focusstyle = 3 # 0 to disable focus drawing. + focusstyle = 0 # 0 to disable focus drawing. # 1 to use dots. # 2 to use a small colored rectangle. # 3 to use a colored rectangle that touches the borders. - focus_color = shade (0.9, @selected_bg_color) + focus_color = shade (0.7, @selected_bg_color) glazestyle = 0 # 0 = flat highlight, # 1 = curved highlight # 2 = concave style, @@ -182,7 +182,7 @@ style "default" { trough_shades = {0.85, 1.0} #added for testing - border_colors = { shade (0.5, @fg_color) , shade (0.5, @fg_color) } + border_colors = { shade (0.45, @fg_color) , shade (0.45, @fg_color) } } } @@ -248,43 +248,16 @@ style "button_label" { fg[ACTIVE] = @selected_fg_color } # Force text color on radiobutton-eclipse style "checkradio_label" { fg[ACTIVE] = @fg_color } -style "entry-1" { # text - xthickness = 2 - ythickness = 2 - - bg[SELECTED] = mix (0.4, @selected_bg_color, @base_color) - fg[SELECTED] = @text_color - - engine "murrine" { - #border_shades = {1.9, 0.8} - contrast = 1.00 - roundness = 0 - focusstyle = 2 - lightborderstyle = 1 - lightborder_shade = 1.90 - } -} - style "entry" { - xthickness = 2 - ythickness = 2 + xthickness = 3 + ythickness = 3 - GtkWidget ::focus-line-width = 1 - GtkWidget ::focus-padding = 1 +# bg[NORMAL] = @window_active_color -# bg[ACTIVE] = @bg_color - bg[NORMAL] = @base_color -# bg[PRELIGHT] = shade (1.13, @selected_bg_color) -# bg[SELECTED] = shade (1.08, @selected_bg_color) -# bg[INSENSITIVE] = @bg_color - engine "murrine" { - contrast = 0.7 - border_shades = {1.0, 1.0} - lightborderstyle = 1 -# lightborder_shade = 1.65 - reliefstyle = 0 - roundness = 0 + contrast = 0.65 + focusstyle = 3 + focus_color = @selected_bg_color } } @@ -396,31 +369,8 @@ style "notebook" { fg[ACTIVE] = shade (0.95, @fg_color) # text unselected tab fg[INSENSITIVE] = shade (0.90, @fg_color) - engine "murrine" { -# gradient_shades = {1.0,1.0,1.0,1.0} - contrast = 0.8 -# highlight_shade = 0.95 - roundness = 1 - focusstyle = 0 - reliefstyle = 0 # 0 = flat, 1 = inset, 2 = shadow - # 3 = shadow with gradient, 4 = stronger shadow with gradient - } -} - -style "notebook-background" { - xthickness = 2 - ythickness = 2 - - bg[ACTIVE] = shade (0.95, @window_active_color) # unselected tab - - fg[NORMAL] = @text_color - fg[ACTIVE] = @text_color - fg[INSENSITIVE] = @fg_color - - engine "murrine" { - gradient_shades = {0.90,0.98,0.92,0.90} - contrast = 1.0 - roundness = 1 + engine "murrine" { + contrast = 0.7 } } @@ -642,7 +592,6 @@ style "treeview_header" { text_shade = 0.7 glow_shade = 1.0 prelight_shade = 1.9 - focusstyle = 0 } } -- cgit v1.2.3