From 53ec10f833110f853384c2961290dd2ab5024232 Mon Sep 17 00:00:00 2001 From: yutent Date: Mon, 16 Jan 2023 15:13:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96thunar=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E6=A0=8F=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build-theme.js | 6 +-- gtk-3.0/gtk.css | 86 +++++++++++-------------------- gtk-3.0/sass/ui/applications.scss | 14 +++-- gtk-3.0/sass/ui/calendar.scss | 13 ++--- 4 files changed, 48 insertions(+), 71 deletions(-) diff --git a/build-theme.js b/build-theme.js index f303558..23aef97 100755 --- a/build-theme.js +++ b/build-theme.js @@ -70,9 +70,9 @@ chokidar console.log('更新 Gtk3 完成!!!') console.log() - execSync('bash ./update-theme.sh', { - stdio: [process.stdin, process.stdout, process.stdout] - }) + // execSync('bash ./update-theme.sh', { + // stdio: [process.stdin, process.stdout, process.stdout] + // }) }, 1000) } } diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index 276cef6..527053f 100644 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -769,11 +769,9 @@ button.font separator, button.file separator { } .linked:not(.vertical) > combobox > box > button.combo:dir(ltr), .linked:not(.vertical) > combobox > box > button.combo:dir(rtl), -.primary-toolbar .linked:not(.vertical) entry + button:last-child, headerbar .linked:not(.vertical) entry + button:last-child, .primary-toolbar toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, -.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .inline-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, -.primary-toolbar toolbar .linked:not(.vertical).path-bar > button, +.primary-toolbar .linked:not(.vertical) entry + button:last-child, headerbar .linked:not(.vertical) entry + button:last-child, +.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical).path-bar > button, -.primary-toolbar .inline-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry, .linked:not(.vertical) > entry, .linked:not(.vertical) > entry:focus, .inline-toolbar button, .inline-toolbar button:backdrop, .linked:not(.vertical) > button, .linked:not(.vertical) > button:hover, .linked:not(.vertical) > button:active, .linked:not(.vertical) > button:checked, toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat { border-radius: 0; @@ -781,11 +779,9 @@ spinbutton:not(.vertical) entry, .linked:not(.vertical) > entry, .linked:not(.ve } popover.combo scrollbar.vertical:dir(rtl), .linked:not(.vertical) > combobox:first-child > box > button.combo, -.primary-toolbar .linked:not(.vertical) entry + button:first-child:last-child, headerbar .linked:not(.vertical) entry + button:first-child:last-child, .primary-toolbar toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, -.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .inline-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, -.primary-toolbar toolbar .linked:not(.vertical).path-bar > button:first-child, +.primary-toolbar .linked:not(.vertical) entry + button:first-child:last-child, headerbar .linked:not(.vertical) entry + button:first-child:last-child, +.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, -.primary-toolbar .inline-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, .linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .inline-toolbar button:first-child:backdrop, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat { border-top-left-radius: 3px; @@ -795,11 +791,9 @@ spinbutton:not(.vertical) entry:first-child, .linked:not(.vertical) > entry:firs } popover.combo scrollbar.vertical:dir(ltr), .linked:not(.vertical) > combobox:last-child > box > button.combo, -.primary-toolbar .linked:not(.vertical) entry + button:last-child, headerbar .linked:not(.vertical) entry + button:last-child, .primary-toolbar toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, -.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .inline-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, -.primary-toolbar toolbar .linked:not(.vertical).path-bar > button:last-child, +.primary-toolbar .linked:not(.vertical) entry + button:last-child, headerbar .linked:not(.vertical) entry + button:last-child, +.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, -.primary-toolbar .inline-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, .linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .inline-toolbar button:last-child:backdrop, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat { border-top-right-radius: 3px; @@ -810,11 +804,9 @@ spinbutton:not(.vertical) entry:last-child, .linked:not(.vertical) > entry:last- } .linked:not(.vertical) > combobox:only-child > box > button.combo, -.primary-toolbar .linked:not(.vertical) entry + button:only-child:last-child, headerbar .linked:not(.vertical) entry + button:only-child:last-child, .primary-toolbar toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, -.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .inline-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, -.primary-toolbar toolbar .linked:not(.vertical).path-bar > button:only-child, +.primary-toolbar .linked:not(.vertical) entry + button:only-child:last-child, headerbar .linked:not(.vertical) entry + button:only-child:last-child, +.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, -.primary-toolbar .inline-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, spinbutton:not(.vertical) button:only-child, spinbutton:not(.vertical) entry:only-child, .linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .inline-toolbar button:only-child:backdrop, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat { border-radius: 3px; @@ -920,29 +912,25 @@ button:visited, *:selected *:link:visited { color: rgba(224, 237, 251, 0.74); } -button:hover:link, button:hover:visited, *:link:hover { color: #94ccf9; } -*:selected button:hover:link, *:selected button:hover:visited, *:selected *:link:hover { color: rgba(239, 244, 252, 0.935); } -button:active:link, button:active:visited, *:link:active { color: #64b5f6; } -*:selected button:active:link, *:selected button:active:visited, *:selected *:link:active { color: rgba(235, 242, 252, 0.87); } infobar.info *:link, infobar.question *:link, infobar.warning *:link, infobar.error *:link, headerbar.selection-mode .subtitle:link, -.selection-mode.titlebar:not(headerbar) .subtitle:link, button:selected:link, -button:selected:visited, *:selected button:link, +.selection-mode.titlebar:not(headerbar) .subtitle:link, +button:selected:visited, *:selected button:visited, *:link:selected, *:selected *:link { @@ -1396,62 +1384,43 @@ window > .titlebar:not(headerbar), window > .titlebar:not(headerbar):backdrop, w .primary-toolbar .linked:not(.vertical):not(.path-bar):not(.stack-switcher) button:not(:last-child):not(:only-child), headerbar .linked:not(.vertical):not(.path-bar):not(.stack-switcher) button:not(:last-child):not(:only-child) { margin-right: 1px; } -.primary-toolbar toolbar .linked:not(.vertical):not(.path-bar) > button, -.primary-toolbar .linked:not(.vertical):not(.path-bar) > button, .primary-toolbar .inline-toolbar .linked:not(.vertical):not(.path-bar) > button, headerbar .linked:not(.vertical):not(.path-bar) > button { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > button, headerbar .linked:not(.vertical):not(.path-bar) > button { border-radius: 3px; border-style: solid; } .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action), headerbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action), -.primary-toolbar toolbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), -.primary-toolbar .inline-toolbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), headerbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), -.primary-toolbar toolbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child), -.primary-toolbar .inline-toolbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child), headerbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child) { box-shadow: none; } -.primary-toolbar toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, -.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .inline-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, -.primary-toolbar toolbar .linked:not(.vertical).path-bar > button, +.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical).path-bar > button, -.primary-toolbar .inline-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button { color: #ced6e0; outline-color: rgba(206, 214, 224, 0.3); border-color: rgba(206, 214, 224, 0.3); background-color: rgba(64, 82, 100, 0.9); } -.primary-toolbar toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, -.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .inline-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, -.primary-toolbar toolbar .linked:not(.vertical).path-bar > button:hover, +.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, -.primary-toolbar .inline-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover { background-color: rgba(94, 120, 147, 0.9); } -.primary-toolbar toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, -.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .inline-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, -.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .inline-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, -.primary-toolbar toolbar .linked:not(.vertical).path-bar > button:active, +.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, +.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:active, -.primary-toolbar .inline-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, -.primary-toolbar toolbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, -.primary-toolbar .inline-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked { color: #ced6e0; outline-color: rgba(206, 214, 224, 0.3); border-color: rgba(206, 214, 224, 0.3); background-color: rgba(0, 0, 0, 0.15); } -.primary-toolbar toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, -.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .inline-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, -.primary-toolbar toolbar .linked:not(.vertical).path-bar > button:disabled, +.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, -.primary-toolbar .inline-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled { color: rgba(206, 214, 224, 0.6); } @@ -3862,9 +3831,9 @@ NautilusListView .view, NautilusListView iconview { background-color: #32404e; } .nemo-window .places-treeview { - -NemoPlacesTreeView-disk-full-bg-color: #454c58; - -NemoPlacesTreeView-disk-full-fg-color: rgba(100, 181, 246, 0.35); - -GtkTreeView-vertical-separator: 5; + -nemoplacestreeview-disk-full-bg-color: #454c58; + -nemoplacestreeview-disk-full-fg-color: rgba(100, 181, 246, 0.35); + -gtktreeview-vertical-separator: 5; } .nemo-window .places-treeview .view.cell:hover, .nemo-window .places-treeview iconview.cell:hover { background-color: rgba(100, 181, 246, 0.35); @@ -4426,7 +4395,7 @@ MatePanelAppletFrameDBus > MatePanelAppletFrameDBus { } .xfce4-panel.panel { - background-color: #393939; + background-color: rgba(16, 16, 16, 0.1); color: #ced6e0; } .xfce4-panel.panel frame > border { @@ -4590,20 +4559,23 @@ EvWindow .content-view .view:focus:selected { background: rgba(100, 181, 246, 0.35); color: #f2f5fc; } +.thunar toolbar, .thunar .inline-toolbar { + background-color: #4d535d; +} .thunar toolbar.horizontal button image, .thunar .horizontal.inline-toolbar button image { -gtk-icon-transform: scale(0.9); } calendar { color: #ced6e0; - border: 1px solid #6d798c; - border-radius: 3px; - padding: 2px; + border: 0; + border-radius: 0; + padding: 6px 4px; } calendar:selected { background-color: rgba(100, 181, 246, 0.35); color: #f2f5fc; - border-radius: 1.5px; + border-radius: 50%; } calendar.header { color: #ced6e0; @@ -4611,7 +4583,7 @@ calendar.header { border-radius: 0; } calendar.button, calendar.button:focus { - color: rgba(206, 214, 224, 0.45); + color: #64b5f6; border-color: transparent; background-color: transparent; background-image: none; @@ -4628,7 +4600,7 @@ calendar:indeterminate { color: alpha(currentColor,0.55); } calendar.highlight { - color: #ced6e0; + color: #fc7661; } #panel_window { diff --git a/gtk-3.0/sass/ui/applications.scss b/gtk-3.0/sass/ui/applications.scss index 0a61735..b9bb6a3 100644 --- a/gtk-3.0/sass/ui/applications.scss +++ b/gtk-3.0/sass/ui/applications.scss @@ -27,7 +27,8 @@ PantheonTerminalPantheonTerminalWindow .notebook { } &.header.top { - box-shadow: inset 0 1px opacify($header_border, 1), inset 0 -1px $borders_color; + box-shadow: inset 0 1px opacify($header_border, 1), + inset 0 -1px $borders_color; } } @@ -317,9 +318,9 @@ NautilusListView .view { } .places-treeview { - -NemoPlacesTreeView-disk-full-bg-color: $progress_bg_color; - -NemoPlacesTreeView-disk-full-fg-color: $progress_color; - -GtkTreeView-vertical-separator: 5; + -nemoplacestreeview-disk-full-bg-color: $progress_bg_color; + -nemoplacestreeview-disk-full-fg-color: $progress_color; + -gtktreeview-vertical-separator: 5; .view.cell:hover { background-color: $selected_bg_color; @@ -1003,7 +1004,7 @@ MatePanelAppletFrameDBus > MatePanelAppletFrameDBus { // Xfce Panel .xfce4-panel.panel { - background-color: #393939; + background-color: rgba(16, 16, 16, 0.1); color: $panel_fg; button { @@ -1240,6 +1241,9 @@ EvWindow .content-view .view:focus:selected { color: $selected_fg_color; } } + toolbar { + background-color: $wm_bg; + } toolbar.horizontal button image { -gtk-icon-transform: scale(0.9); diff --git a/gtk-3.0/sass/ui/calendar.scss b/gtk-3.0/sass/ui/calendar.scss index 955ef96..9b12779 100644 --- a/gtk-3.0/sass/ui/calendar.scss +++ b/gtk-3.0/sass/ui/calendar.scss @@ -3,14 +3,14 @@ // calendar { color: $fg_color; - border: 1px solid $borders_color; - border-radius: 3px; - padding: 2px; + border: 0; + border-radius: 0; + padding:6px 4px; &:selected { background-color: $selected_bg_color; color: $selected_fg_color; - border-radius: 1.5px; + border-radius: 50%; } &.header { color: $fg_color; @@ -19,7 +19,8 @@ calendar { } &.button, &.button:focus { - color: transparentize($fg_color, 0.55); + color: $highlight_color; + @include button(undecorated); &:hover { @@ -35,6 +36,6 @@ calendar { color: gtkalpha(currentColor, 0.55); } &.highlight { - color: $fg_color; + color: $error_color; } } \ No newline at end of file