From 1975e4bf9a44e1919e34272e14d6cc93df96594b Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Thu, 7 Mar 2013 19:04:42 +0530 Subject: [PATCH] Fixes for the toolbar --- gtk-2.0/gtkrc | 107 +++++++++++++++------------- gtk-3.0/apps/gnome-applications.css | 8 +-- gtk-3.0/gtk-widgets.css | 46 +++++++++++- 3 files changed, 107 insertions(+), 54 deletions(-) diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc index 56ba4c4..979224f 100644 --- a/gtk-2.0/gtkrc +++ b/gtk-2.0/gtkrc @@ -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 diff --git a/gtk-3.0/apps/gnome-applications.css b/gtk-3.0/apps/gnome-applications.css index 88aaf82..7a13694 100644 --- a/gtk-3.0/apps/gnome-applications.css +++ b/gtk-3.0/apps/gnome-applications.css @@ -147,12 +147,12 @@ NautilusQueryEditor .toolbar { padding: 4px 4px 3px 4px; border-width: 1px 0 0 0; border-style: solid; - border-color: @theme_bg_color; - background-color: mix(@theme_bg_color, @theme_base_color, 0.5); + border-color: @toolbar_bg_color; + background-color: shade(@toolbar_bg_color, 0.9); } NautilusQueryEditor .toolbar:nth-child(2) { - border-color: shade(@theme_bg_color, 0.8); + border-color: shade(@toolbar_bg_color, 0.8); } NautilusNotebook.notebook NautilusQueryEditor .primary-toolbar.toolbar { @@ -162,7 +162,7 @@ NautilusNotebook.notebook NautilusQueryEditor .primary-toolbar.toolbar { NautilusNotebook.notebook NautilusQueryEditor .toolbar:last-child, NautilusNotebook.notebook NautilusQueryEditor .primary-toolbar.toolbar:only-child { border-bottom-width: 1px; - border-bottom-color: shade(@theme_bg_color, 0.8); + border-bottom-color: shade(@toolbar_bg_color, 0.8); } .toolbar NautilusPathBar .button { diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css index ef86a0c..969c148 100644 --- a/gtk-3.0/gtk-widgets.css +++ b/gtk-3.0/gtk-widgets.css @@ -1317,6 +1317,20 @@ GtkScrolledWindow GtkViewport.frame { border-color: shade(@theme_bg_color, 0.85); } +.toolbar .button .separator, +.toolbar .button.separator, +.primary-toolbar .button .separator, +.primary-toolbar .button.separator { + border-color: shade(@toolbar_bg_color, 0.9); +} + +.toolbar .button .separator:insensitive, +.toolbar .button.separator:insensitive, +.primary-toolbar .button .separator:insensitive, +.primary-toolbar .button.separator:insensitive { + border-color: shade(@toolbar_bg_color, 0.85); +} + .menuitem.separator { -GtkMenuItem-horizontal-padding: 0; -GtkWidget-separator-height: 1; @@ -1616,7 +1630,9 @@ GtkTextView { .primary-toolbar GtkComboBox, .primary-toolbar .button *, -.primary-toolbar .button { +.primary-toolbar .button, +.toolbar GtkComboBox, +.toolbar GtkComboBox * { padding: 2px; border-width: 1px; border-color: transparent; @@ -1720,9 +1736,37 @@ GtkTextView { padding: 1px; border-width: 1px 0 1px 1px; border-style: solid; + border-color: shade(@theme_bg_color, 0.8); border-radius: 0; background-color: shade(@theme_bg_color, 1.08); background-image: none; + color: @theme_fg_color; +} + +.inline-toolbar.toolbar .button:hover { + border-color: shade(@theme_bg_color, 0.7); + background-color: shade(@theme_bg_color, 1.10); + background-image: none; + color: shade(@theme_fg_color, 0.7); +} + +.inline-toolbar.toolbar .button:active { + border-color: shade(@theme_bg_color, 0.8); + background-color: shade(@theme_bg_color, 0.95); + background-image: none; +} + +.inline-toolbar.toolbar .button:active:hover { + border-color: shade(@theme_bg_color, 0.7); + color: shade(@theme_fg_color, 0.7); +} + +.inline-toolbar.toolbar .button:focus, +.inline-toolbar.toolbar .button:hover:focus, +.inline-toolbar.toolbar .button:active:focus, +.inline-toolbar.toolbar .button:active:hover:focus { + border-color: shade(@theme_bg_color, 0.7); + color: shade(@theme_fg_color, 0.7); } .inline-toolbar.toolbar .button *:insensitive,