mirrors/Colloid-gtk-theme
1
0
Fork 0
mirror of https://github.com/vinceliuice/Colloid-gtk-theme.git synced 2024-10-18 05:20:35 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fixed #116

Browse source
This commit is contained in:
vinceliuice 2023-05-30 11:01:33 +08:00
parent 5feecc6695
commit fac1f92071
4 changed files with 79 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
README.md
View file

@ -46,10 +46,12 @@ Run the following commands in the terminal:
-u, --uninstall Uninstall/Remove installed themes or links -u, --uninstall Uninstall/Remove installed themes or links
--tweaks Specify versions for tweaks --tweaks Specify versions for tweaks
1. [nord|dracula|gruvbox]: Nord|Dracula|gruvbox ColorSchemes version 1. [nord|dracula|gruvbox] Nord|Dracula|gruvbox ColorSchemes version
2. black: Blackness color version 2. black Blackness color version
3. rimless: Remove the 1px border about windows and menus 3. rimless Remove the 1px border about windows and menus
4. normal: Normal windows button style (titlebuttons: max/min/close) 4. normal Normal windows button style like gnome default theme (titlebuttons: max/min/close)
5. float Floating gnome-shell panel style
-h, --help Show help -h, --help Show help
``` ```

22
install.sh
View file

@ -65,10 +65,11 @@ OPTIONS:
-u, --uninstall Uninstall/Remove installed themes or links -u, --uninstall Uninstall/Remove installed themes or links
--tweaks Specify versions for tweaks --tweaks Specify versions for tweaks
1. [nord|dracula|gruvbox]: Nord|Dracula|gruvbox ColorSchemes version 1. [nord|dracula|gruvbox] Nord|Dracula|gruvbox ColorSchemes version
2. black: Blackness color version 2. black Blackness color version
3. rimless: Remove the 1px border about windows and menus 3. rimless Remove the 1px border about windows and menus
4. normal: Normal windows button style (titlebuttons: max/min/close) 4. normal Normal windows button style like gnome default theme (titlebuttons: max/min/close)
5. float Floating gnome-shell panel style
-h, --help Show help -h, --help Show help
EOF EOF
@ -350,6 +351,11 @@ while [[ $# -gt 0 ]]; do
echo -e "Normal window button version! ..." echo -e "Normal window button version! ..."
shift shift
;; ;;
float)
float="true"
echo -e "Install Floating Gnome-Shell Panel version! ..."
shift
;;
-*) -*)
break break
;; ;;
@ -447,6 +453,10 @@ normal_winbutton() {
sed -i "/\$window_button:/s/mac/normal/" "${SRC_DIR}/sass/_tweaks-temp.scss" sed -i "/\$window_button:/s/mac/normal/" "${SRC_DIR}/sass/_tweaks-temp.scss"
} }
float_panel() {
sed -i "/\$float:/s/false/true/" "${SRC_DIR}/sass/_tweaks-temp.scss"
}
gnome_shell_version() { gnome_shell_version() {
cp -rf "${SRC_DIR}/sass/gnome-shell/_common.scss" "${SRC_DIR}/sass/gnome-shell/_common-temp.scss" cp -rf "${SRC_DIR}/sass/gnome-shell/_common.scss" "${SRC_DIR}/sass/gnome-shell/_common-temp.scss"
@ -522,6 +532,10 @@ theme_tweaks() {
if [[ "$normal" = "true" ]] ; then if [[ "$normal" = "true" ]] ; then
normal_winbutton normal_winbutton
fi fi
if [[ "$float" = "true" ]] ; then
float_panel
fi
} }
uninstall_link() { uninstall_link() {

3
src/sass/_tweaks.scss
View file

@ -27,3 +27,6 @@ $rimless: 'false';
// Windows button style : mac/normal // Windows button style : mac/normal
$window_button: 'mac'; $window_button: 'mac';
// Gnome-Shell float panel version
$float: 'false';

73
src/sass/gnome-shell/common/_panel.scss
View file

@ -2,9 +2,7 @@
// a.k.a. the panel // a.k.a. the panel
#panel { #panel {
background-color: $panel;
font-weight: bold; font-weight: bold;
height: $item_size;
color: $panel-text-secondary; color: $panel-text-secondary;
font-feature-settings: "tnum"; font-feature-settings: "tnum";
transition-duration: 250ms; transition-duration: 250ms;
@ -12,6 +10,14 @@
border: none; border: none;
@include fontsize($font_size - 1); @include fontsize($font_size - 1);
@if $float == 'true' {
background-color: transparent;
height: $item_size + $base_margin * 2;
} @else {
background-color: $panel;
height: $item_size + 2px;
}
// the rounded outset corners // the rounded outset corners
.panel-corner { .panel-corner {
-panel-corner-radius: 0; -panel-corner-radius: 0;
@ -25,26 +31,40 @@
// panel menus // panel menus
.panel-button { .panel-button {
-natural-hpadding: 12px; -natural-hpadding: 12px;
-minimum-hpadding: 6px; -minimum-hpadding: 12px;
font-weight: bold; font-weight: bold;
color: $panel-text-secondary; color: $panel-text-secondary;
transition-duration: 150ms; transition-duration: 150ms;
border-radius: $circular_radius; border-radius: $circular_radius;
text-shadow: none; text-shadow: none;
border: 2px solid transparent;
@if $float == 'true' {
border: $base_margin solid transparent;
box-shadow: inset 0 0 0 1000px $panel;
} @else {
border: $base_padding / 2 solid transparent;
}
&.clock-display { &.clock-display {
box-shadow: none;
.clock { .clock {
transition-duration: 150ms; transition-duration: 150ms;
border: 2px solid transparent;
border-radius: $circular_radius; border-radius: $circular_radius;
@if $float == 'true' {
border: $base_margin solid transparent;
box-shadow: inset 0 0 0 1000px $panel;
} @else {
border: $base_padding / 2 solid transparent;
}
} }
} }
&:hover { &:hover {
color: $panel-text; color: $panel-text;
background-color: transparent; background-color: transparent;
box-shadow: inset 0 0 0 1000px overlay($panel, hover); box-shadow: inset 0 0 0 1000px mix($panel-text, $panel, 15%);
&.clock-display { &.clock-display {
box-shadow: none; box-shadow: none;
@ -52,7 +72,7 @@
.clock { .clock {
color: $panel-text; color: $panel-text;
box-shadow: inset 0 0 0 1000px overlay($panel, hover); box-shadow: inset 0 0 0 1000px mix($panel-text, $panel, 15%);
} }
} }
} }
@ -61,7 +81,7 @@
&, &:hover { &, &:hover {
background-color: transparent; background-color: transparent;
color: $panel-text; color: $panel-text;
box-shadow: inset 0 0 0 1000px overlay($panel, active); box-shadow: inset 0 0 0 1000px mix($panel-text, $panel, 25%);
} }
&.clock-display { &.clock-display {
@ -69,7 +89,7 @@
color: $panel-text-secondary; color: $panel-text-secondary;
.clock { .clock {
box-shadow: inset 0 0 0 1000px overlay($panel, active); box-shadow: inset 0 0 0 1000px mix($panel-text, $panel, 25%);
color: $panel-text; color: $panel-text;
} }
} }
@ -87,15 +107,29 @@
.system-status-icon { .system-status-icon {
icon-size: $base_icon_size; icon-size: $base_icon_size;
padding: $base_padding; padding: $base_padding;
margin: 0 $base_margin; margin: 0;
-st-icon-style: symbolic; -st-icon-style: symbolic;
} }
.panel-status-indicators-box .system-status-icon, .appindicator-trayicons-box {
.panel-status-menu-box .system-status-icon { margin: 0 $base_padding;
margin: 0;
} }
// .panel-status-indicators-box .system-status-icon,
// .panel-status-menu-box .system-status-icon {
// margin: 0;
// }
// .panel-status-indicators-box,
// .panel-status-menu-box {
// spacing: $base_padding / 2;
// }
// // spacing between power icon and (optional) percentage label
// .power-status.panel-status-indicators-box {
// spacing: 0;
// }
// app menu icon // app menu icon
.app-menu-icon { .app-menu-icon {
-st-icon-style: symbolic; -st-icon-style: symbolic;
@ -158,14 +192,11 @@
} }
} }
.panel-status-indicators-box, // Input indicators
.panel-status-menu-box { Gjs_status_keyboard_InputSourceIndicator.panel-button, // Ibus
spacing: 2px; Gjs_appindicatorsupport_rgcjonas_gmail_com_indicatorStatusIcon_AppIndicatorsIndicatorStatusIcon.panel-button { // Fcitx
} -natural-hpadding: 12px + $base_padding !important;
-minimum-hpadding: 12px + $base_padding !important;
// spacing between power icon and (optional) percentage label
.power-status.panel-status-indicators-box {
spacing: 0;
} }
// indicator for active // indicator for active