From 64aa62c1068a3cc5dfb2d2c712aad477011072ef Mon Sep 17 00:00:00 2001 From: EliverLara Date: Sun, 13 Sep 2020 14:57:03 -0500 Subject: [PATCH] Fix nemo file manager color inconsistences --- gtk-3.0/apps/_nemo.scss | 7 ++++--- gtk-3.0/gtk-dark.css | 29 +++++++++++++++-------------- gtk-3.0/gtk.css | 33 +++++++++++++++++---------------- 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/gtk-3.0/apps/_nemo.scss b/gtk-3.0/apps/_nemo.scss index d18a484..c2994e8 100644 --- a/gtk-3.0/apps/_nemo.scss +++ b/gtk-3.0/apps/_nemo.scss @@ -1,7 +1,7 @@ .nemo-window { .places-treeview { -NemoPlacesTreeView-disk-full-bg-color: lighten($_sidebar_color, 15%); - -NemoPlacesTreeView-disk-full-fg-color: $teal; + -NemoPlacesTreeView-disk-full-fg-color: $blue; -GtkTreeView-vertical-separator: 7; .view.cell, iconview.cell { @@ -10,14 +10,15 @@ } &:selected { background: $selected_bg_color; + color: $selected_fg_color; } } } .sidebar { - color: #98abb2; background-color: $_sidebar_color; .view, .iconview, row { + color: #98abb2; background-color: transparent; } } @@ -49,7 +50,7 @@ @include button(normal-header); margin-top: 5px; margin-bottom: 5px; - height: 24px; + min-height: 24px; &:hover { color: $selected_bg_color; } &:selected, &:active, diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css index ad69e84..4fe7dae 100755 --- a/gtk-3.0/gtk-dark.css +++ b/gtk-3.0/gtk-dark.css @@ -44,13 +44,13 @@ @define-color text_color #C3C7D1; @define-color bg_color #161925; @define-color base_color #181b28; -@define-color selected_bg_color #f7b922; +@define-color selected_bg_color #0072ff; @define-color selected_fg_color #fefefe; @define-color unfocused_fg_color #6d707b; @define-color unfocused_text_color #C3C7D1; @define-color unfocused_bg_color #161925; @define-color unfocused_base_color #1a1d2b; -@define-color unfocused_selected_bg_color #f7b922; +@define-color unfocused_selected_bg_color #0072ff; @define-color unfocused_selected_fg_color #fefefe; /* these colors are exported for the window manager and shouldn't be used in applications, read if you used those and something break with a version upgrade you're on your own... */ @@ -6383,20 +6383,21 @@ ConversationListView { font-weight: bold; } .nemo-window .places-treeview { - -NemoPlacesTreeView-disk-full-bg-color: #333955; - -NemoPlacesTreeView-disk-full-fg-color: #00e8c6; + -NemoPlacesTreeView-disk-full-bg-color: #424551; + -NemoPlacesTreeView-disk-full-fg-color: #2F80ED; -GtkTreeView-vertical-separator: 7; } .nemo-window .places-treeview .view.cell:hover, .nemo-window .places-treeview iconview.cell:hover, .nemo-window .places-treeview iconview.cell:hover { - background: rgba(16, 19, 27, 0.7); } + background: rgba(25, 26, 31, 0.7); } .nemo-window .places-treeview .view.cell:selected, .nemo-window .places-treeview iconview.cell:selected, .nemo-window .places-treeview iconview.cell:selected { - background: #c50ed2; } + background: #0072ff; + color: #fefefe; } .nemo-window .sidebar { - color: #98abb2; - background-color: #161925; } + background-color: #202127; } .nemo-window .sidebar .view, .nemo-window .sidebar iconview, .nemo-window .sidebar .iconview, .nemo-window .sidebar row { + color: #98abb2; background-color: transparent; } .nemo-window .nemo-window-pane widget.entry { @@ -6408,12 +6409,12 @@ ConversationListView { border-radius: 3px; box-shadow: inset 0 1px rgba(0, 0, 0, 0.9), inset 1px 0 rgba(0, 0, 0, 0.96), inset -1px 0 rgba(0, 0, 0, 0.96), inset 0 -1px rgba(0, 0, 0, 0.98), 0 1px rgba(255, 255, 255, 0.6); } .nemo-window .nemo-window-pane widget.entry:selected { - background-color: #c50ed2; + background-color: #0072ff; color: #fefefe; } .nemo-window toolbar.primary-toolbar { margin-bottom: -1px; - background: #0c0e14; } + background: #07080c; } .nemo-window toolbar.primary-toolbar button { color: #8b8b8b; text-shadow: none; @@ -6422,11 +6423,11 @@ ConversationListView { border: none; margin-top: 5px; margin-bottom: 5px; - height: 24px; } + min-height: 24px; } .nemo-window toolbar.primary-toolbar button:hover { - color: #c50ed2; } + color: #0072ff; } .nemo-window toolbar.primary-toolbar button:selected, .nemo-window toolbar.primary-toolbar button:active, .nemo-window toolbar.primary-toolbar button:checked { border-radius: 23px; - background: linear-gradient(to right, #c50ed2, #8500f7); - box-shadow: 0px 0px 5px rgba(197, 14, 210, 0.98); + background: linear-gradient(to right, #00c6ff, #0072ff); + box-shadow: 0px 2px 4px rgba(0, 114, 255, 0.98); color: white; } diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index f2c3921..56f3695 100755 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -44,13 +44,13 @@ @define-color text_color #31363D; @define-color bg_color #e6e6e6; @define-color base_color #ebf0f5; -@define-color selected_bg_color #f7b922; +@define-color selected_bg_color #0072ff; @define-color selected_fg_color #fefefe; @define-color unfocused_fg_color #8c8e92; @define-color unfocused_text_color #31363D; @define-color unfocused_bg_color #e6e6e6; @define-color unfocused_base_color #e8edf3; -@define-color unfocused_selected_bg_color #f7b922; +@define-color unfocused_selected_bg_color #0072ff; @define-color unfocused_selected_fg_color #fefefe; /* these colors are exported for the window manager and shouldn't be used in applications, read if you used those and something break with a version upgrade you're on your own... */ @@ -6408,37 +6408,38 @@ ConversationListView { font-weight: bold; } .nemo-window .places-treeview { - -NemoPlacesTreeView-disk-full-bg-color: #333955; - -NemoPlacesTreeView-disk-full-fg-color: #00e8c6; + -NemoPlacesTreeView-disk-full-bg-color: #3c3d49; + -NemoPlacesTreeView-disk-full-fg-color: #2F80ED; -GtkTreeView-vertical-separator: 7; } .nemo-window .places-treeview .view.cell:hover, .nemo-window .places-treeview iconview.cell:hover, .nemo-window .places-treeview iconview.cell:hover { - background: rgba(16, 19, 27, 0.7); } + background: rgba(18, 19, 22, 0.7); } .nemo-window .places-treeview .view.cell:selected, .nemo-window .places-treeview iconview.cell:selected, .nemo-window .places-treeview iconview.cell:selected { - background: #c50ed2; } + background: #0072ff; + color: #fefefe; } .nemo-window .sidebar { - color: #98abb2; - background-color: #161925; } + background-color: #191a1f; } .nemo-window .sidebar .view, .nemo-window .sidebar iconview, .nemo-window .sidebar .iconview, .nemo-window .sidebar row { + color: #98abb2; background-color: transparent; } .nemo-window .nemo-window-pane widget.entry { background-clip: padding-box; min-height: 28px; padding: 5px; - color: #C3C7D1; - border: 1px solid rgba(12, 14, 21, 0.8); + color: #31363d; + border: 1px solid rgba(0, 0, 0, 0.13); border-radius: 3px; box-shadow: inset 0 1px rgba(0, 0, 0, 0.9), inset 1px 0 rgba(0, 0, 0, 0.96), inset -1px 0 rgba(0, 0, 0, 0.96), inset 0 -1px rgba(0, 0, 0, 0.98), 0 1px rgba(255, 255, 255, 0.6); } .nemo-window .nemo-window-pane widget.entry:selected { - background-color: #c50ed2; + background-color: #0072ff; color: #fefefe; } .nemo-window toolbar.primary-toolbar { margin-bottom: -1px; - background: #0c0e14; } + background: #101013; } .nemo-window toolbar.primary-toolbar button { color: #8b8b8b; text-shadow: none; @@ -6447,11 +6448,11 @@ ConversationListView { border: none; margin-top: 5px; margin-bottom: 5px; - height: 24px; } + min-height: 24px; } .nemo-window toolbar.primary-toolbar button:hover { - color: #c50ed2; } + color: #0072ff; } .nemo-window toolbar.primary-toolbar button:selected, .nemo-window toolbar.primary-toolbar button:active, .nemo-window toolbar.primary-toolbar button:checked { border-radius: 23px; - background: linear-gradient(to right, #c50ed2, #8500f7); - box-shadow: 0px 0px 5px rgba(197, 14, 210, 0.98); + background: linear-gradient(to right, #00c6ff, #0072ff); + box-shadow: 0px 2px 4px rgba(0, 114, 255, 0.98); color: white; }