From 1a8fba2e1f3e34c822408cd1425eb0fb28d47aee Mon Sep 17 00:00:00 2001 From: raveit65 Date: Thu, 29 Dec 2016 23:00:20 +0100 Subject: GTK+-3.20 Menta themes: enable outlines and some focus fixes --- desktop-themes/BlueMenta/gtk-3.0/gtk-main.css | 3 + .../BlueMenta/gtk-3.0/gtk-widgets-borders.css | 10 +- desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css | 124 +++++++++++++++++---- .../BlueMenta/gtk-3.0/mate-applications.css | 44 +++++++- 4 files changed, 156 insertions(+), 25 deletions(-) (limited to 'desktop-themes/BlueMenta/gtk-3.0') diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css index 658f8a95..25869368 100644 --- a/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css +++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css @@ -51,6 +51,9 @@ @define-color button_hover_gradient_color_a shade(@button_gradient_color_a, 1.11); @define-color button_hover_gradient_color_b shade(@button_gradient_color_b, 1.06); +@define-color button_default_border_color #6699CC; +@define-color button_default_box_shadow_color #336699; + @define-color insensitive_bg_color shade(@theme_bg_color, 0.95); @define-color insensitive_fg_color shade(@theme_bg_color, 0.6); @define-color insensitive_borders shade(@internal_element_color, 1.37); diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css index d8625f7a..c460c7be 100644 --- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css +++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css @@ -55,8 +55,6 @@ row trough { entry:focus, button:checked:focus, button.default:checked, -combobox entry.combo:focus, -combobox button.combo:focus, toolbar.inline-toolbar.vertical button:focus:checked, toolbar.inline-toolbar.vertical button.default:checked { border-image: url("borders/button-active-focus.png") 3 4 5 4 / 3px 4px 5px 4px stretch; @@ -96,7 +94,13 @@ toolbar.inline-toolbar.vertical button { /* focused button borders */ button.default, -button:focus { +button:focus, +toolbar.inline-toolbar.horizontal button.text-button:focus, +combobox entry.combo:focus, +combobox button.combo:focus, +combobox .linked button.combo:focus, +.primary-toolbar button:focus, +statusbar button.flat.toggle:focus { border-image: url("borders/button-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch; border-radius: 4px; border-width: 2px; diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css index 4a405c4f..1ef8856c 100644 --- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css @@ -12,10 +12,10 @@ -GtkIMHtml-hyperlink-color: @link_color; -GtkHTML-link-color: @link_color; -WnckTasklist-fade-overlay-rect: 0; - outline-color: alpha(@theme_text_color, 0.3); + outline-color: alpha(currentColor, 0.3); outline-style: dashed; - outline-offset: -3px; /* 2px */ - outline-width: 0px; /* disable ugly focus-line */ + outline-offset: -3px; + outline-width: 1px; -gtk-outline-radius: 2px; /* -gtk-icon-style: regular;*//* disable symbolic icons */ } @@ -210,6 +210,7 @@ statusbar frame { statusbar frame button.flat { padding: 0px; + outline-style: none; } .dnd { @@ -540,6 +541,11 @@ spinbutton:disabled { border-color: @borders; } +spinbutton:focus { + border-color: shade (@treeview_focus_border, 1.0); + transition: all 400ms ease-out; +} + spinbutton button, spinbutton button:focus, spinbutton button:active, @@ -2242,6 +2248,39 @@ notebook tab.reorderable-page:hover { border-style: none; } +/* outlines */ +notebook header tab:checked { + outline-color: @button_default_border_color; +} + +notebook header.top tab:checked { + -gtk-outline-top-left-radius: 4px; + -gtk-outline-top-right-radius: 4px; + -gtk-outline-bottom-left-radius: 0px; + -gtk-outline-bottom-right-radius: 0px; +} + +notebook header.bottom tab:checked { + -gtk-outline-top-left-radius: 0px; + -gtk-outline-top-right-radius: 0px; + -gtk-outline-bottom-left-radius: 4px; + -gtk-outline-bottom-right-radius: 4px; +} + +notebook header.left tab:checked { + -gtk-outline-top-left-radius: 4px; + -gtk-outline-top-right-radius: 0px; + -gtk-outline-bottom-left-radius: 0px; + -gtk-outline-bottom-right-radius: 4px; +} + +notebook header.right tab:checked { + -gtk-outline-top-left-radius: 0px; + -gtk-outline-top-right-radius: 4px; + -gtk-outline-bottom-left-radius: 4px; + -gtk-outline-bottom-right-radius: 0px; +} + /* close button styling */ notebook button.flat, notebook button.flat.small-button { @@ -2365,6 +2404,10 @@ toolbar.primary-toolbar combobox button.combo { border-width: 2px; } +combobox button.combo { + outline-style: none; +} + combobox > .horizontal.linked > button.combo, combobox > .horizontal.linked > button.combo:backdrop, combobox > .horizontal.linked > button.combo:focus, @@ -3348,6 +3391,10 @@ dialog.background.solid-csd notebook scrolledwindow.frame treeview.view header b margin-top: -2px; } +.dialog-action-area.linked button { + outline-width: 0px; +} + /* middle buttons */ .dialog-action-area.linked button, .dialog-action-area.linked button:hover:active, @@ -3366,11 +3413,15 @@ dialog.background.solid-csd notebook scrolledwindow.frame treeview.view header b .dialog-action-area.linked button.default:checked, .dialog-action-area.linked button.default:disabled, .dialog-action-area.linked button:focus { - border-style: solid; - border-radius: 0; + border-style: solid; + border-radius: 0; border-width: 1px; border-left-width: 0px; - border-color: @theme_selected_bg_color; + border-color: @button_default_border_color; + box-shadow: inset 0px 1px @button_default_box_shadow_color, + inset 1px 0px @button_default_box_shadow_color, + inset -1px 0px @button_default_box_shadow_color, + inset 0px -1px @button_default_box_shadow_color; } /* left button */ @@ -3390,10 +3441,14 @@ dialog.background.solid-csd notebook scrolledwindow.frame treeview.view header b .dialog-action-area.linked button.default:checked:first-child, .dialog-action-area.linked button.default:disabled:first-child, .dialog-action-area.linked button:focus:first-child { - border-style: solid; + border-style: solid; border-width: 1px; - border-radius: 3px 0 0px 3px; - border-color: @theme_selected_bg_color; + border-radius: 3px 0 0px 3px; + border-color: @button_default_border_color; + box-shadow: inset 0px 1px @button_default_box_shadow_color, + inset 1px 0px @button_default_box_shadow_color, + inset -1px 0px @button_default_box_shadow_color, + inset 0px -1px @button_default_box_shadow_color; } /* right button */ @@ -3414,11 +3469,15 @@ dialog.background.solid-csd notebook scrolledwindow.frame treeview.view header b .dialog-action-area.linked button.default:checked:last-child, .dialog-action-area.linked button.default:disabled:last-child, .dialog-action-area.linked button:focus:last-child { - border-style: solid; + border-style: solid; border-width: 1px; border-left-width: 0px; - border-radius: 0 3px 3px 0; - border-color: @theme_selected_bg_color; + border-radius: 0 3px 3px 0; + border-color: @button_default_border_color; + box-shadow: inset 0px 1px @button_default_box_shadow_color, + inset 1px 0px @button_default_box_shadow_color, + inset -1px 0px @button_default_box_shadow_color, + inset 0px -1px @button_default_box_shadow_color; } /* single button */ @@ -3443,7 +3502,11 @@ dialog.background.solid-csd notebook scrolledwindow.frame treeview.view header b padding-right: 6px; border-width: 1px; border-radius: 3px; - border-color: @theme_selected_bg_color; + border-color: @button_default_border_color; + box-shadow: inset 0px 1px @button_default_box_shadow_color, + inset 1px 0px @button_default_box_shadow_color, + inset -1px 0px @button_default_box_shadow_color, + inset 0px -1px @button_default_box_shadow_color; } .dialog-action-area.linked button.suggested-action, @@ -3513,6 +3576,11 @@ toolbar.primary-toolbar entry.progressbar { color: @theme_text_color; } +toolbar button, +toolbar.primary-toolbar button { + outline-style: none; +} + /******************* * Inline toolbars * *******************/ @@ -3535,6 +3603,14 @@ toolbar.inline-toolbar.vertical:last-child { border-radius: 0; } +/* in preferences */ +notebook toolbar.inline-toolbar.horizontal toolitem button.text-button { + border-width: 2px; + border-image-width: 3px 4px 4px 4px; + border-radius: 4px; + box-shadow: none; +} + /*********** * Sidebar * ***********/ @@ -4298,7 +4374,7 @@ calendar.header .path-bar button.titlebutton image { treeview.view { -GtkTreeView-vertical-separator: 0; - outline-color: alpha(@theme_text_color, 0.6); + outline-color: alpha(currentColor, 0.6); } treeview { @@ -4331,18 +4407,19 @@ viewport { } iconview .cell:selected, -iconview .cell:selected:focus { - border-radius: 4px; - outline-color: @treeview_focus_border; - outline-style: solid; - outline-offset: 3px; -} - +iconview .cell:selected:focus, iconview .cell:hover, iconview .cell:hover:focus { border-radius: 4px; } +iconview .cell:selected:focus { + border-radius: 4px; + border-color: alpha(@theme_text_color, 0.6); + border-width: 1px; + border-style: dashed; +} + .view text, textview, .view { @@ -4374,6 +4451,11 @@ textview, color: @theme_fg_color; } +/* color of selected icons if unfocused */ +.view:active { + background-color: shade(@theme_unfocused_bg_color, 0.94); +} + /* ie. filechooser dialog */ .view row:hover { background-color: shade (@theme_selected_bg_color, 1.55); diff --git a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css index 2e167b24..7e5537ad 100644 --- a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css +++ b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css @@ -27,6 +27,16 @@ box-shadow: inset -1px 0 @inset_dark_color; } +.caja-navigation-window .caja-side-pane button.flat:focus:first-child { + border-image: url("borders/button-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch; + border-radius: 3px 0 0 3px; + /* remove right border */ + border-width: 2px 0px 2px 2px; + border-image-width: 3px 0 4px 4px; + box-shadow: inset -1px 0 @treeview_focus_border; + outline-style: none; +} + .caja-navigation-window .caja-side-pane button.flat:last-child, .caja-navigation-window .caja-side-pane button.flat:hover:last-child { border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch; @@ -37,6 +47,16 @@ box-shadow: inset 1px 0 @inset_light_color; } +.caja-navigation-window .caja-side-pane button.flat:focus:last-child { + border-image: url("borders/button-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch; + border-radius: 0 3px 3px 0; + /* remove left border */ + border-width: 2px 2px 2px 0px; + border-image-width: 3px 4px 4px 0px; + box-shadow: inset 1px 0 @treeview_focus_border; + outline-style: none; +} + /* ComboBox views */ .caja-navigation-window toolbar.primary-toolbar combobox > button.combo { padding: 6px 4px; @@ -154,6 +174,12 @@ background-color: @theme_base_color; } +/* color of selected icons if unfocused */ +/* For some reasons this needs to be set here again */ +.caja-navigation-window .caja-notebook .view:active { + background-color: shade(@theme_unfocused_bg_color, 0.94); +} + /* listview mode */ .caja-navigation-window .caja-notebook .view { background-color: @theme_base_color; @@ -316,6 +342,16 @@ MatePanelAppletFrameDBus { background-position: left; } +/* outlines */ +window.background, /* selector where outlines are writen on GtkTrayIcon */ +.mate-panel-menu-bar menubar, +.mate-panel-menu-bar button, +.mate-panel-menu-bar PanelApplet { + outline-style: solid; + outline-offset: -2px; + outline-color: shade (@theme_selected_bg_color, 1.0); +} + /* main menu */ /* set normal menubar button */ .mate-panel-menu-bar menubar > menuitem { @@ -426,6 +462,8 @@ PanelApplet.wnck-applet .wnck-pager { background-image: none; background-color: transparent; text-shadow: none; + outline-offset: -1px; + outline-color: shade (@theme_selected_bg_color, 1.0); } /* selected WnckPager */ @@ -465,7 +503,7 @@ PanelApplet.wnck-applet .wnck-pager:hover { } na-tray-applet { - -NaTrayApplet-icon-padding: 3px; + -NaTrayApplet-icon-padding: 1px; /*any more and outlines get cut off*/ -NaTrayApplet-icon-size: 16; } @@ -554,6 +592,10 @@ window.background.mate-terminal > box.vertical > notebook > header.top tab:check padding: 0px; } +.pluma-window statusbar.horizontal frame button.flat.toggle:focus { + border-image: url("borders/button-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch; +} + /* Printpreview */ .pluma-print-preview toolbar.horizontal { background-image: linear-gradient(to bottom, -- cgit v1.2.1