From 67891b741dbe6a64518aac585445ce2ffe41c081 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sun, 2 Mar 2014 19:12:30 +0100 Subject: Menta, Menta-Blue: update to zukitwo changes from 2013.12.10 Good bye adwaita engine warning + div. improvements --- desktop-themes/BlueMenta/gtk-2.0/apps/Makefile.am | 2 +- desktop-themes/BlueMenta/gtk-2.0/apps/pcmanfm.rc | 43 ------------- desktop-themes/BlueMenta/gtk-2.0/apps/thunar.rc | 46 ++++++++++++++ desktop-themes/BlueMenta/gtk-2.0/gtkrc | 4 +- .../BlueMenta/gtk-3.0/gnome-applications.css | 4 ++ .../BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css | 20 +++--- .../BlueMenta/gtk-3.0/gtk-widgets-borders.css | 11 +++- desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css | 18 +++--- .../BlueMenta/gtk-3.0/other-applications.css | 73 ++++++++++++++++++++-- desktop-themes/Menta/gtk-2.0/apps/Makefile.am | 2 +- desktop-themes/Menta/gtk-2.0/apps/pcmanfm.rc | 43 ------------- desktop-themes/Menta/gtk-2.0/apps/thunar.rc | 46 ++++++++++++++ desktop-themes/Menta/gtk-2.0/gtkrc | 2 +- .../Menta/gtk-3.0/gnome-applications.css | 4 ++ .../Menta/gtk-3.0/gtk-widgets-backgrounds.css | 20 +++--- .../Menta/gtk-3.0/gtk-widgets-borders.css | 11 +++- desktop-themes/Menta/gtk-3.0/gtk-widgets.css | 17 +++-- .../Menta/gtk-3.0/other-applications.css | 73 ++++++++++++++++++++-- 18 files changed, 303 insertions(+), 136 deletions(-) delete mode 100644 desktop-themes/BlueMenta/gtk-2.0/apps/pcmanfm.rc create mode 100644 desktop-themes/BlueMenta/gtk-2.0/apps/thunar.rc delete mode 100644 desktop-themes/Menta/gtk-2.0/apps/pcmanfm.rc create mode 100644 desktop-themes/Menta/gtk-2.0/apps/thunar.rc (limited to 'desktop-themes') diff --git a/desktop-themes/BlueMenta/gtk-2.0/apps/Makefile.am b/desktop-themes/BlueMenta/gtk-2.0/apps/Makefile.am index 8979bd6f..1d12dbd5 100644 --- a/desktop-themes/BlueMenta/gtk-2.0/apps/Makefile.am +++ b/desktop-themes/BlueMenta/gtk-2.0/apps/Makefile.am @@ -4,7 +4,7 @@ theme_DATA = \ chromium.rc \ combo_down.png \ dummy.png \ - pcmanfm.rc \ + thunar.rc \ stock_back.png \ stock_find.png \ stock_forward.png \ diff --git a/desktop-themes/BlueMenta/gtk-2.0/apps/pcmanfm.rc b/desktop-themes/BlueMenta/gtk-2.0/apps/pcmanfm.rc deleted file mode 100644 index 8dcfdaed..00000000 --- a/desktop-themes/BlueMenta/gtk-2.0/apps/pcmanfm.rc +++ /dev/null @@ -1,43 +0,0 @@ -style "pcmanfm-sidebar" = "murrine-sidebar" { - font_name = "Regular" - - GtkTreeView::odd_row_color = @bg_color - GtkTreeView::even_row_color = @bg_color - - # these make the padding from left window edge a little more sane - GtkTreeView::vertical_separator = 4 - GtkTreeView::horizontal_separator = 15 - GtkTreeView::indent-expanders = 1 # 1 means TRUE - GtkTreeView::expander-size = 8 - GtkExpander::expander_spacing = 16 - GtkButton::image_spacing = 4 - - xthickness = 0 - ythickness = 1 -} - -# A little more vertical padding on the toolbar -style "pcman-padding" { - xthickness = 3 - ythickness = 3 -} - -# For the thin gray line separating the sidepane and viewpane -style "pcmanfm-handle" -{ - GtkPaned::handle-size = 1 - - engine "pixmap" { - image { - function = HANDLE - recolorable = TRUE - file = "Handles/handle-caja.png" - stretch = TRUE - border = { 0, 0, 0, 0 } - } - } -} - -widget_class "*FmMainWin*GtkToolbar*" style "pcman-padding" -widget_class "*FmSidePane*" style "pcmanfm-sidebar" -widget "*FmMainWin*FmTabPage" style "pcmanfm-handle" diff --git a/desktop-themes/BlueMenta/gtk-2.0/apps/thunar.rc b/desktop-themes/BlueMenta/gtk-2.0/apps/thunar.rc new file mode 100644 index 00000000..0179ae2b --- /dev/null +++ b/desktop-themes/BlueMenta/gtk-2.0/apps/thunar.rc @@ -0,0 +1,46 @@ +# ======================== +# THUNAR SPECIFIC SETTINGS +# ======================== + +style "thunar-location" { + ThunarLocationButtons::spacing = 0 +} + +style "thunar-handle" { + GtkPaned::handle-size = 1 + engine "pixmap" { + image { function = HANDLE file = "/Handles/handle-caja.png" stretch = TRUE border = { 0, 0, 0, 0 } } + } +} + +style "thunar-statusbar" { + bg[NORMAL] = @base_color + + engine "pixmap" { + image { + function = RESIZE_GRIP + recolorable = FALSE + detail = "statusbar" + overlay_file = "/Others/null.png" + overlay_border = {0,0,0,0 } + overlay_stretch = FALSE + } + } +} + +style "thunar-sidepane" { + GtkTreeView::odd_row_color = @bg_color + GtkTreeView::even_row_color = @bg_color +} + +style "thunar-frame" { + xthickness = 0 + ythickness = 0 +} + +widget_class "*ThunarWindow*." style "thunar-frame" +widget_class "*ThunarLocationButtons*" style "thunar-location" +widget_class "*ThunarShortcutsView*" style "thunar-sidepane" +widget_class "*ThunarTreeView*" style "thunar-sidepane" +widget_class "*ThunarWindow*." style "thunar-handle" +widget_class "*ThunarStatusbar*" style "thunar-statusbar" diff --git a/desktop-themes/BlueMenta/gtk-2.0/gtkrc b/desktop-themes/BlueMenta/gtk-2.0/gtkrc index 4cffc259..5da628ac 100644 --- a/desktop-themes/BlueMenta/gtk-2.0/gtkrc +++ b/desktop-themes/BlueMenta/gtk-2.0/gtkrc @@ -9,7 +9,7 @@ # NOTE: Uncommenting means to delete the "#" at the beginning of a line. Commenting means to add a "#" at the beginning of a line. The "#" tells the theme wether to ignore the specified line or not. -# These are the defined colors for the theme, you can change them in GNOME's appearance preferences. +# These are the defined colors for the theme, you can change them in MATE's appearance preferences. gtk_color_scheme = "bg_color:#d4d4d4\nselected_bg_color:#6699CC\nbase_color:#F7F7F7" # Background, base. gtk_color_scheme = "fg_color:#2c2c2c\nselected_fg_color:#f5f5f5\ntext_color:#2c2c2c" # Foreground, text. gtk_color_scheme = "tooltip_bg_color:#F5F5B5\ntooltip_fg_color:#000000" # Tooltips. @@ -728,6 +728,6 @@ widget_class "*MozContainer*" style "performance-fix" # Firefox (Not sure if th ### EXTERNAL FILES ### include "apps/chromium.rc" # Chromium styling -include "apps/pcmanfm.rc" # PCManFM styling +include "apps/thunar.rc" # Thunar styling include "apps/caja.rc" # Caja styling include "apps/pluma.rc" # Pluma styling diff --git a/desktop-themes/BlueMenta/gtk-3.0/gnome-applications.css b/desktop-themes/BlueMenta/gtk-3.0/gnome-applications.css index 85dd4c8b..f378c858 100644 --- a/desktop-themes/BlueMenta/gtk-3.0/gnome-applications.css +++ b/desktop-themes/BlueMenta/gtk-3.0/gnome-applications.css @@ -51,6 +51,10 @@ NautilusWindow .sidebar .frame { border-style: none; } +NautilusWindow .sidebar row:hover { + background-color: shade (@theme_bg_color, 0.95); +} + NautilusWindow * { -GtkPaned-handle-size: 1; } diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css index 1521978a..dfed2d98 100644 --- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css +++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css @@ -140,10 +140,9 @@ GtkComboBox.combobox-entry .button:active, column-header.button, column-header .button { background-image: linear-gradient(to bottom, - shade(@entry_background_a, 0.94), + shade(@entry_background_a, 0.96), @entry_background_b); - box-shadow: inset 0 1px @entry_inset, - inset 0 2px alpha(@entry_inset, 0.4); + box-shadow: inset 0 2px 0 0 alpha(@borders, 0.3); } column-header.button:hover, @@ -151,20 +150,25 @@ column-header .button:hover { background-image: linear-gradient(to bottom, shade(@entry_background_a, 1.0), @entry_background_b); - box-shadow: inset 0 1px @entry_inset, - inset 0 2px alpha(@entry_inset, 0.4); + box-shadow: inset 0 2px 0 0 alpha(@theme_selected_bg_color, 0.3); } +column-header.button:hover:backdrop, +column-header .button:hover:backdrop { + box-shadow: inset 0 2px 0 0 alpha(@theme_fg_color, 0.18); +} +column-header.button:focus, +column-header .button:focus, column-header.button:active, column-header .button:active, column-header.button:active:hover, column-header .button:active:hover { background-image: linear-gradient(to bottom, - shade(@entry_background_a, 0.9), + shade(@entry_background_a, 0.92), @entry_background_b); background-color: transparent; - box-shadow: inset 0 1px @entry_inset, - inset 0 2px alpha(@entry_inset, 0.4); + box-shadow: inset 0 2px 0 0 alpha(@theme_selected_bg_color, 0.5); + border-image: none; } /* Insensitive entry background */ 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 ed02c2a4..bf93514d 100644 --- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css +++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css @@ -224,7 +224,7 @@ column-header .button:active:hover, column-header .button.dnd { border-image: linear-gradient(to top, alpha(@theme_base_color, 0.0), - @theme_bg_color) 0 1 1 0; + shade(@borders, 1.0)) 0 1 1 0; } column-header.button:insensitive, @@ -243,6 +243,15 @@ column-header:last-child .button:active:hover { border-right-width: 0; } +column-header.button:focus, +column-header .button:focus { + border-image: linear-gradient(to top, + alpha(@theme_base_color, 0.0), + shade(@borders, 1.0)) 0 1 1 0; + border-width: 0 1px 1px 0; + border-radius: 0; +} + /* pushed colored buttons borders */ .selection-mode.toolbar .suggested-action.button, .selection-mode.toolbar GtkToolButton.suggested-action .button { diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css index 606bd69c..6c9e7d0a 100644 --- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css @@ -1,5 +1,5 @@ * { - engine: adwaita; + engine: none; padding: 0; background-clip: padding-box; @@ -1492,14 +1492,13 @@ GtkLinkButton.button:active { * tabs * *****************/ .notebook { - /* To get rid of the horrible adwaita tabs we need the notebook to use no engine */ - engine: none; padding: 0; border-color: @borders; border-style: solid; border-width: 1px; + background-clip: border-box; background-color: shade (@theme_bg_color, 1.1); -GtkNotebook-initial-gap: 0; -GtkNotebook-arrow-spacing: 5; @@ -1907,11 +1906,13 @@ GtkComboBox .button:hover { } .scrollbar.slider.fine-tune:prelight:active { - background-image: none; + background-image: linear-gradient(to right, + shade(@scrollbar_slider, 0.85), + shade(@scrollbar_slider, 0.7)); border-style: solid; border-image: none; - border-color: transparent; - border-width: 5px; + border-color: shade(@scrollbar_slider, 0.65); + border-width: 1px; } /********* @@ -1992,7 +1993,6 @@ GtkTreeMenu .menuitem, border-style: none; padding: 4px 6px; text-shadow: 0 1px @button_text_shadow; - /*padding: 3px 8px;*/ } .menubar .menuitem:hover { @@ -2020,7 +2020,7 @@ GtkTreeMenu .menuitem, background-image: linear-gradient(to bottom, shade (@theme_selected_bg_color, 1.0), shade (@theme_selected_bg_color, 0.85)); - text-shadow: none; + border: none; } .menu .menuitem:insensitive { @@ -3127,7 +3127,6 @@ column-header.button:insensitive, column-header .button:insensitive, column-header.button:hover, column-header .button:hover { - background-image: none; padding: 0 4px; text-shadow: none; icon-shadow: none; @@ -3530,7 +3529,6 @@ GtkBubbleWindow .toolbar { } .titlebar .titlebutton:backdrop { - background-image: none; color: @wm_unfocused_title; icon-shadow: none; } diff --git a/desktop-themes/BlueMenta/gtk-3.0/other-applications.css b/desktop-themes/BlueMenta/gtk-3.0/other-applications.css index b3959844..83312b08 100644 --- a/desktop-themes/BlueMenta/gtk-3.0/other-applications.css +++ b/desktop-themes/BlueMenta/gtk-3.0/other-applications.css @@ -1,10 +1,70 @@ /********************* * NEMO File manager * *********************/ + +/* for breadcrumbs path bar */ + +.nemo-pathbar-button, +NemoPathbarButton { + background-image: -gtk-gradient(linear, left top, left bottom, + color-stop (0, shade(alpha(@theme_bg_color, 0.8), 1.1)), + color-stop (.3, shade(alpha(@theme_bg_color, 0.8), 1.1)), + color-stop (.7, shade(alpha(@theme_bg_color, 0.8), 0.98)), + color-stop (1, shade(alpha(@theme_bg_color, 0.8), 0.90))); + border-color: #979797; + color: @theme_fg_color; + -NemoPathbarButton-border-radius: 3px; +} + +NemoPathbarButton:active { + background-image: -gtk-gradient(linear, left top, left bottom, + color-stop (0, shade(alpha(@theme_bg_color, 0.8), .8)), + color-stop (.3, shade(alpha(@theme_bg_color, 0.8), .9)), + color-stop (1, shade(alpha(@theme_bg_color, 0.8), 1.0))); +} + +NemoPathbarButton:hover { + background-image: -gtk-gradient(linear, left top, left bottom, + color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)), + color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)), + color-stop (.7, shade(alpha(@theme_selected_bg_color, 0.8), 0.95)), + color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 0.85))); +} + +NemoPathbarButton:active:hover { + background-image: -gtk-gradient(linear, left top, left bottom, + color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), .80)), + color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), .95)), + color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 1.25))); +} + + +/* For Places Sidebar diskfull indicators */ + +NemoPlacesTreeView { + -NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, .65); + -NemoPlacesTreeView-disk-full-fg-color: shade(@theme_selected_bg_color, 1.0); + -NemoPlacesTreeView-disk-full-bar-width: 2px; + -NemoPlacesTreeView-disk-full-bar-radius: 1px; + -NemoPlacesTreeView-disk-full-bottom-padding: 1px; + -NemoPlacesTreeView-disk-full-max-length: 70px; +} + +NemoPlacesTreeView:selected { + -NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, 2.0); + -NemoPlacesTreeView-disk-full-fg-color: shade(@theme_fg_color, 2.0); +} + +NemoPlacesTreeView:hover { +} + +NemoPlacesTreeView:selected:hover { +} + @define-color cluebar_color shade (@theme_base_color, 0.9); NemoWindow * { - -GtkPaned-handle-size: 1; + -GtkPaned-handle-size: 0; } NemoWindow .view { @@ -21,18 +81,19 @@ NemoWindow .view.rubberband { NemoWindow .sidebar .view { background-color: shade (@theme_bg_color, 1.08); color: @theme_fg_color; - text-shadow: 0 1px shade (shade (@theme_bg_color, 0.95), 1.04); } NemoWindow .sidebar .frame { border-right-width: 1px; border-style: solid; - border-color: shade (@theme_bg_color, 0.82); + border-color: shade (@theme_bg_color, 0.90); + border-left: none; + border-top: none; + border-bottom: none; } NemoWindow .sidebar row:selected { color: @theme_selected_fg_color; - text-shadow: 0 -1px shade (@theme_selected_bg_color, 0.8); } NemoWindow .sidebar row:backdrop:selected { @@ -40,6 +101,10 @@ NemoWindow .sidebar row:backdrop:selected { text-shadow: none; } +NemoWindow .sidebar row:hover { + background-color: shade (@theme_bg_color, 0.97); +} + /* desktop mode */ .nemo-desktop.nemo-canvas-item { color: @theme_bg_color; diff --git a/desktop-themes/Menta/gtk-2.0/apps/Makefile.am b/desktop-themes/Menta/gtk-2.0/apps/Makefile.am index 15109d88..0cd1a194 100644 --- a/desktop-themes/Menta/gtk-2.0/apps/Makefile.am +++ b/desktop-themes/Menta/gtk-2.0/apps/Makefile.am @@ -5,7 +5,7 @@ theme_DATA = \ chromium.rc \ combo_down.png \ dummy.png \ - pcmanfm.rc \ + thunar.rc \ stock_back.png \ stock_find.png \ stock_forward.png \ diff --git a/desktop-themes/Menta/gtk-2.0/apps/pcmanfm.rc b/desktop-themes/Menta/gtk-2.0/apps/pcmanfm.rc deleted file mode 100644 index 8dcfdaed..00000000 --- a/desktop-themes/Menta/gtk-2.0/apps/pcmanfm.rc +++ /dev/null @@ -1,43 +0,0 @@ -style "pcmanfm-sidebar" = "murrine-sidebar" { - font_name = "Regular" - - GtkTreeView::odd_row_color = @bg_color - GtkTreeView::even_row_color = @bg_color - - # these make the padding from left window edge a little more sane - GtkTreeView::vertical_separator = 4 - GtkTreeView::horizontal_separator = 15 - GtkTreeView::indent-expanders = 1 # 1 means TRUE - GtkTreeView::expander-size = 8 - GtkExpander::expander_spacing = 16 - GtkButton::image_spacing = 4 - - xthickness = 0 - ythickness = 1 -} - -# A little more vertical padding on the toolbar -style "pcman-padding" { - xthickness = 3 - ythickness = 3 -} - -# For the thin gray line separating the sidepane and viewpane -style "pcmanfm-handle" -{ - GtkPaned::handle-size = 1 - - engine "pixmap" { - image { - function = HANDLE - recolorable = TRUE - file = "Handles/handle-caja.png" - stretch = TRUE - border = { 0, 0, 0, 0 } - } - } -} - -widget_class "*FmMainWin*GtkToolbar*" style "pcman-padding" -widget_class "*FmSidePane*" style "pcmanfm-sidebar" -widget "*FmMainWin*FmTabPage" style "pcmanfm-handle" diff --git a/desktop-themes/Menta/gtk-2.0/apps/thunar.rc b/desktop-themes/Menta/gtk-2.0/apps/thunar.rc new file mode 100644 index 00000000..0179ae2b --- /dev/null +++ b/desktop-themes/Menta/gtk-2.0/apps/thunar.rc @@ -0,0 +1,46 @@ +# ======================== +# THUNAR SPECIFIC SETTINGS +# ======================== + +style "thunar-location" { + ThunarLocationButtons::spacing = 0 +} + +style "thunar-handle" { + GtkPaned::handle-size = 1 + engine "pixmap" { + image { function = HANDLE file = "/Handles/handle-caja.png" stretch = TRUE border = { 0, 0, 0, 0 } } + } +} + +style "thunar-statusbar" { + bg[NORMAL] = @base_color + + engine "pixmap" { + image { + function = RESIZE_GRIP + recolorable = FALSE + detail = "statusbar" + overlay_file = "/Others/null.png" + overlay_border = {0,0,0,0 } + overlay_stretch = FALSE + } + } +} + +style "thunar-sidepane" { + GtkTreeView::odd_row_color = @bg_color + GtkTreeView::even_row_color = @bg_color +} + +style "thunar-frame" { + xthickness = 0 + ythickness = 0 +} + +widget_class "*ThunarWindow*." style "thunar-frame" +widget_class "*ThunarLocationButtons*" style "thunar-location" +widget_class "*ThunarShortcutsView*" style "thunar-sidepane" +widget_class "*ThunarTreeView*" style "thunar-sidepane" +widget_class "*ThunarWindow*." style "thunar-handle" +widget_class "*ThunarStatusbar*" style "thunar-statusbar" diff --git a/desktop-themes/Menta/gtk-2.0/gtkrc b/desktop-themes/Menta/gtk-2.0/gtkrc index fd8c788f..0aa64840 100644 --- a/desktop-themes/Menta/gtk-2.0/gtkrc +++ b/desktop-themes/Menta/gtk-2.0/gtkrc @@ -732,6 +732,6 @@ widget_class "*MozContainer*" style "performance-fix" # Firefox (Not sure if th ### EXTERNAL FILES ### include "apps/chromium.rc" # Chromium styling -include "apps/pcmanfm.rc" # PCManFM styling +include "apps/thunar.rc" # PCManFM styling include "apps/caja.rc" # Caja styling include "apps/pluma.rc" # Pluma styling diff --git a/desktop-themes/Menta/gtk-3.0/gnome-applications.css b/desktop-themes/Menta/gtk-3.0/gnome-applications.css index 6093925b..fb403669 100644 --- a/desktop-themes/Menta/gtk-3.0/gnome-applications.css +++ b/desktop-themes/Menta/gtk-3.0/gnome-applications.css @@ -52,6 +52,10 @@ NautilusWindow .sidebar .frame { border-style: none; } +NautilusWindow .sidebar row:hover { + background-color: shade (@theme_bg_color, 0.95); +} + NautilusWindow * { -GtkPaned-handle-size: 1; } diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css index 1521978a..dfed2d98 100644 --- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css +++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css @@ -140,10 +140,9 @@ GtkComboBox.combobox-entry .button:active, column-header.button, column-header .button { background-image: linear-gradient(to bottom, - shade(@entry_background_a, 0.94), + shade(@entry_background_a, 0.96), @entry_background_b); - box-shadow: inset 0 1px @entry_inset, - inset 0 2px alpha(@entry_inset, 0.4); + box-shadow: inset 0 2px 0 0 alpha(@borders, 0.3); } column-header.button:hover, @@ -151,20 +150,25 @@ column-header .button:hover { background-image: linear-gradient(to bottom, shade(@entry_background_a, 1.0), @entry_background_b); - box-shadow: inset 0 1px @entry_inset, - inset 0 2px alpha(@entry_inset, 0.4); + box-shadow: inset 0 2px 0 0 alpha(@theme_selected_bg_color, 0.3); } +column-header.button:hover:backdrop, +column-header .button:hover:backdrop { + box-shadow: inset 0 2px 0 0 alpha(@theme_fg_color, 0.18); +} +column-header.button:focus, +column-header .button:focus, column-header.button:active, column-header .button:active, column-header.button:active:hover, column-header .button:active:hover { background-image: linear-gradient(to bottom, - shade(@entry_background_a, 0.9), + shade(@entry_background_a, 0.92), @entry_background_b); background-color: transparent; - box-shadow: inset 0 1px @entry_inset, - inset 0 2px alpha(@entry_inset, 0.4); + box-shadow: inset 0 2px 0 0 alpha(@theme_selected_bg_color, 0.5); + border-image: none; } /* Insensitive entry background */ diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css index d430300c..11a3c89a 100644 --- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css +++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css @@ -223,7 +223,7 @@ column-header .button:active:hover, column-header .button.dnd { border-image: linear-gradient(to top, alpha(@theme_base_color, 0.0), - @theme_bg_color) 0 1 1 0; + shade(@borders, 1.0)) 0 1 1 0; } column-header.button:insensitive, @@ -242,6 +242,15 @@ column-header:last-child .button:active:hover { border-right-width: 0; } +column-header.button:focus, +column-header .button:focus { + border-image: linear-gradient(to top, + alpha(@theme_base_color, 0.0), + shade(@borders, 1.0)) 0 1 1 0; + border-width: 0 1px 1px 0; + border-radius: 0; +} + /* pushed colored buttons borders */ .selection-mode.toolbar .suggested-action.button, .selection-mode.toolbar GtkToolButton.suggested-action .button { diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css index 8d6d552f..3e2b425f 100644 --- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css @@ -1,5 +1,5 @@ * { - engine: adwaita; + engine: none; padding: 0; background-clip: padding-box; @@ -1492,14 +1492,13 @@ GtkLinkButton.button:active { * tabs * *****************/ .notebook { - /* To get rid of the horrible adwaita tabs we need the notebook to use no engine */ - engine: none; padding: 0; border-color: @borders; border-style: solid; border-width: 1px; + background-clip: border-box; background-color: shade (@theme_bg_color, 1.1); -GtkNotebook-initial-gap: 0; @@ -1908,11 +1907,13 @@ GtkComboBox .button:hover { } .scrollbar.slider.fine-tune:prelight:active { - background-image: none; + background-image: linear-gradient(to right, + shade(@scrollbar_slider, 0.85), + shade(@scrollbar_slider, 0.7)); border-style: solid; border-image: none; - border-color: transparent; - border-width: 5px; + border-color: shade(@scrollbar_slider, 0.65); + border-width: 1px; } /********* @@ -1993,7 +1994,6 @@ GtkTreeMenu .menuitem, border-style: none; padding: 4px 6px; text-shadow: 0 1px @button_text_shadow; - /*padding: 3px 8px;*/ } .menubar .menuitem:hover { @@ -2022,6 +2022,7 @@ GtkTreeMenu .menuitem, shade (@theme_selected_bg_color, 1.0), shade (@theme_selected_bg_color, 0.85)); text-shadow: none; + border: none; } .menu .menuitem:insensitive { @@ -3133,7 +3134,6 @@ column-header.button:insensitive, column-header .button:insensitive, column-header.button:hover, column-header .button:hover { - background-image: none; padding: 0 4px; text-shadow: none; icon-shadow: none; @@ -3535,7 +3535,6 @@ GtkBubbleWindow .toolbar { } .titlebar .titlebutton:backdrop { - background-image: none; color: @wm_unfocused_title; icon-shadow: none; } diff --git a/desktop-themes/Menta/gtk-3.0/other-applications.css b/desktop-themes/Menta/gtk-3.0/other-applications.css index 5f1d01dc..18ae2cdc 100644 --- a/desktop-themes/Menta/gtk-3.0/other-applications.css +++ b/desktop-themes/Menta/gtk-3.0/other-applications.css @@ -1,10 +1,70 @@ /********************* * NEMO File manager * *********************/ + +/* for breadcrumbs path bar */ + +.nemo-pathbar-button, +NemoPathbarButton { + background-image: -gtk-gradient(linear, left top, left bottom, + color-stop (0, shade(alpha(@theme_bg_color, 0.8), 1.1)), + color-stop (.3, shade(alpha(@theme_bg_color, 0.8), 1.1)), + color-stop (.7, shade(alpha(@theme_bg_color, 0.8), 0.98)), + color-stop (1, shade(alpha(@theme_bg_color, 0.8), 0.90))); + border-color: #979797; + color: @theme_fg_color; + -NemoPathbarButton-border-radius: 3px; +} + +NemoPathbarButton:active { + background-image: -gtk-gradient(linear, left top, left bottom, + color-stop (0, shade(alpha(@theme_bg_color, 0.8), .8)), + color-stop (.3, shade(alpha(@theme_bg_color, 0.8), .9)), + color-stop (1, shade(alpha(@theme_bg_color, 0.8), 1.0))); +} + +NemoPathbarButton:hover { + background-image: -gtk-gradient(linear, left top, left bottom, + color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)), + color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)), + color-stop (.7, shade(alpha(@theme_selected_bg_color, 0.8), 0.95)), + color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 0.85))); +} + +NemoPathbarButton:active:hover { + background-image: -gtk-gradient(linear, left top, left bottom, + color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), .80)), + color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), .95)), + color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 1.25))); +} + + +/* For Places Sidebar diskfull indicators */ + +NemoPlacesTreeView { + -NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, .65); + -NemoPlacesTreeView-disk-full-fg-color: shade(@theme_selected_bg_color, 1.0); + -NemoPlacesTreeView-disk-full-bar-width: 2px; + -NemoPlacesTreeView-disk-full-bar-radius: 1px; + -NemoPlacesTreeView-disk-full-bottom-padding: 1px; + -NemoPlacesTreeView-disk-full-max-length: 70px; +} + +NemoPlacesTreeView:selected { + -NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, 2.0); + -NemoPlacesTreeView-disk-full-fg-color: shade(@theme_fg_color, 2.0); +} + +NemoPlacesTreeView:hover { +} + +NemoPlacesTreeView:selected:hover { +} + @define-color cluebar_color shade (@theme_base_color, 0.9); NemoWindow * { - -GtkPaned-handle-size: 1; + -GtkPaned-handle-size: 0; } NemoWindow .view { @@ -21,18 +81,19 @@ NemoWindow .view.rubberband { NemoWindow .sidebar .view { background-color: @theme_bg_color; color: @theme_fg_color; - text-shadow: 0 1px shade (shade (@theme_bg_color, 0.95), 1.04); } NemoWindow .sidebar .frame { border-right-width: 1px; border-style: solid; - border-color: shade (@theme_bg_color, 0.82); + border-color: shade (@theme_bg_color, 0.90); + border-left: none; + border-top: none; + border-bottom: none; } NemoWindow .sidebar row:selected { color: @theme_selected_fg_color; - text-shadow: 0 -1px shade (@theme_selected_bg_color, 0.8); } NemoWindow .sidebar row:backdrop:selected { @@ -40,6 +101,10 @@ NemoWindow .sidebar row:backdrop:selected { text-shadow: none; } +NemoWindow .sidebar row:hover { + background-color: shade (@theme_bg_color, 0.97); +} + /* desktop mode */ .nemo-desktop.nemo-canvas-item { color: @theme_bg_color; -- cgit v1.2.1