From c0aca23c2652b10687bc4c4adeb8d873b26355d9 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Sat, 18 Jul 2020 18:22:07 +0800 Subject: [PATCH] update --- src/main/gtk-3.0/gtk-dark-solid.css | 29 +++++++++++++++++++--------- src/main/gtk-3.0/gtk-dark.css | 29 +++++++++++++++++++--------- src/main/gtk-3.0/gtk-light-solid.css | 29 +++++++++++++++++++--------- src/main/gtk-3.0/gtk-light.css | 29 +++++++++++++++++++--------- src/sass/gtk/_applications.scss | 4 ++++ src/sass/gtk/_common.scss | 16 +++++++++------ 6 files changed, 94 insertions(+), 42 deletions(-) diff --git a/src/main/gtk-3.0/gtk-dark-solid.css b/src/main/gtk-3.0/gtk-dark-solid.css index 6941a8e..5c202bb 100644 --- a/src/main/gtk-3.0/gtk-dark-solid.css +++ b/src/main/gtk-3.0/gtk-dark-solid.css @@ -4673,7 +4673,7 @@ headerbar button.titlebutton.minimize:active, } .budgie-menu button:checked, #MozillaGtkWidget.background > widget > scrolledwindow > textview text:selected, #MozillaGtkWidget.background > widget > scrolledwindow > textview text:selected:focus, -#MozillaGtkWidget.background > widget > scrolledwindow > textview text selection, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .view:selected:focus, textview text selection:focus, textview text selection, iconview:selected:focus, flowbox flowboxchild:selected, label:disabled selection, entry selection:focus, entry selection, menuitem.button.flat:active, .raven .raven-header:not(.top) button.button:active, menuitem.button.flat:active arrow, .raven .raven-header:not(.top) button.button:active arrow, menuitem.button.flat:selected, .raven .raven-header:not(.top) button.button:selected, menuitem.button.flat:selected arrow, .raven .raven-header:not(.top) button.button:selected arrow, +#MozillaGtkWidget.background > widget > scrolledwindow > textview text selection, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .emoji widget:hover, .view:selected:focus, textview text selection:focus, textview text selection, iconview:selected:focus, flowbox flowboxchild:selected, label:disabled selection, entry selection:focus, entry selection, menuitem.button.flat:active, .raven .raven-header:not(.top) button.button:active, menuitem.button.flat:active arrow, .raven .raven-header:not(.top) button.button:active arrow, menuitem.button.flat:selected, .raven .raven-header:not(.top) button.button:selected, menuitem.button.flat:selected arrow, .raven .raven-header:not(.top) button.button:selected arrow, modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, @@ -4684,7 +4684,7 @@ calendar:selected { } .budgie-menu button:disabled:checked, #MozillaGtkWidget.background > widget > scrolledwindow > textview text:disabled:selected, -#MozillaGtkWidget.background > widget > scrolledwindow > textview text selection:disabled, .nemo-window .nemo-window-pane widget.entry:disabled:selected { +#MozillaGtkWidget.background > widget > scrolledwindow > textview text selection:disabled, .nemo-window .nemo-window-pane widget.entry:disabled:selected, .emoji widget:disabled:hover { color: #84b0f9; } @@ -4724,12 +4724,22 @@ popover.emoji-picker scrolledwindow.view { } button.emoji-section { - margin: 2px 1px; + margin: 3px 1px; padding: 1px 12px; - border-radius: 14px; + border-radius: 6px; border: none; outline-offset: -2px; box-shadow: none; + transition: none; + animation: none; +} + +button.emoji-section:first-child { + margin-left: 6px; +} + +button.emoji-section:last-child { + margin-right: 6px; } .emoji { @@ -4739,11 +4749,8 @@ button.emoji-section { } .emoji widget { - transition: all 100ms cubic-bezier(0, 0, 0.2, 1); -} - -.emoji widget:hover { - font-size: larger; + border-radius: 6px; + transition: none; } .mate-terminal notebook > header.top > tabs > tab { @@ -4875,6 +4882,10 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo border-radius: 0 0 16px 16px; } +.nautilus-window notebook > stack { + background-color: #242424; +} + .nautilus-window notebook > stack:not(:only-child) searchbar { background-color: transparent; } diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css index 6f7b118..42ca321 100644 --- a/src/main/gtk-3.0/gtk-dark.css +++ b/src/main/gtk-3.0/gtk-dark.css @@ -4673,7 +4673,7 @@ headerbar button.titlebutton.minimize:active, } .budgie-menu button:checked, #MozillaGtkWidget.background > widget > scrolledwindow > textview text:selected, #MozillaGtkWidget.background > widget > scrolledwindow > textview text:selected:focus, -#MozillaGtkWidget.background > widget > scrolledwindow > textview text selection, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .view:selected:focus, textview text selection:focus, textview text selection, iconview:selected:focus, flowbox flowboxchild:selected, label:disabled selection, entry selection:focus, entry selection, menuitem.button.flat:active, .raven .raven-header:not(.top) button.button:active, menuitem.button.flat:active arrow, .raven .raven-header:not(.top) button.button:active arrow, menuitem.button.flat:selected, .raven .raven-header:not(.top) button.button:selected, menuitem.button.flat:selected arrow, .raven .raven-header:not(.top) button.button:selected arrow, +#MozillaGtkWidget.background > widget > scrolledwindow > textview text selection, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .emoji widget:hover, .view:selected:focus, textview text selection:focus, textview text selection, iconview:selected:focus, flowbox flowboxchild:selected, label:disabled selection, entry selection:focus, entry selection, menuitem.button.flat:active, .raven .raven-header:not(.top) button.button:active, menuitem.button.flat:active arrow, .raven .raven-header:not(.top) button.button:active arrow, menuitem.button.flat:selected, .raven .raven-header:not(.top) button.button:selected, menuitem.button.flat:selected arrow, .raven .raven-header:not(.top) button.button:selected arrow, modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, @@ -4684,7 +4684,7 @@ calendar:selected { } .budgie-menu button:disabled:checked, #MozillaGtkWidget.background > widget > scrolledwindow > textview text:disabled:selected, -#MozillaGtkWidget.background > widget > scrolledwindow > textview text selection:disabled, .nemo-window .nemo-window-pane widget.entry:disabled:selected { +#MozillaGtkWidget.background > widget > scrolledwindow > textview text selection:disabled, .nemo-window .nemo-window-pane widget.entry:disabled:selected, .emoji widget:disabled:hover { color: #84b0f9; } @@ -4724,12 +4724,22 @@ popover.emoji-picker scrolledwindow.view { } button.emoji-section { - margin: 2px 1px; + margin: 3px 1px; padding: 1px 12px; - border-radius: 14px; + border-radius: 6px; border: none; outline-offset: -2px; box-shadow: none; + transition: none; + animation: none; +} + +button.emoji-section:first-child { + margin-left: 6px; +} + +button.emoji-section:last-child { + margin-right: 6px; } .emoji { @@ -4739,11 +4749,8 @@ button.emoji-section { } .emoji widget { - transition: all 100ms cubic-bezier(0, 0, 0.2, 1); -} - -.emoji widget:hover { - font-size: larger; + border-radius: 6px; + transition: none; } .mate-terminal notebook > header.top > tabs > tab { @@ -4875,6 +4882,10 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo border-radius: 0 0 16px 16px; } +.nautilus-window notebook > stack { + background-color: #242424; +} + .nautilus-window notebook > stack:not(:only-child) searchbar { background-color: transparent; } diff --git a/src/main/gtk-3.0/gtk-light-solid.css b/src/main/gtk-3.0/gtk-light-solid.css index 625d7a2..224e9e9 100644 --- a/src/main/gtk-3.0/gtk-light-solid.css +++ b/src/main/gtk-3.0/gtk-light-solid.css @@ -4697,7 +4697,7 @@ headerbar button.titlebutton.minimize:active, } .budgie-menu button:checked, #MozillaGtkWidget.background > widget > scrolledwindow > textview text:selected, #MozillaGtkWidget.background > widget > scrolledwindow > textview text:selected:focus, -#MozillaGtkWidget.background > widget > scrolledwindow > textview text selection, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .view:selected:focus, textview text selection:focus, textview text selection, iconview:selected:focus, flowbox flowboxchild:selected, label:disabled selection, entry selection:focus, entry selection, menuitem.button.flat:active, .raven .raven-header:not(.top) button.button:active, menuitem.button.flat:active arrow, .raven .raven-header:not(.top) button.button:active arrow, menuitem.button.flat:selected, .raven .raven-header:not(.top) button.button:selected, menuitem.button.flat:selected arrow, .raven .raven-header:not(.top) button.button:selected arrow, +#MozillaGtkWidget.background > widget > scrolledwindow > textview text selection, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .emoji widget:hover, .view:selected:focus, textview text selection:focus, textview text selection, iconview:selected:focus, flowbox flowboxchild:selected, label:disabled selection, entry selection:focus, entry selection, menuitem.button.flat:active, .raven .raven-header:not(.top) button.button:active, menuitem.button.flat:active arrow, .raven .raven-header:not(.top) button.button:active arrow, menuitem.button.flat:selected, .raven .raven-header:not(.top) button.button:selected, menuitem.button.flat:selected arrow, .raven .raven-header:not(.top) button.button:selected arrow, modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, @@ -4708,7 +4708,7 @@ calendar:selected { } .budgie-menu button:disabled:checked, #MozillaGtkWidget.background > widget > scrolledwindow > textview text:disabled:selected, -#MozillaGtkWidget.background > widget > scrolledwindow > textview text selection:disabled, .nemo-window .nemo-window-pane widget.entry:disabled:selected { +#MozillaGtkWidget.background > widget > scrolledwindow > textview text selection:disabled, .nemo-window .nemo-window-pane widget.entry:disabled:selected, .emoji widget:disabled:hover { color: #84b0f9; } @@ -4748,12 +4748,22 @@ popover.emoji-picker scrolledwindow.view { } button.emoji-section { - margin: 2px 1px; + margin: 3px 1px; padding: 1px 12px; - border-radius: 14px; + border-radius: 6px; border: none; outline-offset: -2px; box-shadow: none; + transition: none; + animation: none; +} + +button.emoji-section:first-child { + margin-left: 6px; +} + +button.emoji-section:last-child { + margin-right: 6px; } .emoji { @@ -4763,11 +4773,8 @@ button.emoji-section { } .emoji widget { - transition: all 100ms cubic-bezier(0, 0, 0.2, 1); -} - -.emoji widget:hover { - font-size: larger; + border-radius: 6px; + transition: none; } .mate-terminal notebook > header.top > tabs > tab { @@ -4899,6 +4906,10 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo border-radius: 0 0 16px 16px; } +.nautilus-window notebook > stack { + background-color: #ffffff; +} + .nautilus-window notebook > stack:not(:only-child) searchbar { background-color: transparent; } diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css index fe763de..aacfe22 100644 --- a/src/main/gtk-3.0/gtk-light.css +++ b/src/main/gtk-3.0/gtk-light.css @@ -4697,7 +4697,7 @@ headerbar button.titlebutton.minimize:active, } .budgie-menu button:checked, #MozillaGtkWidget.background > widget > scrolledwindow > textview text:selected, #MozillaGtkWidget.background > widget > scrolledwindow > textview text:selected:focus, -#MozillaGtkWidget.background > widget > scrolledwindow > textview text selection, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .view:selected:focus, textview text selection:focus, textview text selection, iconview:selected:focus, flowbox flowboxchild:selected, label:disabled selection, entry selection:focus, entry selection, menuitem.button.flat:active, .raven .raven-header:not(.top) button.button:active, menuitem.button.flat:active arrow, .raven .raven-header:not(.top) button.button:active arrow, menuitem.button.flat:selected, .raven .raven-header:not(.top) button.button:selected, menuitem.button.flat:selected arrow, .raven .raven-header:not(.top) button.button:selected arrow, +#MozillaGtkWidget.background > widget > scrolledwindow > textview text selection, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .emoji widget:hover, .view:selected:focus, textview text selection:focus, textview text selection, iconview:selected:focus, flowbox flowboxchild:selected, label:disabled selection, entry selection:focus, entry selection, menuitem.button.flat:active, .raven .raven-header:not(.top) button.button:active, menuitem.button.flat:active arrow, .raven .raven-header:not(.top) button.button:active arrow, menuitem.button.flat:selected, .raven .raven-header:not(.top) button.button:selected, menuitem.button.flat:selected arrow, .raven .raven-header:not(.top) button.button:selected arrow, modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, @@ -4708,7 +4708,7 @@ calendar:selected { } .budgie-menu button:disabled:checked, #MozillaGtkWidget.background > widget > scrolledwindow > textview text:disabled:selected, -#MozillaGtkWidget.background > widget > scrolledwindow > textview text selection:disabled, .nemo-window .nemo-window-pane widget.entry:disabled:selected { +#MozillaGtkWidget.background > widget > scrolledwindow > textview text selection:disabled, .nemo-window .nemo-window-pane widget.entry:disabled:selected, .emoji widget:disabled:hover { color: #84b0f9; } @@ -4748,12 +4748,22 @@ popover.emoji-picker scrolledwindow.view { } button.emoji-section { - margin: 2px 1px; + margin: 3px 1px; padding: 1px 12px; - border-radius: 14px; + border-radius: 6px; border: none; outline-offset: -2px; box-shadow: none; + transition: none; + animation: none; +} + +button.emoji-section:first-child { + margin-left: 6px; +} + +button.emoji-section:last-child { + margin-right: 6px; } .emoji { @@ -4763,11 +4773,8 @@ button.emoji-section { } .emoji widget { - transition: all 100ms cubic-bezier(0, 0, 0.2, 1); -} - -.emoji widget:hover { - font-size: larger; + border-radius: 6px; + transition: none; } .mate-terminal notebook > header.top > tabs > tab { @@ -4899,6 +4906,10 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo border-radius: 0 0 16px 16px; } +.nautilus-window notebook > stack { + background-color: #ffffff; +} + .nautilus-window notebook > stack:not(:only-child) searchbar { background-color: transparent; } diff --git a/src/sass/gtk/_applications.scss b/src/sass/gtk/_applications.scss index 9a8fad9..3bfce93 100644 --- a/src/sass/gtk/_applications.scss +++ b/src/sass/gtk/_applications.scss @@ -153,6 +153,10 @@ $nautilus_image: linear-gradient(90deg, $dark_sidebar_bg 0%, border-radius: 0 0 $nautilus_radius $nautilus_radius; } + > stack { + background-color: $base_color; + } + > stack:not(:only-child) { searchbar { background-color: transparent; } } diff --git a/src/sass/gtk/_common.scss b/src/sass/gtk/_common.scss index d16f7d6..bb5bd6a 100644 --- a/src/sass/gtk/_common.scss +++ b/src/sass/gtk/_common.scss @@ -4003,14 +4003,17 @@ popover.emoji-picker { // mimic tab style button.emoji-section { - margin: 2px 1px; + margin: 3px 1px; padding: 1px 12px; - border-radius: $wm_radius; + border-radius: $bt_radius; border: none; outline-offset: -2px; box-shadow: none; - // &:first-child { border-radius: 0 0 0 $wm_radius; } - // &:last-child { border-radius: 0 0 $wm_radius 0; } + transition: none; + animation: none; + + &:first-child { margin-left: 6px; } + &:last-child { margin-right: 6px; } } .emoji { @@ -4020,8 +4023,9 @@ button.emoji-section { // font-size: large; widget { - transition: $shorter_transition; + border-radius: $bt_radius; + transition: none; - &:hover { font-size: larger; } + &:hover { @extend %selected_items; } } }