Skip to content

Commit

Permalink
Fixed vinceliuice#22
Browse files Browse the repository at this point in the history
  • Loading branch information
@vinceliuice
vinceliuice committed Dec 31, 2021
1 parent c5d9be2 commit 83f3173
Show file tree
Hide file tree
Showing 14 changed files with 385 additions and 3,727 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@ Run the following commands in the terminal:
-t, --theme VARIANT... Specify theme color variant(s) [default|purple|pink|red|orange|yellow|green|teal|blue|all] (Default: grey)
-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 option can not mix use with!)
1. nord: Nord color version
2. black: Blackness color version
3. rimless: Remove the 2px outline about windows and menus
4. normal: Normal sidebar style (Nautilus)
-h, --help Show help
```

Expand All @@ -45,4 +46,3 @@ Run the following commands in the terminal:
Automatically install your host GTK+ theme as a Flatpak. Use this:

- [pakitheme](https://github.com/refi64/pakitheme)

18 changes: 16 additions & 2 deletions install.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,11 @@ OPTIONS:
-s, --size VARIANT Specify size variant [standard|compact] (Default: standard variants)
--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 option can not mix use with!)
1. nord: Nord color version
2. black: Blackness color version
3. rimless: Remove the 2px outline about windows and menus
4. normal: Normal sidebar style (Nautilus)
-h, --help Show help
EOF
Expand Down Expand Up @@ -327,6 +328,11 @@ while [[ $# -gt 0 ]]; do
echo -e "Install Rimless version! ..."
shift
;;
normal)
normal="true"
echo -e "Install Normal sidebar version! ..."
shift
;;
-*)
break
;;
Expand Down Expand Up @@ -405,6 +411,10 @@ border_rimless() {
sed -i "/\$rimless:/s/false/true/" ${SRC_DIR}/sass/_tweaks-temp.scss
}

normal_sidebar() {
sed -i "/\$sidebar:/s/styled/normal/" ${SRC_DIR}/sass/_tweaks-temp.scss
}

theme_color() {
if [[ "$theme" != '' ]]; then
case "$theme" in
Expand Down Expand Up @@ -438,7 +448,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
Expand All @@ -462,6 +472,10 @@ theme_tweaks() {
if [[ "$rimless" = "true" ]] ; then
border_rimless
fi

if [[ "$normal" = "true" ]] ; then
normal_sidebar
fi
}

install_theme() {
Expand Down
1,254 changes: 90 additions & 1,164 deletions src/main/gtk-3.0/gtk-dark.css
View file

Large diffs are not rendered by default.

1,254 changes: 90 additions & 1,164 deletions src/main/gtk-3.0/gtk-light.css
View file

Large diffs are not rendered by default.

1,254 changes: 90 additions & 1,164 deletions src/main/gtk-3.0/gtk.css
View file

Large diffs are not rendered by default.

46 changes: 0 additions & 46 deletions src/main/gtk-4.0/gtk-dark.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3154,52 +3154,6 @@ overshoot.right {
box-shadow: none;
}

undershoot.top {
background-color: transparent;
background-image: linear-gradient(to left, transparent 50%, rgba(255, 255, 255, 0.3) 50%);
padding-top: 1px;
background-size: 12px 1px;
background-repeat: repeat-x;
background-origin: content-box;
background-position: left top;
margin: 0 4px;
}

undershoot.bottom {
background-color: transparent;
background-image: linear-gradient(to left, transparent 50%, rgba(255, 255, 255, 0.3) 50%);
padding-bottom: 1px;
background-size: 12px 1px;
background-repeat: repeat-x;
background-origin: content-box;
background-position: left bottom;
margin: 0 4px;
}

undershoot.left {
background-color: transparent;
background-image: linear-gradient(to top, transparent 50%, rgba(255, 255, 255, 0.3) 50%);
padding-left: 1px;
background-size: 1px 12px;
background-repeat: repeat-y;
background-origin: content-box;
background-position: left top;
margin: 0 4px;
margin: 4px 0;
}

undershoot.right {
background-color: transparent;
background-image: linear-gradient(to top, transparent 50%, rgba(255, 255, 255, 0.3) 50%);
padding-right: 1px;
background-size: 1px 12px;
background-repeat: repeat-y;
background-origin: content-box;
background-position: right top;
margin: 0 4px;
margin: 4px 0;
}

junction {
border-style: solid none none solid;
border-width: 1px;
Expand Down
46 changes: 0 additions & 46 deletions src/main/gtk-4.0/gtk-light.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3154,52 +3154,6 @@ overshoot.right {
box-shadow: none;
}

undershoot.top {
background-color: transparent;
background-image: linear-gradient(to left, transparent 50%, rgba(0, 0, 0, 0.26) 50%);
padding-top: 1px;
background-size: 12px 1px;
background-repeat: repeat-x;
background-origin: content-box;
background-position: left top;
margin: 0 4px;
}

undershoot.bottom {
background-color: transparent;
background-image: linear-gradient(to left, transparent 50%, rgba(0, 0, 0, 0.26) 50%);
padding-bottom: 1px;
background-size: 12px 1px;
background-repeat: repeat-x;
background-origin: content-box;
background-position: left bottom;
margin: 0 4px;
}

undershoot.left {
background-color: transparent;
background-image: linear-gradient(to top, transparent 50%, rgba(0, 0, 0, 0.26) 50%);
padding-left: 1px;
background-size: 1px 12px;
background-repeat: repeat-y;
background-origin: content-box;
background-position: left top;
margin: 0 4px;
margin: 4px 0;
}

undershoot.right {
background-color: transparent;
background-image: linear-gradient(to top, transparent 50%, rgba(0, 0, 0, 0.26) 50%);
padding-right: 1px;
background-size: 1px 12px;
background-repeat: repeat-y;
background-origin: content-box;
background-position: right top;
margin: 0 4px;
margin: 4px 0;
}

junction {
border-style: solid none none solid;
border-width: 1px;
Expand Down
46 changes: 0 additions & 46 deletions src/main/gtk-4.0/gtk.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3154,52 +3154,6 @@ overshoot.right {
box-shadow: none;
}

undershoot.top {
background-color: transparent;
background-image: linear-gradient(to left, transparent 50%, rgba(0, 0, 0, 0.26) 50%);
padding-top: 1px;
background-size: 12px 1px;
background-repeat: repeat-x;
background-origin: content-box;
background-position: left top;
margin: 0 4px;
}

undershoot.bottom {
background-color: transparent;
background-image: linear-gradient(to left, transparent 50%, rgba(0, 0, 0, 0.26) 50%);
padding-bottom: 1px;
background-size: 12px 1px;
background-repeat: repeat-x;
background-origin: content-box;
background-position: left bottom;
margin: 0 4px;
}

undershoot.left {
background-color: transparent;
background-image: linear-gradient(to top, transparent 50%, rgba(0, 0, 0, 0.26) 50%);
padding-left: 1px;
background-size: 1px 12px;
background-repeat: repeat-y;
background-origin: content-box;
background-position: left top;
margin: 0 4px;
margin: 4px 0;
}

undershoot.right {
background-color: transparent;
background-image: linear-gradient(to top, transparent 50%, rgba(0, 0, 0, 0.26) 50%);
padding-right: 1px;
background-size: 1px 12px;
background-repeat: repeat-y;
background-origin: content-box;
background-position: right top;
margin: 0 4px;
margin: 4px 0;
}

junction {
border-style: solid none none solid;
border-width: 1px;
Expand Down
5 changes: 4 additions & 1 deletion src/sass/_tweaks-temp.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,7 @@ $blackness: 'false';
$color_type: 'default';

// Windows outline style
$rimless: 'false';
$rimless: 'true';

// Windows outline style
$sidebar: 'normal'; // styled/normal
3 changes: 3 additions & 0 deletions src/sass/_tweaks.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ $color_type: 'default';

// Windows outline style
$rimless: 'false';

// Windows outline style
$sidebar: 'styled'; // styled/normal
10 changes: 5 additions & 5 deletions src/sass/gnome-shell/common/_app-grid.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
& .overview-icon {
color: on($osd, secondary);
border-radius: $base_radius * 1.5;
padding: $base_padding;
padding: 6px;
border: none;
transition-duration: 100ms;
text-align: center;
Expand Down Expand Up @@ -98,21 +98,21 @@
}

& .icon-grid {
row-spacing: $base_spacing * 2;
column-spacing: $base_spacing * 5;
row-spacing: 12px;
column-spacing: 30px;
page-padding-top: 0;
page-padding-bottom: 0;
page-padding-left: 0;
page-padding-right: 0;
}

& .page-indicators {
margin-bottom: $base_padding * 3;
margin-bottom: 18px;
}
}

.app-folder-dialog-container {
padding: $base_padding;
padding: 6px;
width: 620px;
height: 620px;
}
Expand Down
24 changes: 12 additions & 12 deletions src/sass/gtk/_common-3.0.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1296,9 +1296,6 @@ searchbar > revealer > box {
border-radius: 0;
}

> box.left,
> box.right { padding: 0 $space-size / 2; }

&.default-decoration {
min-height: $small-size;
padding: $space-size;
Expand Down Expand Up @@ -1351,6 +1348,9 @@ headerbar {
background-color: $titlebar;
}

> box.left,
> box.right { padding: 0 $space-size / 2; }

// add vertical margins to common widget on the headerbar to avoid them spanning the whole height
entry,
spinbutton,
Expand Down Expand Up @@ -2806,15 +2806,15 @@ scrolledwindow {
}

// Overflow indication, works similarly to the overshoot, the size if fixed tho.
@at-root undershoot {
&.top { @include undershoot(top); }

&.bottom { @include undershoot(bottom); }

&.left { @include undershoot(left); }

&.right { @include undershoot(right); }
}
// @at-root undershoot {
// &.top { @include undershoot(top); }
//
// &.bottom { @include undershoot(bottom); }
//
// &.left { @include undershoot(left); }
//
// &.right { @include undershoot(right); }
// }

@at-root junction { // the small square between two scrollbars
border-style: solid none none solid;
Expand Down
18 changes: 9 additions & 9 deletions src/sass/gtk/_common-4.0.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2783,15 +2783,15 @@ scrolledwindow {
}

// Overflow indication, works similarly to the overshoot, the size if fixed tho.
@at-root undershoot {
&.top { @include undershoot(top); }

&.bottom { @include undershoot(bottom); }

&.left { @include undershoot(left); }

&.right { @include undershoot(right); }
}
// @at-root undershoot {
// &.top { @include undershoot(top); }
//
// &.bottom { @include undershoot(bottom); }
//
// &.left { @include undershoot(left); }
//
// &.right { @include undershoot(right); }
// }

@at-root junction { // the small square between two scrollbars
border-style: solid none none solid;
Expand Down
Loading

0 comments on commit 83f3173

Please sign in to comment.