Merge branch 'vinceliuice:master' into master

This commit is contained in:
Muhammad Rivan 2021-06-10 15:55:26 +07:00
commit 253d5727a0
11 changed files with 254 additions and 206 deletions

View File

@ -75,7 +75,7 @@ Usage: `./install.sh [OPTIONS...]`
-b, --background [default|blank|IMAGE_PATH] # Set gnome-shell background image. Default is BigSur-like wallpaper -b, --background [default|blank|IMAGE_PATH] # Set gnome-shell background image. Default is BigSur-like wallpaper
-N, --nautilus-style [default|stable|mojave|glassy] # Set Nautilus style. Default is stable (stabled sidebar) -N, --nautilus-style [stable|normal|mojave|glassy] # Set Nautilus style. Default is stable (stabled sidebar)
--round, --roundedmaxwindow # Set maximized window to rounded. Default is square --round, --roundedmaxwindow # Set maximized window to rounded. Default is square

View File

@ -32,7 +32,7 @@ usage() {
helpify "-i, --icon" "[$(IFS='|'; echo "${ICON_VARIANTS[*]}")]" "Set 'Activities' icon" "Default is 'standard'" helpify "-i, --icon" "[$(IFS='|'; echo "${ICON_VARIANTS[*]}")]" "Set 'Activities' icon" "Default is 'standard'"
# Not sure if "background" is even needed here # Not sure if "background" is even needed here
helpify "-b, --background" "[default|blank|IMAGE_PATH]" "Set gnome-shell background image" "Default is BigSur-like wallpaper" helpify "-b, --background" "[default|blank|IMAGE_PATH]" "Set gnome-shell background image" "Default is BigSur-like wallpaper"
helpify "-N, --nautilus-style" "[$(IFS='|'; echo "${NAUTILUS_STYLE_VARIANTS[*]}")]" "Set Nautilus style" "Default is BigSur-like style" helpify "-N, --nautilus-style" "[$(IFS='|'; echo "${NAUTILUS_STYLE_VARIANTS[*]}")]" "Set Nautilus style" "Default is BigSur-like style (stabled sidebar)"
helpify "-HD, --highdefinition" "" "Set to High Definition size" "Default is laptop size" helpify "-HD, --highdefinition" "" "Set to High Definition size" "Default is laptop size"
helpify "--normal, --normalshowapps" "" "Set gnome-shell show apps button style to normal" "Default is bigsur" helpify "--normal, --normalshowapps" "" "Set gnome-shell show apps button style to normal" "Default is bigsur"
helpify "--round, --roundedmaxwindow" "" "Set maximized window to rounded" "Default is square" helpify "--round, --roundedmaxwindow" "" "Set maximized window to rounded" "Default is square"

View File

@ -85,7 +85,7 @@ THEME_VARIANTS=('default' 'blue' 'purple' 'pink' 'red' 'orange' 'yellow' 'green'
ICON_VARIANTS=('standard' 'simple' 'gnome' 'ubuntu' 'arch' 'manjaro' 'fedora' 'debian' 'void') ICON_VARIANTS=('standard' 'simple' 'gnome' 'ubuntu' 'arch' 'manjaro' 'fedora' 'debian' 'void')
SIDEBAR_SIZE_VARIANTS=('default' '220' '240' '260' '280') SIDEBAR_SIZE_VARIANTS=('default' '220' '240' '260' '280')
PANEL_OPACITY_VARIANTS=('default' '30' '45' '60' '75') PANEL_OPACITY_VARIANTS=('default' '30' '45' '60' '75')
NAUTILUS_STYLE_VARIANTS=('default' 'stable' 'mojave' 'glassy') NAUTILUS_STYLE_VARIANTS=('stable' 'normal' 'mojave' 'glassy')
#--------Customization, default values----------# #--------Customization, default values----------#
dest="${THEME_DIR}" dest="${THEME_DIR}"
@ -97,7 +97,7 @@ themes=("${THEME_VARIANTS[0]}")
icon="${ICON_VARIANTS[0]}" icon="${ICON_VARIANTS[0]}"
sidebar_size="${SIDEBAR_SIZE_VARIANTS[0]}" sidebar_size="${SIDEBAR_SIZE_VARIANTS[0]}"
panel_opacity="${PANEL_OPACITY_VARIANTS[0]}" panel_opacity="${PANEL_OPACITY_VARIANTS[0]}"
nautilus_style="${NAUTILUS_STYLE_VARIANTS[1]}" nautilus_style="${NAUTILUS_STYLE_VARIANTS[0]}"
background="default" background="default"
compact="true" compact="true"

View File

@ -205,10 +205,10 @@ button.close {
display: none !important; display: none !important;
} }
.protections-popup-footer-button-label { .protections-popup-footer-button-label {
margin-inline-start: 0 !important; margin-inline-start: 0 !important;
} }
#protections-popup-footer-protection-type-label { #protections-popup-footer-protection-type-label {
margin-inline-end: 0 !important; margin-inline-end: 0 !important;
margin-block: 0 !important; margin-block: 0 !important;
} }

View File

@ -229,11 +229,20 @@ button.close:not(:active):hover,
#TabsToolbar .toolbarbutton-1:not(:active):not([open]):hover, #TabsToolbar .toolbarbutton-1:not(:active):not([open]):hover,
#protections-popup-info-button:hover, #protections-popup-info-button:hover,
.permission-popup-permission-remove-button:not(:active):hover { .permission-popup-permission-remove-button:not(:active):hover {
box-shadow: var(--gnome-button-box-shadow) !important; box-shadow: none !important;
border-color: var(--gnome-button-border-color) !important; border-color: var(--gnome-button-border-color) !important;
border-bottom-color: var(--gnome-button-border-accent-color) !important; border-bottom-color: var(--gnome-button-border-accent-color) !important;
} }
.subviewbutton-back:not(#hack):active,
.close-icon:not(.tab-close-button):active,
button.close:active,
#TabsToolbar .toolbarbutton-1:active,
#protections-popup-info-button:active,
.permission-popup-permission-remove-button:active {
box-shadow: none !important;
}
.close-icon:not(.tab-close-button) { .close-icon:not(.tab-close-button) {
background: transparent !important; background: transparent !important;
box-shadow: none !important; box-shadow: none !important;

View File

@ -498,8 +498,9 @@ menuitem[type="radio"]:not([disabled="true"]):hover .menu-iconic-icon {
#reload-button .toolbarbutton-icon, #reload-button .toolbarbutton-icon,
#stop-button .toolbarbutton-icon, #stop-button .toolbarbutton-icon,
#downloads-button .toolbarbutton-icon, #downloads-button .toolbarbutton-icon,
#nav-bar #sync-button .toolbarbutton-icon, #sync-button .toolbarbutton-icon,
#nav-bar #new-window-button .toolbarbutton-icon, #new-window-button .toolbarbutton-icon,
#screenshot-button .toolbarbutton-icon,
#tracking-protection-icon, #tracking-protection-icon,
#identity-icon, #identity-icon,
#pageActionButton, #pageActionButton,

View File

@ -12,164 +12,192 @@
} }
} }
/* Toolbars close button */ /* OPTIONAL: Use system theme icons instead of Adwaita icons included by theme */
.close-icon:not(.tab-close-button) { @supports -moz-bool-pref("gnomeTheme.systemIcons") {
list-style-image: url("moz-icon://stock/window-close-symbolic?size=dialog") !important; /* Window buttons */
} :root[tabsintitlebar] #titlebar .titlebar-button .toolbarbutton-icon,
.close-icon:not(.tab-close-button) image { :root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton .toolbarbutton-icon {
filter: var(--gnome-window-icons-hack-filter) !important; filter: var(--gnome-window-icons-hack-filter) !important;
} width: 16px;
}
/* Navbar icons */ :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-close .toolbarbutton-icon,
:root[tabsintitlebar] #titlebar #titlebar-close .toolbarbutton-icon {
/* Back button */ list-style-image: url("moz-icon://stock/window-close-symbolic?size=dialog") !important;
#nav-bar #back-button .toolbarbutton-icon { }
filter: var(--gnome-icons-hack-filter); :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-max .toolbarbutton-icon,
list-style-image: url("moz-icon://stock/go-previous-symbolic?size=dialog") !important; :root[tabsintitlebar] #titlebar #titlebar-max .toolbarbutton-icon {
} list-style-image: url("moz-icon://stock/window-maximize-symbolic?size=dialog") !important;
/* Forward button */ }
#nav-bar #forward-button .toolbarbutton-icon { :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-restore .toolbarbutton-icon {
filter: var(--gnome-icons-hack-filter); list-style-image: url("moz-icon://stock/window-restore-symbolic?size=dialog") !important;
list-style-image: url("moz-icon://stock/go-next-symbolic?size=dialog") !important; }
} :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-min .toolbarbutton-icon,
/* Menu button */ :root[tabsintitlebar] #titlebar #titlebar-min .toolbarbutton-icon {
#PanelUI-menu-button .toolbarbutton-icon { list-style-image: url("moz-icon://stock/window-minimize-symbolic?size=dialog") !important;
filter: var(--gnome-icons-hack-filter); }
list-style-image: url("moz-icon://stock/open-menu-symbolic?size=dialog") !important; :root[tabsintitlebar][inFullscreen] #window-controls #restore-button .toolbarbutton-icon {
} list-style-image: url("moz-icon://stock/view-restore-symbolic?size=dialog") !important;
/* New tab button */ }
#new-tab-button .toolbarbutton-icon {
filter: var(--gnome-icons-hack-filter); /* Toolbars close button */
list-style-image: url("moz-icon://stock/tab-new-symbolic?size=dialog") !important; .close-icon:not(.tab-close-button) {
} list-style-image: url("moz-icon://stock/window-close-symbolic?size=dialog") !important;
/* Home button */ }
#home-button .toolbarbutton-icon { .close-icon:not(.tab-close-button) image {
filter: var(--gnome-icons-hack-filter); filter: var(--gnome-window-icons-hack-filter) !important;
list-style-image: url("moz-icon://stock/user-home-symbolic?size=dialog") !important; }
}
/* Preferences button */ /* Navbar icons */
#preferences-button .toolbarbutton-icon {
filter: var(--gnome-icons-hack-filter); /* Back button */
list-style-image: url("moz-icon://stock/preferences-system-symbolic?size=dialog") !important; #nav-bar #back-button .toolbarbutton-icon {
} filter: var(--gnome-icons-hack-filter);
/* Fullscreen button */ list-style-image: url("moz-icon://stock/go-previous-symbolic?size=dialog") !important;
#fullscreen-button .toolbarbutton-icon { }
filter: var(--gnome-icons-hack-filter); /* Forward button */
list-style-image: url("moz-icon://stock/view-fullscreen-symbolic?size=dialog") !important; #nav-bar #forward-button .toolbarbutton-icon {
} filter: var(--gnome-icons-hack-filter);
/* Zoom out button */ list-style-image: url("moz-icon://stock/go-next-symbolic?size=dialog") !important;
#zoom-out-button .toolbarbutton-icon { }
filter: var(--gnome-icons-hack-filter); /* Menu button */
list-style-image: url("moz-icon://stock/zoom-out-symbolic?size=dialog") !important; #PanelUI-menu-button .toolbarbutton-icon {
} filter: var(--gnome-icons-hack-filter);
/* Zoom in button */ list-style-image: url("moz-icon://stock/open-menu-symbolic?size=dialog") !important;
#zoom-in-button .toolbarbutton-icon { }
filter: var(--gnome-icons-hack-filter); /* New tab button */
list-style-image: url("moz-icon://stock/zoom-in-symbolic?size=dialog") !important; #new-tab-button .toolbarbutton-icon {
} filter: var(--gnome-icons-hack-filter);
/* Developer button */ list-style-image: url("moz-icon://stock/tab-new-symbolic?size=dialog") !important;
#developer-button .toolbarbutton-icon { }
filter: var(--gnome-icons-hack-filter); /* Home button */
list-style-image: url("moz-icon://stock/applications-engineering-symbolic?size=dialog") !important; #home-button .toolbarbutton-icon {
} filter: var(--gnome-icons-hack-filter);
/* Email link button */ list-style-image: url("moz-icon://stock/user-home-symbolic?size=dialog") !important;
#email-link-button .toolbarbutton-icon { }
filter: var(--gnome-icons-hack-filter); /* Preferences button */
list-style-image: url("moz-icon://stock/mail-unread-symbolic?size=dialog") !important; #preferences-button .toolbarbutton-icon {
} filter: var(--gnome-icons-hack-filter);
/* Print button */ list-style-image: url("moz-icon://stock/preferences-system-symbolic?size=dialog") !important;
#print-button .toolbarbutton-icon { }
filter: var(--gnome-icons-hack-filter); /* Fullscreen button */
list-style-image: url("moz-icon://stock/printer-symbolic?size=dialog") !important; #fullscreen-button .toolbarbutton-icon {
} filter: var(--gnome-icons-hack-filter);
/* Addons button */ list-style-image: url("moz-icon://stock/view-fullscreen-symbolic?size=dialog") !important;
#add-ons-button .toolbarbutton-icon { }
filter: var(--gnome-icons-hack-filter); /* Zoom out button */
list-style-image: url("moz-icon://stock/application-x-addon-symbolic?size=dialog") !important; #zoom-out-button .toolbarbutton-icon {
} filter: var(--gnome-icons-hack-filter);
/* Find button */ list-style-image: url("moz-icon://stock/zoom-out-symbolic?size=dialog") !important;
#find-button .toolbarbutton-icon { }
filter: var(--gnome-icons-hack-filter); /* Zoom in button */
list-style-image: url("moz-icon://stock/edit-find-symbolic?size=dialog") !important; #zoom-in-button .toolbarbutton-icon {
} filter: var(--gnome-icons-hack-filter);
/* New window button */ list-style-image: url("moz-icon://stock/zoom-in-symbolic?size=dialog") !important;
#new-window-button .toolbarbutton-icon { }
filter: var(--gnome-icons-hack-filter); /* Developer button */
list-style-image: url("moz-icon://stock/window-new-symbolic?size=dialog") !important; #developer-button .toolbarbutton-icon {
} filter: var(--gnome-icons-hack-filter);
/* Bookmarks menu button */ list-style-image: url("moz-icon://stock/applications-engineering-symbolic?size=dialog") !important;
#bookmarks-menu-button .toolbarbutton-icon { }
filter: var(--gnome-icons-hack-filter); /* Email link button */
list-style-image: url("moz-icon://stock/starred-symbolic?size=dialog") !important; #email-link-button .toolbarbutton-icon {
} filter: var(--gnome-icons-hack-filter);
/* History button */ list-style-image: url("moz-icon://stock/mail-unread-symbolic?size=dialog") !important;
#history-panelmenu .toolbarbutton-icon { }
filter: var(--gnome-icons-hack-filter); /* Print button */
list-style-image: url("moz-icon://stock/preferences-system-time-symbolic?size=dialog") !important; #print-button .toolbarbutton-icon {
} filter: var(--gnome-icons-hack-filter);
/* All tabs button */ list-style-image: url("moz-icon://stock/printer-symbolic?size=dialog") !important;
#alltabs-button { }
list-style-image: url("moz-icon://stock/pan-down-symbolic?size=dialog") !important; /* Addons button */
} #add-ons-button .toolbarbutton-icon {
#alltabs-button .toolbarbutton-icon { filter: var(--gnome-icons-hack-filter);
filter: var(--gnome-icons-hack-filter); list-style-image: url("moz-icon://stock/application-x-addon-symbolic?size=dialog") !important;
} }
/* Cut button */ /* Find button */
#cut-button .toolbarbutton-icon { #find-button .toolbarbutton-icon {
filter: var(--gnome-icons-hack-filter); filter: var(--gnome-icons-hack-filter);
list-style-image: url("moz-icon://stock/edit-cut-symbolic?size=dialog") !important; list-style-image: url("moz-icon://stock/edit-find-symbolic?size=dialog") !important;
} }
/* Copy button */ /* New window button */
#copy-button .toolbarbutton-icon { #new-window-button .toolbarbutton-icon {
filter: var(--gnome-icons-hack-filter); filter: var(--gnome-icons-hack-filter);
list-style-image: url("moz-icon://stock/edit-copy-symbolic?size=dialog") !important; list-style-image: url("moz-icon://stock/window-new-symbolic?size=dialog") !important;
} }
/* Paste button */ /* Bookmarks menu button */
#paste-button .toolbarbutton-icon { #bookmarks-menu-button .toolbarbutton-icon {
filter: var(--gnome-icons-hack-filter); filter: var(--gnome-icons-hack-filter);
list-style-image: url("moz-icon://stock/edit-paste-symbolic?size=dialog") !important; list-style-image: url("moz-icon://stock/starred-symbolic?size=dialog") !important;
} }
/* History button */
/* Navbar overflow button */ #history-panelmenu .toolbarbutton-icon {
#nav-bar-overflow-button .toolbarbutton-icon { filter: var(--gnome-icons-hack-filter);
filter: var(--gnome-icons-hack-filter); list-style-image: url("moz-icon://stock/preferences-system-time-symbolic?size=dialog") !important;
list-style-image: url("moz-icon://stock/view-more-horizontal-symbolic?size=dialog") !important; }
} /* All tabs button */
#alltabs-button {
/* Context back button */ list-style-image: url("moz-icon://stock/pan-down-symbolic?size=dialog") !important;
#context-back .menu-iconic-icon { }
filter: var(--gnome-icons-hack-filter); #alltabs-button .toolbarbutton-icon {
list-style-image: url("moz-icon://stock/go-previous-symbolic?size=dialog") !important; filter: var(--gnome-icons-hack-filter);
} }
/* Context forward button */ /* Cut button */
#context-forward .menu-iconic-icon { #cut-button .toolbarbutton-icon {
filter: var(--gnome-icons-hack-filter); filter: var(--gnome-icons-hack-filter);
list-style-image: url("moz-icon://stock/go-next-symbolic?size=dialog") !important; list-style-image: url("moz-icon://stock/edit-cut-symbolic?size=dialog") !important;
} }
/* Copy button */
/* Main menu buttons icons */ #copy-button .toolbarbutton-icon {
#appMenu-zoomReduce-button .toolbarbutton-icon { filter: var(--gnome-icons-hack-filter);
filter: var(--gnome-icons-hack-filter); list-style-image: url("moz-icon://stock/edit-copy-symbolic?size=dialog") !important;
list-style-image: url("moz-icon://stock/zoom-out-symbolic?size=dialog") !important; }
} /* Paste button */
#appMenu-zoomEnlarge-button .toolbarbutton-icon { #paste-button .toolbarbutton-icon {
filter: var(--gnome-icons-hack-filter); filter: var(--gnome-icons-hack-filter);
list-style-image: url("moz-icon://stock/zoom-in-symbolic?size=dialog") !important; list-style-image: url("moz-icon://stock/edit-paste-symbolic?size=dialog") !important;
} }
#appMenu-fullscreen-button .toolbarbutton-icon {
filter: var(--gnome-icons-hack-filter); /* Navbar overflow button */
list-style-image: url("moz-icon://stock/view-fullscreen-symbolic?size=dialog") !important; #nav-bar-overflow-button .toolbarbutton-icon {
} filter: var(--gnome-icons-hack-filter);
#appMenu-cut-button .toolbarbutton-icon { list-style-image: url("moz-icon://stock/pan-down-symbolic?size=dialog") !important;
filter: var(--gnome-icons-hack-filter); }
list-style-image: url("moz-icon://stock/edit-cut-symbolic?size=dialog") !important;
} /* Context back button */
#appMenu-copy-button .toolbarbutton-icon { #context-back .menu-iconic-icon {
filter: var(--gnome-icons-hack-filter); filter: var(--gnome-icons-hack-filter);
list-style-image: url("moz-icon://stock/edit-copy-symbolic?size=dialog") !important; list-style-image: url("moz-icon://stock/go-previous-symbolic?size=dialog") !important;
} }
#appMenu-paste-button .toolbarbutton-icon { /* Context forward button */
filter: var(--gnome-icons-hack-filter); #context-forward .menu-iconic-icon {
list-style-image: url("moz-icon://stock/edit-paste-symbolic?size=dialog") !important; filter: var(--gnome-icons-hack-filter);
list-style-image: url("moz-icon://stock/go-next-symbolic?size=dialog") !important;
}
/* Main menu buttons icons */
#appMenu-zoomReduce-button .toolbarbutton-icon {
filter: var(--gnome-icons-hack-filter);
list-style-image: url("moz-icon://stock/zoom-out-symbolic?size=dialog") !important;
}
#appMenu-zoomEnlarge-button .toolbarbutton-icon {
filter: var(--gnome-icons-hack-filter);
list-style-image: url("moz-icon://stock/zoom-in-symbolic?size=dialog") !important;
}
#appMenu-fullscreen-button .toolbarbutton-icon {
filter: var(--gnome-icons-hack-filter);
list-style-image: url("moz-icon://stock/view-fullscreen-symbolic?size=dialog") !important;
}
#appMenu-cut-button .toolbarbutton-icon {
filter: var(--gnome-icons-hack-filter);
list-style-image: url("moz-icon://stock/edit-cut-symbolic?size=dialog") !important;
}
#appMenu-copy-button .toolbarbutton-icon {
filter: var(--gnome-icons-hack-filter);
list-style-image: url("moz-icon://stock/edit-copy-symbolic?size=dialog") !important;
}
#appMenu-paste-button .toolbarbutton-icon {
filter: var(--gnome-icons-hack-filter);
list-style-image: url("moz-icon://stock/edit-paste-symbolic?size=dialog") !important;
}
} }

View File

@ -185,17 +185,6 @@ $list_shadow: if($variant == 'light',
background-image: none; background-image: none;
box-shadow: none; box-shadow: none;
&.flat {
@include button(undecorated);
color: $selected_fg_color;
background-color: transparentize($selected_fg_color, 1);
background-image: none;
}
&.flat:disabled {
&, label { color: transparentize($selected_fg_color, 0.6); }
}
&:hover { &:hover {
color: $selected_fg_color; color: $selected_fg_color;
background-color: transparentize($selected_fg_color, 0.8); background-color: transparentize($selected_fg_color, 0.8);
@ -203,7 +192,7 @@ $list_shadow: if($variant == 'light',
box-shadow: none; box-shadow: none;
} }
&:active, &:active:hover, &:checked { &:active, &:checked {
color: $selected_fg_color; color: $selected_fg_color;
background-color: transparentize($selected_fg_color, 0.6); background-color: transparentize($selected_fg_color, 0.6);
border-color: transparentize($selected_fg_color, 0.5); border-color: transparentize($selected_fg_color, 0.5);
@ -1501,7 +1490,7 @@ actionbar {
transition: $button_transition; transition: $button_transition;
} }
&:active, &:active:hover { &:active {
@include button(header-active); @include button(header-active);
transition: $button_transition; transition: $button_transition;
transition-duration: 300ms; transition-duration: 300ms;
@ -1620,7 +1609,7 @@ actionbar {
transition: $button_transition; transition: $button_transition;
} }
&:active, &:active:hover { &:active {
@include button(header-active); @include button(header-active);
transition: $button_transition; transition: $button_transition;
transition-duration: 300ms; transition-duration: 300ms;
@ -1740,7 +1729,7 @@ actionbar {
@include button(header-hover); @include button(header-hover);
} }
&:active, &:active:hover { &:active {
@include button(header-active); @include button(header-active);
} }
@ -1766,8 +1755,8 @@ actionbar {
border-color: darken($selection_mode_bg, 4%); border-color: darken($selection_mode_bg, 4%);
} }
button { button:not(.flat):not(.suggested-action):not(.destructive-action):not(.titlebutton) {
@include button(undecorated); // @include button(undecorated);
@extend %selected-button; @extend %selected-button;
} }
@ -2618,7 +2607,7 @@ notebook {
background-color: rgba($borders_color, 0.1); background-color: rgba($borders_color, 0.1);
} }
&:active, &:active:hover { &:active {
@extend %undecorated_button; @extend %undecorated_button;
color: if($variant == 'light', darken($fg_color, 10%), lighten($fg_color, 10%)); color: if($variant == 'light', darken($fg_color, 10%), lighten($fg_color, 10%));
background-color: rgba($borders_color, 0.2); background-color: rgba($borders_color, 0.2);
@ -3446,8 +3435,6 @@ row {
background-color: if($variant == 'light', rgba(black, 0.15), rgba(white, 0.15)); background-color: if($variant == 'light', rgba(black, 0.15), rgba(white, 0.15));
label { color: $fg_color; } label { color: $fg_color; }
// button { @extend %selected-button; }
} }
&.activatable { &.activatable {
@ -3905,7 +3892,7 @@ paned {
// //
infobar { infobar {
border-style: none; border: none;
&.info { &.info {
& > revealer > box, & > revealer > box,
@ -3949,7 +3936,7 @@ infobar {
color: $selected_fg_color; color: $selected_fg_color;
caret-color: currentColor; caret-color: currentColor;
button { button:not(.flat) {
min-height: 28px; min-height: 28px;
@extend %selected-button; @extend %selected-button;
} }

View File

@ -30,7 +30,7 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
$base_color 100%); $base_color 100%);
} }
@if $nautilus_style == 'default' or $nautilus_style == 'glassy' { @if $nautilus_style == 'normal' or $nautilus_style == 'glassy' {
$dialog_header_image: linear-gradient(90deg, $dialog_bg_color 5%, $dialog_header_image: linear-gradient(90deg, $dialog_bg_color 5%,
$dark_header_bg 40%); $dark_header_bg 40%);
@ -44,12 +44,12 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
$header_border 25%); $header_border 25%);
} }
@if $nautilus_style == 'default' or $nautilus_style == 'stable' { @if $nautilus_style == 'normal' or $nautilus_style == 'stable' {
$nautilus_header_borders_image: linear-gradient(90deg, rgba($header_border, 0) $nautilus_sidebar_size, $nautilus_header_borders_image: linear-gradient(90deg, rgba($header_border, 0) $nautilus_sidebar_size,
$header_border $nautilus_sidebar_size); $header_border $nautilus_sidebar_size);
} }
@if $nautilus_style == 'stable' or $nautilus_style == 'default' { @if $nautilus_style == 'normal' or $nautilus_style == 'stable' {
$nautilus_header_image: linear-gradient(90deg, $dark_sidebar_bg $nautilus_sidebar_size, $nautilus_header_image: linear-gradient(90deg, $dark_sidebar_bg $nautilus_sidebar_size,
$nautilus_borders_color $nautilus_sidebar_size, $nautilus_borders_color $nautilus_sidebar_size,
$nautilus_borders_color ($nautilus_sidebar_size + 1px), $nautilus_borders_color ($nautilus_sidebar_size + 1px),
@ -79,7 +79,7 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
} }
> deck > box.vertical > headerbar.titlebar { > deck > box.vertical > headerbar.titlebar {
@if $nautilus_style == 'stable' or $nautilus_style == 'default' { @if $nautilus_style == 'normal' or $nautilus_style == 'stable' {
background-image: linear-gradient(90deg, rgba($dark_header_bg, 0) $nautilus_sidebar_size, background-image: linear-gradient(90deg, rgba($dark_header_bg, 0) $nautilus_sidebar_size,
$nautilus_borders_color $nautilus_sidebar_size, $nautilus_borders_color $nautilus_sidebar_size,
$nautilus_borders_color ($nautilus_sidebar_size + 1px), $nautilus_borders_color ($nautilus_sidebar_size + 1px),
@ -91,13 +91,13 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
> box.horizontal:first-child { // move the search button to right side > box.horizontal:first-child { // move the search button to right side
margin-right: -74px; margin-right: -74px;
@if $nautilus_style == 'default' or $nautilus_style == 'stable' { @if $nautilus_style == 'normal' or $nautilus_style == 'stable' {
entry.search { margin-left: if($placement == 'left', $container_padding, $nautilus_sidebar_size - 74px); } entry.search { margin-left: if($placement == 'left', $container_padding, $nautilus_sidebar_size - 74px); }
} }
} }
} }
@if $nautilus_style == 'default' or $nautilus_style == 'stable' { @if $nautilus_style == 'normal' or $nautilus_style == 'stable' {
&.maximized { &.maximized {
> deck > box.vertical > headerbar.titlebar { > deck > box.vertical > headerbar.titlebar {
> box.horizontal:first-child { // move the search button to right side > box.horizontal:first-child { // move the search button to right side
@ -124,7 +124,7 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
} }
} }
@if $nautilus_style == 'default' or $nautilus_style == 'stable' { @if $nautilus_style == 'normal' or $nautilus_style == 'stable' {
@if $placement == 'left' { @if $placement == 'left' {
> .linked.raised > button:first-child { margin-left: $nautilus_sidebar_size - (48px + $container_padding * 6); } > .linked.raised > button:first-child { margin-left: $nautilus_sidebar_size - (48px + $container_padding * 6); }
} }
@ -138,7 +138,7 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
&.maximized { &.maximized {
> headerbar.titlebar, > headerbar.titlebar,
> deck > box.vertical > headerbar.titlebar { > deck > box.vertical > headerbar.titlebar {
@if $nautilus_style == 'default' or $nautilus_style == 'stable' { @if $nautilus_style == 'normal' or $nautilus_style == 'stable' {
@if $placement == 'right' { @if $placement == 'right' {
.path-bar-box { margin-left: 0; } .path-bar-box { margin-left: 0; }
entry.search { margin-left: 0; } entry.search { margin-left: 0; }
@ -152,7 +152,7 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
border: none; border: none;
border-bottom-left-radius: $wm_radius; border-bottom-left-radius: $wm_radius;
@if $nautilus_style == 'stable' or $nautilus_style == 'default' { @if $nautilus_style == 'normal' or $nautilus_style == 'stable' {
min-width: $nautilus_sidebar_size; min-width: $nautilus_sidebar_size;
} }

View File

@ -41,13 +41,8 @@
paned > separator { background-image: image($solid_borders_color); } paned > separator { background-image: image($solid_borders_color); }
notebook {
background-color: $base_color;
}
// Rename entry
.nemo-window-pane { .nemo-window-pane {
widget.entry { widget.entry { // Rename entry
border: 2px solid if($variant =='light', $entry_highlight, $selected_bg_color); border: 2px solid if($variant =='light', $entry_highlight, $selected_bg_color);
background-color: $entry_bg; background-color: $entry_bg;
border-radius: $bt_radius; border-radius: $bt_radius;
@ -60,7 +55,7 @@
} }
} }
treeview.view { treeview.view { // Treeview rename entry
&, &:selected { &, &:selected {
entry { entry {
color: $fg_color; color: $fg_color;
@ -69,6 +64,14 @@
} }
} }
} }
> notebook {
background-color: $base_color;
infobar > revealer > box { border-bottom: 1px solid $borders_color; }
box.vertical > separator { background: none; }
}
} }
.toolbar { .toolbar {

View File

@ -226,3 +226,23 @@ window.thunar {
} }
} }
} }
//
// mousepad
//
window.background.csd {
> box.vertical > notebook > stack > scrolledwindow.frame {
border: none;
> textview {
background-color: $base_color;
> text {
background-color: transparent;
border-radius: 0 0 $wm_radius $wm_radius;
}
}
}
}