Fixed issues

This commit is contained in:
Vince
2021-12-11 00:11:10 +08:00
parent e6c89a5ee5
commit c95f3dfdcf
27 changed files with 1019 additions and 3018 deletions

View File

@@ -26,20 +26,23 @@ Run the following commands in the terminal:
> Tip: `./install.sh` allows the following options:
```
-d, --dest DIR Specify destination directory (Default: /usr/share/themes)
-n, --name NAME Specify theme name (Default: Graphite)
-d, --dest DIR Specify destination directory (Default: ~/.themes)
-n, --name NAME Specify theme name (Default: Colloid)
-t, --theme VARIANT... Specify theme color variant(s) [default|purple|pink|red|orange|yellow|green|teal|grey|all] (Default: blue)
-c, --color VARIANT... Specify color variant(s) [standard|light|dark] (Default: All variants)
-s, --size VARIANT... Specify size variant [standard|compact] (Default: standard variant)
--tweaks Specify versions for tweaks [nord|black|rimless] (nord can not mix use with black !)
--tweaks Specify versions for tweaks [nord|black|rimless|normal] (only nord and black can not mix use!)
1. nord: Nord color version
2. black: Blackness color version
3. rimless: Remove the 2px outline about windows and menus
4. normal: normal windows button style
-h, --help Show help
```
> For more information, run: `./install.sh --help`
![tweaks](tweaks.png?raw=true)
### Flatpak Installation
Automatically install your host GTK+ theme as a Flatpak. Use this:

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 12 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

View File

@@ -327,6 +327,11 @@ while [[ $# -gt 0 ]]; do
echo -e "Install Rimless version! ..."
shift
;;
normal)
normal="true"
echo -e "Install Normal window button version! ..."
shift
;;
-*)
break
;;
@@ -405,6 +410,10 @@ border_rimless() {
sed -i "/\$rimless:/s/false/true/" ${SRC_DIR}/sass/_tweaks-temp.scss
}
normal_winbutton() {
sed -i "/\$window_button:/s/mac/normal/" ${SRC_DIR}/sass/_tweaks-temp.scss
}
theme_color() {
if [[ "$theme" != '' ]]; then
case "$theme" in
@@ -438,7 +447,7 @@ theme_color() {
}
theme_tweaks() {
if [[ "$accent" == 'true' || "$compact" == 'true' || "$nord" == 'true' || "$rimless" == 'true' || "$blackness" == 'true' ]]; then
if [[ "$accent" == 'true' || "$compact" == 'true' || "$nord" == 'true' || "$rimless" == 'true' || "$blackness" == 'true' || "$normal" == 'true' ]]; then
tweaks='true'
install_package; tweaks_temp
fi
@@ -462,6 +471,10 @@ theme_tweaks() {
if [[ "$rimless" = "true" ]] ; then
border_rimless
fi
if [[ "$normal" = "true" ]] ; then
normal_winbutton
fi
}
install_theme() {

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -3330,40 +3330,40 @@ stack scrolledwindow.frame viewport.frame list {
}
overshoot.top {
background-size: 200% 70%;
background-image: radial-gradient(farthest-side at top, rgba(91, 155, 248, 0.24) 99%, rgba(91, 155, 248, 0) 100%);
background-image: radial-gradient(farthest-side at top, alpha(currentColor, 0.12) 85%, alpha(currentColor, 0)), radial-gradient(farthest-side at top, alpha(currentColor, 0.05), alpha(currentColor, 0));
background-size: 100% 3%, 100% 50%;
background-repeat: no-repeat;
background-position: center top;
background-position: top;
background-color: transparent;
border: none;
box-shadow: none;
}
overshoot.bottom {
background-size: 200% 70%;
background-image: radial-gradient(farthest-side at bottom, rgba(91, 155, 248, 0.24) 99%, rgba(91, 155, 248, 0) 100%);
background-image: radial-gradient(farthest-side at bottom, alpha(currentColor, 0.12) 85%, alpha(currentColor, 0)), radial-gradient(farthest-side at bottom, alpha(currentColor, 0.05), alpha(currentColor, 0));
background-size: 100% 3%, 100% 50%;
background-repeat: no-repeat;
background-position: center bottom;
background-position: bottom;
background-color: transparent;
border: none;
box-shadow: none;
}
overshoot.left {
background-size: 200% 70%;
background-image: radial-gradient(farthest-side at left, rgba(91, 155, 248, 0.24) 99%, rgba(91, 155, 248, 0) 100%);
background-image: radial-gradient(farthest-side at left, alpha(currentColor, 0.12) 85%, alpha(currentColor, 0)), radial-gradient(farthest-side at left, alpha(currentColor, 0.05), alpha(currentColor, 0));
background-size: 3% 100%, 50% 100%;
background-repeat: no-repeat;
background-position: left center;
background-position: left;
background-color: transparent;
border: none;
box-shadow: none;
}
overshoot.right {
background-size: 200% 70%;
background-image: radial-gradient(farthest-side at right, rgba(91, 155, 248, 0.24) 99%, rgba(91, 155, 248, 0) 100%);
background-image: radial-gradient(farthest-side at right, alpha(currentColor, 0.12) 85%, alpha(currentColor, 0)), radial-gradient(farthest-side at right, alpha(currentColor, 0.05), alpha(currentColor, 0));
background-size: 3% 100%, 50% 100%;
background-repeat: no-repeat;
background-position: right center;
background-position: right;
background-color: transparent;
border: none;
box-shadow: none;
@@ -4345,6 +4345,57 @@ window.csd.maximized, window.csd.fullscreen, window.csd.tiled, window.csd.tiled-
border-radius: 0;
}
windowcontrols button:not(.suggested-action):not(.destructive-action) {
min-height: 16px;
min-width: 16px;
padding: 0;
margin: 0 4px;
}
windowcontrols button.minimize:not(.suggested-action):not(.destructive-action), windowcontrols button.maximize:not(.suggested-action):not(.destructive-action), windowcontrols button.close:not(.suggested-action):not(.destructive-action) {
color: transparent;
}
windowcontrols button.minimize:not(.suggested-action):not(.destructive-action) image, windowcontrols button.maximize:not(.suggested-action):not(.destructive-action) image, windowcontrols button.close:not(.suggested-action):not(.destructive-action) image {
padding: 0;
}
windowcontrols button.minimize:hover:not(.suggested-action):not(.destructive-action), windowcontrols button.minimize:active:not(.suggested-action):not(.destructive-action), windowcontrols button.maximize:hover:not(.suggested-action):not(.destructive-action), windowcontrols button.maximize:active:not(.suggested-action):not(.destructive-action), windowcontrols button.close:hover:not(.suggested-action):not(.destructive-action), windowcontrols button.close:active:not(.suggested-action):not(.destructive-action) {
color: white;
}
windowcontrols button.minimize:backdrop:not(.suggested-action):not(.destructive-action), windowcontrols button.maximize:backdrop:not(.suggested-action):not(.destructive-action), windowcontrols button.close:backdrop:not(.suggested-action):not(.destructive-action) {
background-color: rgba(255, 255, 255, 0.3);
}
windowcontrols button.minimize:backdrop:hover:not(.suggested-action):not(.destructive-action), windowcontrols button.minimize:backdrop:active:not(.suggested-action):not(.destructive-action), windowcontrols button.maximize:backdrop:hover:not(.suggested-action):not(.destructive-action), windowcontrols button.maximize:backdrop:active:not(.suggested-action):not(.destructive-action), windowcontrols button.close:backdrop:hover:not(.suggested-action):not(.destructive-action), windowcontrols button.close:backdrop:active:not(.suggested-action):not(.destructive-action) {
color: rgba(255, 255, 255, 0.5);
}
windowcontrols button.minimize:not(.suggested-action):not(.destructive-action) {
background-color: #fdbe04;
}
windowcontrols button.minimize:active:not(.suggested-action):not(.destructive-action) {
background-color: #fece43;
}
windowcontrols button.maximize:not(.suggested-action):not(.destructive-action) {
background-color: #38c76a;
}
windowcontrols button.maximize:active:not(.suggested-action):not(.destructive-action) {
background-color: #6ad58f;
}
windowcontrols button.close:not(.suggested-action):not(.destructive-action) {
background-color: #fd5f51;
}
windowcontrols button.close:active:not(.suggested-action):not(.destructive-action) {
background-color: #fe877d;
}
windowcontrols {
border-spacing: 6px;
}
@@ -4359,57 +4410,6 @@ windowcontrols:not(.empty).start:dir(rtl), windowcontrols:not(.empty).end:dir(lt
margin-right: 6px;
}
windowcontrols button:not(.suggested-action):not(.destructive-action) {
min-height: 16px;
min-width: 16px;
padding: 0;
margin: 0 4px;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).minimize, windowcontrols button:not(.suggested-action):not(.destructive-action).maximize, windowcontrols button:not(.suggested-action):not(.destructive-action).close {
color: transparent;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).minimize image, windowcontrols button:not(.suggested-action):not(.destructive-action).maximize image, windowcontrols button:not(.suggested-action):not(.destructive-action).close image {
padding: 0;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).minimize:hover, windowcontrols button:not(.suggested-action):not(.destructive-action).minimize:active, windowcontrols button:not(.suggested-action):not(.destructive-action).maximize:hover, windowcontrols button:not(.suggested-action):not(.destructive-action).maximize:active, windowcontrols button:not(.suggested-action):not(.destructive-action).close:hover, windowcontrols button:not(.suggested-action):not(.destructive-action).close:active {
color: white;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).minimize:backdrop, windowcontrols button:not(.suggested-action):not(.destructive-action).maximize:backdrop, windowcontrols button:not(.suggested-action):not(.destructive-action).close:backdrop {
background-color: rgba(255, 255, 255, 0.3);
}
windowcontrols button:not(.suggested-action):not(.destructive-action).minimize:backdrop:hover, windowcontrols button:not(.suggested-action):not(.destructive-action).minimize:backdrop:active, windowcontrols button:not(.suggested-action):not(.destructive-action).maximize:backdrop:hover, windowcontrols button:not(.suggested-action):not(.destructive-action).maximize:backdrop:active, windowcontrols button:not(.suggested-action):not(.destructive-action).close:backdrop:hover, windowcontrols button:not(.suggested-action):not(.destructive-action).close:backdrop:active {
color: rgba(255, 255, 255, 0.5);
}
windowcontrols button:not(.suggested-action):not(.destructive-action).minimize {
background-color: #fdbe04;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).minimize:active {
background-color: #fece43;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).maximize {
background-color: #38c76a;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).maximize:active {
background-color: #6ad58f;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).close {
background-color: #fd5f51;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).close:active {
background-color: #fe877d;
}
gridview > child:selected, modelbutton.flat:selected, row:selected, calendar:selected, calendar > grid > label.day-number:selected {
background-color: alpha(currentColor, 0.06);
}

View File

@@ -3330,40 +3330,40 @@ stack scrolledwindow.frame viewport.frame list {
}
overshoot.top {
background-size: 200% 70%;
background-image: radial-gradient(farthest-side at top, rgba(60, 132, 247, 0.24) 99%, rgba(60, 132, 247, 0) 100%);
background-image: radial-gradient(farthest-side at top, alpha(currentColor, 0.12) 85%, alpha(currentColor, 0)), radial-gradient(farthest-side at top, alpha(currentColor, 0.05), alpha(currentColor, 0));
background-size: 100% 3%, 100% 50%;
background-repeat: no-repeat;
background-position: center top;
background-position: top;
background-color: transparent;
border: none;
box-shadow: none;
}
overshoot.bottom {
background-size: 200% 70%;
background-image: radial-gradient(farthest-side at bottom, rgba(60, 132, 247, 0.24) 99%, rgba(60, 132, 247, 0) 100%);
background-image: radial-gradient(farthest-side at bottom, alpha(currentColor, 0.12) 85%, alpha(currentColor, 0)), radial-gradient(farthest-side at bottom, alpha(currentColor, 0.05), alpha(currentColor, 0));
background-size: 100% 3%, 100% 50%;
background-repeat: no-repeat;
background-position: center bottom;
background-position: bottom;
background-color: transparent;
border: none;
box-shadow: none;
}
overshoot.left {
background-size: 200% 70%;
background-image: radial-gradient(farthest-side at left, rgba(60, 132, 247, 0.24) 99%, rgba(60, 132, 247, 0) 100%);
background-image: radial-gradient(farthest-side at left, alpha(currentColor, 0.12) 85%, alpha(currentColor, 0)), radial-gradient(farthest-side at left, alpha(currentColor, 0.05), alpha(currentColor, 0));
background-size: 3% 100%, 50% 100%;
background-repeat: no-repeat;
background-position: left center;
background-position: left;
background-color: transparent;
border: none;
box-shadow: none;
}
overshoot.right {
background-size: 200% 70%;
background-image: radial-gradient(farthest-side at right, rgba(60, 132, 247, 0.24) 99%, rgba(60, 132, 247, 0) 100%);
background-image: radial-gradient(farthest-side at right, alpha(currentColor, 0.12) 85%, alpha(currentColor, 0)), radial-gradient(farthest-side at right, alpha(currentColor, 0.05), alpha(currentColor, 0));
background-size: 3% 100%, 50% 100%;
background-repeat: no-repeat;
background-position: right center;
background-position: right;
background-color: transparent;
border: none;
box-shadow: none;
@@ -4345,6 +4345,57 @@ window.csd.maximized, window.csd.fullscreen, window.csd.tiled, window.csd.tiled-
border-radius: 0;
}
windowcontrols button:not(.suggested-action):not(.destructive-action) {
min-height: 16px;
min-width: 16px;
padding: 0;
margin: 0 4px;
}
windowcontrols button.minimize:not(.suggested-action):not(.destructive-action), windowcontrols button.maximize:not(.suggested-action):not(.destructive-action), windowcontrols button.close:not(.suggested-action):not(.destructive-action) {
color: transparent;
}
windowcontrols button.minimize:not(.suggested-action):not(.destructive-action) image, windowcontrols button.maximize:not(.suggested-action):not(.destructive-action) image, windowcontrols button.close:not(.suggested-action):not(.destructive-action) image {
padding: 0;
}
windowcontrols button.minimize:hover:not(.suggested-action):not(.destructive-action), windowcontrols button.minimize:active:not(.suggested-action):not(.destructive-action), windowcontrols button.maximize:hover:not(.suggested-action):not(.destructive-action), windowcontrols button.maximize:active:not(.suggested-action):not(.destructive-action), windowcontrols button.close:hover:not(.suggested-action):not(.destructive-action), windowcontrols button.close:active:not(.suggested-action):not(.destructive-action) {
color: white;
}
windowcontrols button.minimize:backdrop:not(.suggested-action):not(.destructive-action), windowcontrols button.maximize:backdrop:not(.suggested-action):not(.destructive-action), windowcontrols button.close:backdrop:not(.suggested-action):not(.destructive-action) {
background-color: rgba(0, 0, 0, 0.26);
}
windowcontrols button.minimize:backdrop:hover:not(.suggested-action):not(.destructive-action), windowcontrols button.minimize:backdrop:active:not(.suggested-action):not(.destructive-action), windowcontrols button.maximize:backdrop:hover:not(.suggested-action):not(.destructive-action), windowcontrols button.maximize:backdrop:active:not(.suggested-action):not(.destructive-action), windowcontrols button.close:backdrop:hover:not(.suggested-action):not(.destructive-action), windowcontrols button.close:backdrop:active:not(.suggested-action):not(.destructive-action) {
color: rgba(0, 0, 0, 0.38);
}
windowcontrols button.minimize:not(.suggested-action):not(.destructive-action) {
background-color: #fdbe04;
}
windowcontrols button.minimize:active:not(.suggested-action):not(.destructive-action) {
background-color: rgba(201, 151, 3, 0.9675);
}
windowcontrols button.maximize:not(.suggested-action):not(.destructive-action) {
background-color: #38c76a;
}
windowcontrols button.maximize:active:not(.suggested-action):not(.destructive-action) {
background-color: rgba(45, 158, 84, 0.9675);
}
windowcontrols button.close:not(.suggested-action):not(.destructive-action) {
background-color: #fd5f51;
}
windowcontrols button.close:active:not(.suggested-action):not(.destructive-action) {
background-color: rgba(201, 76, 64, 0.9675);
}
windowcontrols {
border-spacing: 6px;
}
@@ -4359,57 +4410,6 @@ windowcontrols:not(.empty).start:dir(rtl), windowcontrols:not(.empty).end:dir(lt
margin-right: 6px;
}
windowcontrols button:not(.suggested-action):not(.destructive-action) {
min-height: 16px;
min-width: 16px;
padding: 0;
margin: 0 4px;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).minimize, windowcontrols button:not(.suggested-action):not(.destructive-action).maximize, windowcontrols button:not(.suggested-action):not(.destructive-action).close {
color: transparent;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).minimize image, windowcontrols button:not(.suggested-action):not(.destructive-action).maximize image, windowcontrols button:not(.suggested-action):not(.destructive-action).close image {
padding: 0;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).minimize:hover, windowcontrols button:not(.suggested-action):not(.destructive-action).minimize:active, windowcontrols button:not(.suggested-action):not(.destructive-action).maximize:hover, windowcontrols button:not(.suggested-action):not(.destructive-action).maximize:active, windowcontrols button:not(.suggested-action):not(.destructive-action).close:hover, windowcontrols button:not(.suggested-action):not(.destructive-action).close:active {
color: white;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).minimize:backdrop, windowcontrols button:not(.suggested-action):not(.destructive-action).maximize:backdrop, windowcontrols button:not(.suggested-action):not(.destructive-action).close:backdrop {
background-color: rgba(0, 0, 0, 0.26);
}
windowcontrols button:not(.suggested-action):not(.destructive-action).minimize:backdrop:hover, windowcontrols button:not(.suggested-action):not(.destructive-action).minimize:backdrop:active, windowcontrols button:not(.suggested-action):not(.destructive-action).maximize:backdrop:hover, windowcontrols button:not(.suggested-action):not(.destructive-action).maximize:backdrop:active, windowcontrols button:not(.suggested-action):not(.destructive-action).close:backdrop:hover, windowcontrols button:not(.suggested-action):not(.destructive-action).close:backdrop:active {
color: rgba(0, 0, 0, 0.38);
}
windowcontrols button:not(.suggested-action):not(.destructive-action).minimize {
background-color: #fdbe04;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).minimize:active {
background-color: rgba(201, 151, 3, 0.9675);
}
windowcontrols button:not(.suggested-action):not(.destructive-action).maximize {
background-color: #38c76a;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).maximize:active {
background-color: rgba(45, 158, 84, 0.9675);
}
windowcontrols button:not(.suggested-action):not(.destructive-action).close {
background-color: #fd5f51;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).close:active {
background-color: rgba(201, 76, 64, 0.9675);
}
gridview > child:selected, modelbutton.flat:selected, row:selected, calendar:selected, calendar > grid > label.day-number:selected {
background-color: alpha(currentColor, 0.06);
}

View File

@@ -3339,40 +3339,40 @@ stack scrolledwindow.frame viewport.frame list {
}
overshoot.top {
background-size: 200% 70%;
background-image: radial-gradient(farthest-side at top, rgba(60, 132, 247, 0.24) 99%, rgba(60, 132, 247, 0) 100%);
background-image: radial-gradient(farthest-side at top, alpha(currentColor, 0.12) 85%, alpha(currentColor, 0)), radial-gradient(farthest-side at top, alpha(currentColor, 0.05), alpha(currentColor, 0));
background-size: 100% 3%, 100% 50%;
background-repeat: no-repeat;
background-position: center top;
background-position: top;
background-color: transparent;
border: none;
box-shadow: none;
}
overshoot.bottom {
background-size: 200% 70%;
background-image: radial-gradient(farthest-side at bottom, rgba(60, 132, 247, 0.24) 99%, rgba(60, 132, 247, 0) 100%);
background-image: radial-gradient(farthest-side at bottom, alpha(currentColor, 0.12) 85%, alpha(currentColor, 0)), radial-gradient(farthest-side at bottom, alpha(currentColor, 0.05), alpha(currentColor, 0));
background-size: 100% 3%, 100% 50%;
background-repeat: no-repeat;
background-position: center bottom;
background-position: bottom;
background-color: transparent;
border: none;
box-shadow: none;
}
overshoot.left {
background-size: 200% 70%;
background-image: radial-gradient(farthest-side at left, rgba(60, 132, 247, 0.24) 99%, rgba(60, 132, 247, 0) 100%);
background-image: radial-gradient(farthest-side at left, alpha(currentColor, 0.12) 85%, alpha(currentColor, 0)), radial-gradient(farthest-side at left, alpha(currentColor, 0.05), alpha(currentColor, 0));
background-size: 3% 100%, 50% 100%;
background-repeat: no-repeat;
background-position: left center;
background-position: left;
background-color: transparent;
border: none;
box-shadow: none;
}
overshoot.right {
background-size: 200% 70%;
background-image: radial-gradient(farthest-side at right, rgba(60, 132, 247, 0.24) 99%, rgba(60, 132, 247, 0) 100%);
background-image: radial-gradient(farthest-side at right, alpha(currentColor, 0.12) 85%, alpha(currentColor, 0)), radial-gradient(farthest-side at right, alpha(currentColor, 0.05), alpha(currentColor, 0));
background-size: 3% 100%, 50% 100%;
background-repeat: no-repeat;
background-position: right center;
background-position: right;
background-color: transparent;
border: none;
box-shadow: none;
@@ -4354,6 +4354,57 @@ window.csd.maximized, window.csd.fullscreen, window.csd.tiled, window.csd.tiled-
border-radius: 0;
}
windowcontrols button:not(.suggested-action):not(.destructive-action) {
min-height: 16px;
min-width: 16px;
padding: 0;
margin: 0 4px;
}
windowcontrols button.minimize:not(.suggested-action):not(.destructive-action), windowcontrols button.maximize:not(.suggested-action):not(.destructive-action), windowcontrols button.close:not(.suggested-action):not(.destructive-action) {
color: transparent;
}
windowcontrols button.minimize:not(.suggested-action):not(.destructive-action) image, windowcontrols button.maximize:not(.suggested-action):not(.destructive-action) image, windowcontrols button.close:not(.suggested-action):not(.destructive-action) image {
padding: 0;
}
windowcontrols button.minimize:hover:not(.suggested-action):not(.destructive-action), windowcontrols button.minimize:active:not(.suggested-action):not(.destructive-action), windowcontrols button.maximize:hover:not(.suggested-action):not(.destructive-action), windowcontrols button.maximize:active:not(.suggested-action):not(.destructive-action), windowcontrols button.close:hover:not(.suggested-action):not(.destructive-action), windowcontrols button.close:active:not(.suggested-action):not(.destructive-action) {
color: white;
}
windowcontrols button.minimize:backdrop:not(.suggested-action):not(.destructive-action), windowcontrols button.maximize:backdrop:not(.suggested-action):not(.destructive-action), windowcontrols button.close:backdrop:not(.suggested-action):not(.destructive-action) {
background-color: rgba(255, 255, 255, 0.3);
}
windowcontrols button.minimize:backdrop:hover:not(.suggested-action):not(.destructive-action), windowcontrols button.minimize:backdrop:active:not(.suggested-action):not(.destructive-action), windowcontrols button.maximize:backdrop:hover:not(.suggested-action):not(.destructive-action), windowcontrols button.maximize:backdrop:active:not(.suggested-action):not(.destructive-action), windowcontrols button.close:backdrop:hover:not(.suggested-action):not(.destructive-action), windowcontrols button.close:backdrop:active:not(.suggested-action):not(.destructive-action) {
color: rgba(255, 255, 255, 0.5);
}
windowcontrols button.minimize:not(.suggested-action):not(.destructive-action) {
background-color: #fdbe04;
}
windowcontrols button.minimize:active:not(.suggested-action):not(.destructive-action) {
background-color: #fece43;
}
windowcontrols button.maximize:not(.suggested-action):not(.destructive-action) {
background-color: #38c76a;
}
windowcontrols button.maximize:active:not(.suggested-action):not(.destructive-action) {
background-color: #6ad58f;
}
windowcontrols button.close:not(.suggested-action):not(.destructive-action) {
background-color: #fd5f51;
}
windowcontrols button.close:active:not(.suggested-action):not(.destructive-action) {
background-color: #fe877d;
}
windowcontrols {
border-spacing: 6px;
}
@@ -4368,57 +4419,6 @@ windowcontrols:not(.empty).start:dir(rtl), windowcontrols:not(.empty).end:dir(lt
margin-right: 6px;
}
windowcontrols button:not(.suggested-action):not(.destructive-action) {
min-height: 16px;
min-width: 16px;
padding: 0;
margin: 0 4px;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).minimize, windowcontrols button:not(.suggested-action):not(.destructive-action).maximize, windowcontrols button:not(.suggested-action):not(.destructive-action).close {
color: transparent;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).minimize image, windowcontrols button:not(.suggested-action):not(.destructive-action).maximize image, windowcontrols button:not(.suggested-action):not(.destructive-action).close image {
padding: 0;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).minimize:hover, windowcontrols button:not(.suggested-action):not(.destructive-action).minimize:active, windowcontrols button:not(.suggested-action):not(.destructive-action).maximize:hover, windowcontrols button:not(.suggested-action):not(.destructive-action).maximize:active, windowcontrols button:not(.suggested-action):not(.destructive-action).close:hover, windowcontrols button:not(.suggested-action):not(.destructive-action).close:active {
color: white;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).minimize:backdrop, windowcontrols button:not(.suggested-action):not(.destructive-action).maximize:backdrop, windowcontrols button:not(.suggested-action):not(.destructive-action).close:backdrop {
background-color: rgba(255, 255, 255, 0.3);
}
windowcontrols button:not(.suggested-action):not(.destructive-action).minimize:backdrop:hover, windowcontrols button:not(.suggested-action):not(.destructive-action).minimize:backdrop:active, windowcontrols button:not(.suggested-action):not(.destructive-action).maximize:backdrop:hover, windowcontrols button:not(.suggested-action):not(.destructive-action).maximize:backdrop:active, windowcontrols button:not(.suggested-action):not(.destructive-action).close:backdrop:hover, windowcontrols button:not(.suggested-action):not(.destructive-action).close:backdrop:active {
color: rgba(255, 255, 255, 0.5);
}
windowcontrols button:not(.suggested-action):not(.destructive-action).minimize {
background-color: #fdbe04;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).minimize:active {
background-color: #fece43;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).maximize {
background-color: #38c76a;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).maximize:active {
background-color: #6ad58f;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).close {
background-color: #fd5f51;
}
windowcontrols button:not(.suggested-action):not(.destructive-action).close:active {
background-color: #fe877d;
}
gridview > child:selected, modelbutton.flat:selected, row:selected, calendar:selected, calendar > grid > label.day-number:selected {
background-color: alpha(currentColor, 0.06);
}

View File

@@ -21,3 +21,6 @@ $color_type: 'default';
// Windows outline style
$rimless: 'false';
// Windows button style : mac/normal
$window_button: 'normal';

View File

@@ -21,3 +21,6 @@ $color_type: 'default';
// Windows outline style
$rimless: 'false';
// Windows button style : mac/normal
$window_button: 'mac';

View File

@@ -1130,7 +1130,12 @@ searchbar > revealer > box {
background-color: $titlebar;
color: $titlebar-text;
border-radius: $window-radius $window-radius 0 0;
box-shadow: inset 0 1px highlight($titlebar), inset 0 -1px $border;
@if $variant == 'dark' {
box-shadow: inset 0 -1px $border;
} @else {
box-shadow: inset 0 1px highlight($titlebar), inset 0 -1px $border;
}
&:disabled { color: $titlebar-text-disabled; }
@@ -1276,8 +1281,8 @@ searchbar > revealer > box {
&.default-decoration {
min-height: $small-size;
padding: $space-size $space-size * 2;
box-shadow: inset 0 1px highlight($titlebar);
border-radius: $window-radius $window-radius 0 0;
box-shadow: inset 0 1px highlight($titlebar);
.tiled &,
.maximized &,
@@ -1331,7 +1336,9 @@ headerbar {
}
> box.left,
> box.right { padding: 0 $space-size; } // Titlebutton space
> box.right { // Titlebutton space
padding: 0 if($window_button == 'mac', $space-size, $space-size - 2px);
}
button:not(.suggested-action):not(.destructive-action) {
@extend %titlebar-button;
@@ -1346,7 +1353,7 @@ headerbar {
+ separator, + separator.sidebar {
background-color: $titlebar;
background-image: none;
box-shadow: inset 0 1px highlight($titlebar), inset 0 -1px $border;
box-shadow: inset 0 -1px $border;
transition: all $duration $ease-out;
&:backdrop {
@@ -1357,21 +1364,13 @@ headerbar {
&.selection-mode + separator, &.selection-mode + separator.sidebar,
.selection-mode & + separator, .selection-mode & + separator.sidebar {
background-color: $primary;
box-shadow: inset 0 1px highlight($primary), inset 0 -1px $border;
box-shadow: inset 0 -1px $border;
&:backdrop {
background-color: $primary;
}
}
window.background.csd.unified & + separator, + separator.sidebar,
window.background.csd.unified &.selection-mode + separator,
window.background.csd.unified &.selection-mode + separator.sidebar,
window.background.csd.unified .selection-mode & + separator,
window.background.csd.unified .selection-mode & + separator.sidebar {
box-shadow: inset 0 -1px $border;
}
switch {
margin-top: ($large-size - 24px) / 2;
margin-bottom: ($large-size - 24px) / 2;
@@ -1560,12 +1559,17 @@ treeview.view {
button {
@extend %row_activatable;
padding: 2px $space-size;
border: none;
border-radius: $corner-radius;
border-style: none solid solid none;
border-width: 1px;
border-color: $divider;
border-radius: 0;
background-clip: border-box;
&:not(:focus):not(:hover):not(:active) { color: $text-secondary; }
&, &:disabled { background-color: $base; }
&:last-child { border-right-style: none; }
}
}
@@ -2787,18 +2791,18 @@ scrolledwindow {
viewport.frame list { border: none; }
}
// // This is used when content is touch-dragged past boundaries.
// // draws a box on top of the content, the size changes programmatically.
// @at-root overshoot {
// &.top { @include overshoot(top); }
//
// &.bottom { @include overshoot(bottom); }
//
// &.left { @include overshoot(left); }
//
// &.right { @include overshoot(right); }
// }
//
// This is used when content is touch-dragged past boundaries.
// draws a box on top of the content, the size changes programmatically.
@at-root overshoot {
&.top { @include overshoot(top); }
&.bottom { @include overshoot(bottom); }
&.left { @include overshoot(left); }
&.right { @include overshoot(right); }
}
// // Overflow indication, works similarly to the overshoot, the size if fixed tho.
// @at-root undershoot {
// &.top { @include undershoot(top); }
@@ -3041,7 +3045,7 @@ messagedialog { // Message Dialog styling
.titlebar {
min-height: $small-size;
border-style: none;
box-shadow: inset 0 1px highlight($surface);
box-shadow: none;
background-color: $surface;
color: $text;
@@ -3627,6 +3631,12 @@ decoration {
box-shadow: $shadow-z16, 0 0 36px transparent;
} @else {
box-shadow: $shadow-z16, 0 0 0 1px $window-border, 0 0 36px transparent;
@if $variant == 'dark' {
border: 1px solid highlight($background);
background-color: $background;
background-clip: border-box;
}
}
// FIXME rationalize shadows
@@ -3655,7 +3665,10 @@ decoration {
.tiled-bottom &,
.tiled-left & { border-radius: 0; }
.popup & { box-shadow: none; }
.popup & {
box-shadow: none;
border: none;
}
// server-side decorations as used by mutter
.ssd & {
@@ -3672,10 +3685,12 @@ decoration {
.metacity & {
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
border: none;
}
.csd.popup & {
border-radius: $menu-radius;
border: none;
@if $rimless == 'true' {
box-shadow: $shadow-z4;
@@ -3692,7 +3707,12 @@ decoration {
messagedialog.csd & {
border-radius: $window-radius;
border: none;
@if $variant == 'dark' {
border: 1px solid highlight($surface);
background-color: $surface;
background-clip: border-box;
}
}
.solid-csd & {
@@ -3708,8 +3728,8 @@ decoration {
}
// Windows button
button.titlebutton:not(.suggested-action):not(.destructive-action) {
@extend %circular-button;
%mac_window_button {
min-height: 16px;
min-width: 16px;
padding: 0;
@@ -3756,6 +3776,42 @@ button.titlebutton:not(.suggested-action):not(.destructive-action) {
}
}
%normal_window_button {
min-height: 22px;
min-width: 22px;
padding: 0;
margin: 0 $space-size - 2px;
&.minimize, &.maximize, &.close {
color: $titlebar-text-secondary;
background-color: gtkalpha(currentColor, 0.1);
&:hover {
color: $titlebar-text;
background-color: gtkalpha(currentColor, 0.15);
}
&:active {
color: $titlebar-text;
background-color: gtkalpha(currentColor, 0.2);
}
&:backdrop {
opacity: 0.65;
}
}
}
button.titlebutton:not(.suggested-action):not(.destructive-action) {
@extend %circular-button;
@if $window_button == 'mac' {
@extend %mac_window_button;
} @else {
@extend %normal_window_button;
}
}
.monospace { font-family: monospace; }

View File

@@ -4025,71 +4025,111 @@ window {
}
}
// Window button
// Windows button
%mac_window_button {
min-height: 16px;
min-width: 16px;
padding: 0;
margin: 0 $space-size - 2px;
&.minimize, &.maximize, &.close {
color: transparent;
image { padding: 0; }
&:hover, &:active {
color: on($applet-primary);
}
&:backdrop {
background-color: $titlebar-track;
&:hover, &:active {
color: $titlebar-text-disabled;
}
}
}
&.minimize { // Window minimize button
background-color: $titlebutton-min;
&:active {
background-color: mix($titlebar-text, $titlebutton-min, 25%);
}
}
&.maximize { // Window maximize button
background-color: $titlebutton-max;
&:active {
background-color: mix($titlebar-text, $titlebutton-max, 25%);
}
}
&.close { // Window close button
background-color: $titlebutton-close;
&:active {
background-color: mix($titlebar-text, $titlebutton-close, 25%);
}
}
}
%normal_window_button {
min-height: 22px;
min-width: 22px;
padding: 0;
margin: 0 $space-size - 2px;
&.minimize, &.maximize, &.close {
color: $titlebar-text-secondary;
background-color: gtkalpha(currentColor, 0.1);
image { padding: 0; }
&:hover {
color: $titlebar-text;
background-color: gtkalpha(currentColor, 0.15);
}
&:active {
color: $titlebar-text;
background-color: gtkalpha(currentColor, 0.2);
}
&:backdrop {
opacity: 0.65;
}
}
}
$window-space: if($window_button == 'mac', $space-size, $space-size - 2px);
windowcontrols {
border-spacing: $space-size;
&:not(.empty) {
&.start:dir(ltr),
&.end:dir(rtl) {
margin-right: $space-size;
margin-left: $space-size;
margin-right: $window-space;
margin-left: $window-space;
}
&.start:dir(rtl),
&.end:dir(ltr) {
margin-left: $space-size;
margin-right: $space-size;
margin-left: $window-space;
margin-right: $window-space;
}
}
button:not(.suggested-action):not(.destructive-action) {
@extend %circular-button;
min-height: 16px;
min-width: 16px;
padding: 0;
margin: 0 $space-size - 2px;
&.minimize, &.maximize, &.close {
color: transparent;
image { padding: 0; }
&:hover, &:active {
color: on($applet-primary);
}
&:backdrop {
background-color: $titlebar-track;
&:hover, &:active {
color: $titlebar-text-disabled;
}
}
}
&.minimize { // Window minimize button
background-color: $titlebutton-min;
&:active {
background-color: mix($titlebar-text, $titlebutton-min, 25%);
}
}
&.maximize { // Window maximize button
background-color: $titlebutton-max;
&:active {
background-color: mix($titlebar-text, $titlebutton-max, 25%);
}
}
&.close { // Window close button
background-color: $titlebutton-close;
&:active {
background-color: mix($titlebar-text, $titlebutton-close, 25%);
}
@if $window_button == 'mac' {
@extend %mac_window_button;
} @else {
@extend %normal_window_button;
}
}
}

View File

@@ -200,27 +200,76 @@
}
@mixin overshoot($p) {
@mixin overshoot($p, $t:normal, $c:$text) {
//
// overshoot
//
// $p: position
// $t: type
// $c: base color
//
// possible $p values:
// top, bottom, right, left
//
// possible $t values:
// normal, backdrop
//
$_position: center $p;
$_small_gradient_length: 5%;
$_big_gradient_length: 100%;
@if ($p == left) or ($p == right) {
$_position: $p center;
$_position: center top;
$_small_gradient_size: 100% $_small_gradient_length;
$_big_gradient_size: 100% $_big_gradient_length;
@if $p==bottom {
$_position: center bottom;
$_linear_gradient_direction: to top;
}
background-image: -gtk-gradient(radial,
@else if $p==right {
$_position: right center;
$_small_gradient_size: $_small_gradient_length 100%;
$_big_gradient_size: $_big_gradient_length 100%;
}
@else if $p==left {
$_position: left center;
$_small_gradient_size: $_small_gradient_length 100%;
$_big_gradient_size: $_big_gradient_length 100%;
}
$_small_gradient_color: $c;
$_big_gradient_color: $c;
@if $c==$text {
$_small_gradient_color: $border;
$_big_gradient_color: $text;
@if $t==backdrop { $_small_gradient_color: $fill; }
}
$_small_gradient: -gtk-gradient(radial,
$_position, 0,
$_position, 0.75,
to(rgba($primary, 0.24)),
to(transparent));
$_position, 0.5,
to($_small_gradient_color),
to(rgba($_small_gradient_color, 0)));
$_big_gradient: -gtk-gradient(radial,
$_position, 0,
$_position, 0.6,
from(rgba($_big_gradient_color, 0.07)),
to(rgba($_big_gradient_color, 0)));
@if $t==normal {
background-image: $_small_gradient, $_big_gradient;
background-size: $_small_gradient_size, $_big_gradient_size;
}
@else if $t==backdrop {
background-image: $_small_gradient;
background-size: $_small_gradient_size;
}
background-repeat: no-repeat;
background-position: $_position;

View File

@@ -159,33 +159,35 @@
// overshoot
//
// $p: position
// $t: type
// $c: base color
//
// possible $p values:
// top, bottom, right, left
//
// possible $t values:
// normal, backdrop
//
$_position: center $p;
$_small_gradient_length: 3%;
$_big_gradient_length: 50%;
@if ($p == left) or ($p == right) {
$_position: $p center;
$_small_gradient_size: 100% $_small_gradient_length;
$_big_gradient_size: 100% $_big_gradient_length;
@if $p==right or $p==left {
$_small_gradient_size: $_small_gradient_length 100%;
$_big_gradient_size: $_big_gradient_length 100%;
}
background-size: 200% 70%;
$_small_gradient: radial-gradient(farthest-side at $p,
gtkalpha(currentColor, 0.12) 85%,
gtkalpha(currentColor, 0));
background-image:
radial-gradient(
farthest-side at $p,
rgba($primary, .24) 99%,
rgba($primary, 0) 100%
);
$_big_gradient: radial-gradient(farthest-side at $p,
gtkalpha(currentColor, 0.05),
gtkalpha(currentColor, 0));
background-image: $_small_gradient, $_big_gradient;
background-size: $_small_gradient_size, $_big_gradient_size;
background-repeat: no-repeat;
background-position: $_position;
background-position: $p;
background-color: transparent; // reset some properties to be sure to not inherit them somehow
border: none; //

View File

@@ -37,9 +37,9 @@ $nautilus: if($variant == 'light' and $topbar == 'dark', $base-alt, $titlebar);
background-color: transparent;
border-bottom-right-radius: $window-radius;
treeview.view:not(:hover):not(:active):not(:selected) {
background-color: transparent;
}
// treeview.view:not(:hover):not(:active):not(:selected) {
// background-color: transparent;
// }
}
notebook {
@@ -323,9 +323,9 @@ window.org-gnome-gedit {
> scrolledwindow { // raised widget
border-bottom-left-radius: $window-radius;
treeview.view:not(:hover):not(:selected) {
background: none;
}
// treeview.view:not(:hover):not(:selected) {
// background: none;
// }
}
}
@@ -669,12 +669,12 @@ window#gnome-system-monitor.background.csd {
border-radius: 0 0 $window-radius $window-radius;
> box.vertical {
> scrolledwindow {
treeview.view:not(.progressbar):not(.trough) {
background: none;
@extend .view;
}
}
// > scrolledwindow {
// treeview.view:not(.progressbar):not(.trough) {
// background: none;
// @extend .view;
// }
// }
> revealer > actionbar > revealer > box {
border-radius: 0 0 $window-radius $window-radius;
@@ -1392,11 +1392,11 @@ box.vertical > revealer > toolbar.search-bar {
* Document Viewer *
*******************/
window.background.csd {
> box.vertical {
> paned.horizontal > box.vertical > scrolledwindow {
> treeview.view:not(:hover):not(:selected) { background-color: transparent; }
}
}
// > box.vertical {
// > paned.horizontal > box.vertical > scrolledwindow {
// > treeview.view:not(:hover):not(:selected) { background-color: transparent; }
// }
// }
evview.view.content-view {
border-radius: 0 0 $window-radius $window-radius;
@@ -1408,17 +1408,17 @@ window.background.csd {
}
/*******************
* Archive Manager *
*******************/
/*********************************
* Archive Manager (File roller) *
*********************************/
.background.csd {
> grid.horizontal > paned.horizontal {
> scrolledwindow {
border-radius: 0 0 $window-radius $window-radius;
background-color: $base;
treeview.view:not(:hover):not(:selected) {
background-color: transparent;
> treeview.view:not(:hover):not(:selected):not(:selected):not(:hover):not(.progressbar):not(.expander):not(.trough):not(.separator) {
background-color: $base;
}
}
@@ -1426,28 +1426,24 @@ window.background.csd {
> scrolledwindow {
border-radius: 0 0 0 $window-radius;
background-color: $background;
treeview.view:not(:hover):not(:selected) {
background-color: transparent;
}
}
}
}
}
/**************
* Gnome Disk *
**************/
window.background.csd {
> box.vertical > paned.horizontal {
> scrolledwindow {
treeview.view:not(:selected):not(:hover) {
background-color: transparent;
}
}
}
}
// /**************
// * Gnome Disk *
// **************/
// window.background.csd {
// > box.vertical > paned.horizontal {
// > scrolledwindow {
// treeview.view:not(:selected):not(:hover) {
// background-color: transparent;
// }
// }
// }
// }
/************
@@ -1821,11 +1817,11 @@ dialog.background.csd {
}
}
> box.vertical > stack.view {
> scrolledwindow > treeview.view:not(:hover):not(:selected):not(:active) {
background-color: transparent;
}
}
// > box.vertical > stack.view {
// > scrolledwindow > treeview.view:not(:hover):not(:selected):not(:active) {
// background-color: transparent;
// }
// }
toolbar.toolbar {
border-radius: 0 0 $window-radius $window-radius;
@@ -1851,7 +1847,7 @@ dialog.background.csd {
}
}
treeview.view:not(:hover):not(:selected) { background: none; }
// treeview.view:not(:hover):not(:selected) { background: none; }
}
viewport.frame {

View File

@@ -182,8 +182,8 @@ window.background.csd.thunar {
> grid.horizontal > paned.horizontal > scrolledwindow.frame.sidebar.shortcuts-pane {
border-bottom-left-radius: $window-radius;
treeview.view:not(:hover):not(:selected) {
background-color: transparent;
}
// treeview.view:not(:hover):not(:selected) {
// background-color: transparent;
// }
}
}

BIN
tweaks.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 400 KiB