Chillcraft/Colloid-gtk-theme
3
0
Fork 0
mirror of https://github.com/vinceliuice/Colloid-gtk-theme.git synced 2025-09-16 05:18:38 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:vinceliuice/Colloid-gtk-theme into main

Browse Source
This commit is contained in:
vinceliuice
2023-01-13 21:34:32 +08:00
parent 13a36f30a5 850d127f15
commit 9042de7d9a
9 changed files with 167 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
install.sh
View File

@@ -405,42 +405,42 @@ install_package() {
} }
tweaks_temp() { tweaks_temp() {
cp -rf ${SRC_DIR}/sass/_tweaks.scss ${SRC_DIR}/sass/_tweaks-temp.scss cp -rf "${SRC_DIR}/sass/_tweaks.scss" "${SRC_DIR}/sass/_tweaks-temp.scss"
} }
compact_size() { compact_size() {
sed -i "/\$compact:/s/false/true/" ${SRC_DIR}/sass/_tweaks-temp.scss sed -i "/\$compact:/s/false/true/" "${SRC_DIR}/sass/_tweaks-temp.scss"
} }
nord_color() { nord_color() {
sed -i "/\@import/s/color-palette-default/color-palette-nord/" ${SRC_DIR}/sass/_tweaks-temp.scss sed -i "/\@import/s/color-palette-default/color-palette-nord/" "${SRC_DIR}/sass/_tweaks-temp.scss"
sed -i "/\$colorscheme:/s/default/nord/" ${SRC_DIR}/sass/_tweaks-temp.scss sed -i "/\$colorscheme:/s/default/nord/" "${SRC_DIR}/sass/_tweaks-temp.scss"
} }
dracula_color() { dracula_color() {
sed -i "/\@import/s/color-palette-default/color-palette-dracula/" ${SRC_DIR}/sass/_tweaks-temp.scss sed -i "/\@import/s/color-palette-default/color-palette-dracula/" "${SRC_DIR}/sass/_tweaks-temp.scss"
sed -i "/\$colorscheme:/s/default/dracula/" ${SRC_DIR}/sass/_tweaks-temp.scss sed -i "/\$colorscheme:/s/default/dracula/" "${SRC_DIR}/sass/_tweaks-temp.scss"
} }
blackness_color() { blackness_color() {
sed -i "/\$blackness:/s/false/true/" ${SRC_DIR}/sass/_tweaks-temp.scss sed -i "/\$blackness:/s/false/true/" "${SRC_DIR}/sass/_tweaks-temp.scss"
} }
border_rimless() { border_rimless() {
sed -i "/\$rimless:/s/false/true/" ${SRC_DIR}/sass/_tweaks-temp.scss sed -i "/\$rimless:/s/false/true/" "${SRC_DIR}/sass/_tweaks-temp.scss"
} }
normal_winbutton() { 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"
} }
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"
sed -i "/\widgets/s/40-0/${GS_VERSION}/" ${SRC_DIR}/sass/gnome-shell/_common-temp.scss sed -i "/\widgets/s/40-0/${GS_VERSION}/" "${SRC_DIR}/sass/gnome-shell/_common-temp.scss"
if [[ "${GS_VERSION}" == '3-28' ]]; then if [[ "${GS_VERSION}" == '3-28' ]]; then
sed -i "/\extensions/s/40-0/${GS_VERSION}/" ${SRC_DIR}/sass/gnome-shell/_common-temp.scss sed -i "/\extensions/s/40-0/${GS_VERSION}/" "${SRC_DIR}/sass/gnome-shell/_common-temp.scss"
fi fi
} }
@@ -473,7 +473,7 @@ theme_color() {
;; ;;
esac esac
tweaks_temp tweaks_temp
sed -i "/\$theme:/s/default/${theme_color}/" ${SRC_DIR}/sass/_tweaks-temp.scss sed -i "/\$theme:/s/default/${theme_color}/" "${SRC_DIR}/sass/_tweaks-temp.scss"
fi fi
} }
@@ -535,7 +535,7 @@ link_theme() {
for theme in "${themes[@]}"; do for theme in "${themes[@]}"; do
for color in "${lcolors[@]}"; do for color in "${lcolors[@]}"; do
for size in "${sizes[@]}"; do for size in "${sizes[@]}"; do
link_libadwaita "${dest:-$DEST_DIR}" "${_name:-$THEME_NAME}" "$theme" "$color" "$size" "$ctype" link_libadwaita "${dest:-$DEST_DIR}" "${name:-$THEME_NAME}" "$theme" "$color" "$size" "$ctype"
done done
done done
done done
@@ -578,8 +578,8 @@ install_theme() {
for theme in "${themes[@]}"; do for theme in "${themes[@]}"; do
for color in "${colors[@]}"; do for color in "${colors[@]}"; do
for size in "${sizes[@]}"; do for size in "${sizes[@]}"; do
install "${dest:-$DEST_DIR}" "${_name:-$THEME_NAME}" "$theme" "$color" "$size" "$ctype" "$window" install "${dest:-$DEST_DIR}" "${name:-$THEME_NAME}" "$theme" "$color" "$size" "$ctype" "$window"
make_gtkrc "${dest:-$DEST_DIR}" "${_name:-$THEME_NAME}" "$theme" "$color" "$size" "$ctype" "$window" make_gtkrc "${dest:-$DEST_DIR}" "${name:-$THEME_NAME}" "$theme" "$color" "$size" "$ctype" "$window"
done done
done done
done done
@@ -609,7 +609,7 @@ uninstall_theme() {
for theme in "${themes[@]}"; do for theme in "${themes[@]}"; do
for color in "${colors[@]}"; do for color in "${colors[@]}"; do
for size in "${sizes[@]}"; do for size in "${sizes[@]}"; do
uninstall "${dest:-$DEST_DIR}" "${_name:-$THEME_NAME}" "$theme" "$color" "$size" "$ctype" uninstall "${dest:-$DEST_DIR}" "${name:-$THEME_NAME}" "$theme" "$color" "$size" "$ctype"
done done
done done
done done

22
src/other/firefox/chrome/Colloid/parts/buttons.css
View File

@@ -12,7 +12,7 @@
/* Buttons */ /* Buttons */
menulist, menulist,
#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton), #nav-bar toolbarbutton:not(#urlbar-zoom-button),
.subviewbutton.panel-subview-footer, .subviewbutton.panel-subview-footer,
.panel-footer button, .panel-footer button,
#downloadsPanel-mainView .download-state .downloadButton, #downloadsPanel-mainView .download-state .downloadButton,
@@ -59,7 +59,7 @@ button.close,
} }
/* Flat Buttons */ /* Flat Buttons */
#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton), #nav-bar toolbarbutton:not(#urlbar-zoom-button),
.close-icon:not(.tab-close-button), .close-icon:not(.tab-close-button),
button.close, button.close,
#protections-popup-info-button, #protections-popup-info-button,
@@ -68,7 +68,7 @@ button.close,
} }
/* Buttons with margins */ /* Buttons with margins */
#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton), #nav-bar toolbarbutton:not(#urlbar-zoom-button),
.notification-button, .notification-button,
.subviewbutton.panel-subview-footer:not(:only-of-type), .subviewbutton.panel-subview-footer:not(:only-of-type),
.panel-footer button:not(:only-of-type) { .panel-footer button:not(:only-of-type) {
@@ -166,7 +166,7 @@ menulist:hover .menulist-label-box,
} }
/* Hover flat buttons */ /* Hover flat buttons */
#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([open]):not([disabled="true"]):not([checked]):hover, #nav-bar toolbarbutton:not(#urlbar-zoom-button):not([open]):not([disabled="true"]):not([checked]):hover,
.close-icon:not(.tab-close-button):hover, .close-icon:not(.tab-close-button):hover,
button.close:hover, button.close:hover,
#protections-popup-info-button:hover, #protections-popup-info-button:hover,
@@ -199,12 +199,13 @@ menulist[open] .menulist-label-box,
.dialog-button-box button:not([disabled="true"]):active, .dialog-button-box button:not([disabled="true"]):active,
#editBMPanel_newFolderButton:active { #editBMPanel_newFolderButton:active {
background: var(--gnome-button-active-background) !important; background: var(--gnome-button-active-background) !important;
box-shadow: none !important;
} }
/* Active flat buttons */ /* Active flat buttons */
#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([disabled="true"]):not(#hack):active, #nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled="true"]):not(#hack):active,
#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not(.subviewbutton):not([disabled="true"])[open], #nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled="true"])[open],
#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([disabled="true"])[checked], #nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled="true"])[checked],
.close-icon:not(.tab-close-button):active, .close-icon:not(.tab-close-button):active,
button.close:active, button.close:active,
#protections-popup-info-button:not(#hack):active, #protections-popup-info-button:not(#hack):active,
@@ -212,6 +213,7 @@ button.close:active,
.permission-popup-permission-remove-button:active, .permission-popup-permission-remove-button:active,
#item-choose button:active { #item-choose button:active {
background: var(--gnome-button-flat-active-background) !important; background: var(--gnome-button-flat-active-background) !important;
box-shadow: none !important;
} }
/* Disabled buttons */ /* Disabled buttons */
@@ -223,7 +225,7 @@ button.close:active,
} }
/* Inactive window buttons */ /* Inactive window buttons */
#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):-moz-window-inactive, #nav-bar toolbarbutton:not(#urlbar-zoom-button):-moz-window-inactive,
.findbar-container toolbarbutton:-moz-window-inactive, .findbar-container toolbarbutton:-moz-window-inactive,
#sidebar-switcher-target:-moz-window-inactive, #sidebar-switcher-target:-moz-window-inactive,
#viewButton:-moz-window-inactive, #viewButton:-moz-window-inactive,
@@ -240,7 +242,7 @@ button.close:active,
} }
/* Combined buttons */ /* Combined buttons */
#nav-bar .toolbaritem-combined-buttons toolbarbutton:not(:last-of-type):not(#hack), #nav-bar .toolbaritem-combined-buttons:not(.unified-extensions-item) toolbarbutton:not(:last-of-type):not(#hack),
#appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(:last-of-type):not(#appMenu-zoomEnlarge-button), #appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(:last-of-type):not(#appMenu-zoomEnlarge-button),
#context-navigation menuitem:not(:last-of-type), #context-navigation menuitem:not(:last-of-type),
.findbar-container toolbarbutton.findbar-find-previous, .findbar-container toolbarbutton.findbar-find-previous,
@@ -252,7 +254,7 @@ button.close:active,
margin-right: 0 !important; margin-right: 0 !important;
} }
#nav-bar .toolbaritem-combined-buttons toolbarbutton:not(:first-of-type):not(#hack), #nav-bar .toolbaritem-combined-buttons:not(.unified-extensions-item) toolbarbutton:not(:first-of-type):not(#hack),
#appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(:first-of-type):not(#appMenu-fullscreen-button), #appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(:first-of-type):not(#appMenu-fullscreen-button),
#context-navigation menuitem:not(:first-of-type), #context-navigation menuitem:not(:first-of-type),
.findbar-container toolbarbutton.findbar-find-previous, .findbar-container toolbarbutton.findbar-find-previous,

35
src/other/firefox/chrome/Colloid/parts/dialogs.css
View File

@@ -13,10 +13,14 @@ window {
justify-content: center; justify-content: center;
grid-auto-rows: min(90%, var(--doc-height-px)); grid-auto-rows: min(90%, var(--doc-height-px));
} }
.dialogOverlay[topmost="true"], #window-modal-dialog::backdrop { .dialogOverlay[topmost="true"]:not(.dialogOverlay-window-modal-dialog-subdialog), #window-modal-dialog::backdrop {
background-color: rgba(0, 0, 0, .5) !important; background-color: rgba(0, 0, 0, .5) !important;
} }
#window-modal-dialog {
margin-top: auto !important;
}
/* Dialog */ /* Dialog */
.dialogBox { .dialogBox {
border-radius: 12px !important; border-radius: 12px !important;
@@ -36,8 +40,11 @@ dialog {
/* Content */ /* Content */
.dialog-content-box { .dialog-content-box {
padding: 24px; padding: 24px;
padding-bottom: 0;
} }
#titleContainer { #titleContainer {
padding: 6px !important;
margin-top: 6px !important;
justify-content: center !important; justify-content: center !important;
} }
.titleIcon { .titleIcon {
@@ -46,27 +53,33 @@ dialog {
/* Buttons */ /* Buttons */
.dialog-button-box { .dialog-button-box {
padding: 3px;
display: flex !important; display: flex !important;
border-top: 1px solid var(--gnome-toolbar-border-color) !important;
} }
.dialog-button-box button:not(#hack) { .dialog-button-box button:not(#hack) {
height: auto !important; height: auto !important;
max-height: unset !important; max-height: unset !important;
padding: 10px 14px !important; padding: 10px 14px !important;
margin: 0 !important; margin: 3px !important;
border-radius: 0 !important; border-radius: 6px !important;
flex: 1; flex: 1;
border-bottom: 0 !important; border: none !important;
} }
/*.dialog-button-box button:not(:last-of-type) {*/
/* border-right: 1px solid var(--gnome-toolbar-border-color) !important;*/
/*}*/
/* Buttons borders - only suppor for cancel/ok */ /* Buttons borders - only suppor for cancel/ok */
.dialog-button-box button[dlgtype="accept"] { /*.dialog-button-box button[dlgtype="accept"] {*/
border-right: 0 !important; /* border-right: 0 !important;*/
border-left: 0 !important; /* border-left: 0 !important;*/
} /*}*/
.dialog-button-box button[dlgtype="cancel"]:not(#hack) { /*.dialog-button-box button[dlgtype="cancel"]:not(#hack) {*/
border-left: 0 !important; /* border-left: 0 !important;*/
} /*}*/
/* Hadler dialog */ /* Hadler dialog */
#os-default-handler image { #os-default-handler image {

1
src/other/firefox/chrome/Colloid/parts/findbar.css
View File

@@ -20,6 +20,7 @@ findbar label, findbar description {
flex-direction: row; flex-direction: row;
margin: 0 !important; margin: 0 !important;
width: calc(100% - 42px); width: calc(100% - 42px);
height: auto !important;
} }
hbox[anonid="findbar-textbox-wrapper"] { hbox[anonid="findbar-textbox-wrapper"] {

22
src/other/firefox/chrome/Colloid/parts/popups.css
View File

@@ -229,14 +229,36 @@ menupopup menu:not([disabled="true"]):is(:hover, [_moz-menuactive]),
background: var(--gnome-menu-button-hover-background) !important; background: var(--gnome-menu-button-hover-background) !important;
} }
/* Menu buttons active */
menuitem:not([disabled="true"]):is(:active, [_moz-menuactive]),
menupopup menu:not([disabled="true"]):is(:active, [_moz-menuactive]),
.subviewbutton:not([disabled="true"], #appMenu-zoom-controls2, #appMenu-fxa-label2):active,
.protections-popup-footer-button:not([disabled="true"]):active,
#protections-popup-show-report-stack:active .protections-popup-footer-button,
.protections-popup-category:not([disabled="true"]):active,
.identity-popup-content-blocking-category:not([disabled="true"]):active,
#PlacesToolbar .bookmark-item:active,
#downloadsPanel-mainView .download-state:active {
background: var(--gnome-button-flat-active-background) !important;
box-shadow: none !important;
border: none;
}
/* Menu buttons fix */ /* Menu buttons fix */
#appMenu-fxa-label2 { #appMenu-fxa-label2 {
padding: 0 !important; padding: 0 !important;
} }
#appMenu-fxa-label2:hover { #appMenu-fxa-label2:hover {
background: transparent !important; background: transparent !important;
} }
#appMenu-fxa-label2:active {
background: transparent !important;
box-shadow: none !important;
border: none;
}
/* Menu buttons back */ /* Menu buttons back */
.subviewbutton-back { .subviewbutton-back {
opacity: 1 !important; opacity: 1 !important;

3
src/sass/gnome-shell/common/_search-results.scss
View File

@@ -45,7 +45,8 @@
padding: $base_padding * 3; padding: $base_padding * 3;
border: none; border: none;
box-shadow: none; box-shadow: none;
background: none; background-color: transparent !important;
background-image: none !important;
text-shadow: none; text-shadow: none;
color: on(black, secondary); color: on(black, secondary);
} }

75
src/sass/gnome-shell/extensions-40-0/_misc.scss
View File

@@ -147,3 +147,78 @@
.pop-shell-tab-urgent { .pop-shell-tab-urgent {
background: $error; background: $error;
} }
//
// Blur my shell
//
#panel.light-panel,
#panel.dark-panel,
#panel.transparent-panel {
.panel-button {
color: on(dark, secondary) !important;
&.clock-display {
.clock {
color: on(dark, secondary) !important;
}
}
&:hover {
color: on(dark, secondary) !important;
background-color: on(dark, divider) !important;
&.clock-display {
.clock {
background-color: on(dark, divider) !important;
}
}
}
&:active, &:checked, &:focus {
color: on(dark) !important;
background-color: on(dark, track) !important;
&.clock-display {
.clock {
background-color: on(dark, track) !important;
}
}
}
&:hover, &:active, &:overview, &:focus, &:checked {
&.clock-display {
background-color: transparent !important;
.clock {
color: on(dark) !important;
}
}
}
}
}
.overview-components-transparent,
.overview-components-light,
.overview-components-dark {
.search-entry {
caret-color: on(dark) !important;
.search-entry-icon {
color: on(dark, secondary) !important;
}
StLabel.hint-text {
color: on(dark, track) !important;
}
}
.search-section-content {
border-radius: $icon_radius;
}
.search-section-separator {
height: 0 !important;
background-color: transparent !important;
}
}

9
src/sass/gtk/apps/_gnome-4.0.scss
View File

@@ -1160,13 +1160,19 @@ $weather_forecast_color: #ae7b03;
.forecast-card { .forecast-card {
transition: border-radius 100ms ease-out; transition: border-radius 100ms ease-out;
border-radius: $corner-radius; border-radius: $corner-radius;
border-width: 1px 0;
} }
.forecast-card separator { .forecast-card separator {
background-color: $border; background-color: $border;
} }
#daily-forecast-box {
> separator:last-child {
background-color: transparent;
min-width: 0;
}
}
#conditions-grid, #conditions-grid,
#attributionGrid { #attributionGrid {
margin-left: $space-size * 3; margin-left: $space-size * 3;
@@ -1177,6 +1183,7 @@ $weather_forecast_color: #ae7b03;
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
border-radius: 0; border-radius: 0;
border-width: 1px 0;
} }
.forecast-temperature-label { .forecast-temperature-label {