This commit is contained in:
Vince 2021-06-09 11:28:32 +08:00
parent 2b7737d4c6
commit 55be148032
6 changed files with 41 additions and 34 deletions

View file

@ -73,7 +73,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

@ -34,7 +34,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

@ -83,7 +83,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}"
@ -95,7 +95,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

@ -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 {
@ -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

@ -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;
}
}
}
}