Compare commits

...

12 Commits

Author SHA1 Message Date
nullishamy
23647dfd10 fix: drop casing; absolutely ensure gtk.css and gtk-dark.css are the same 2024-05-28 23:16:46 +01:00
nullishamy
b5eda7aba8 fix: -Dark, not a joke 2024-05-28 15:32:16 +01:00
Hammy
54633c0f72 docs(README): hardcode version in more places (#256)
As we make use of release-please, I feel like it's
nicer to hardcode the versions as they will
automatically get updated upon release.
2024-05-27 23:38:55 +01:00
github-actions[bot]
4173b70b91 chore(main): release 1.0.2 (#253) 2024-05-27 19:01:50 +01:00
Hammy
006c148f10 ci(release): remove token (#252) 2024-05-27 18:58:15 +01:00
github-actions[bot]
409628ed32 chore(main): release 1.0.1 (#248)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Hammy <58985301+sgoudham@users.noreply.github.com>
2024-05-27 18:50:11 +01:00
Hammy
22a62eab04 ci(release): update name & gen patches (#250) 2024-05-27 18:46:40 +01:00
Hammy
b421b50380 ci: use token for release-please (#249) 2024-05-27 18:41:28 +01:00
nullishamy
cae57c80f8 fix: alt tab menu (#209) 2024-05-27 18:28:13 +01:00
Hammy
e7b8bb2c4a build: use release-please (#235) 2024-05-27 18:27:00 +01:00
nullishamy
e11c9b71f0 chore: update install script to v1.0.0 (#247) 2024-05-27 18:23:07 +01:00
nullishamy
09b1cd28d4 chore: update install script to rc6 (#245) 2024-05-27 15:49:56 +01:00
8 changed files with 83 additions and 21 deletions

View File

@@ -1,12 +1,28 @@
name: "Mainline release"
name: release
on:
workflow_dispatch:
push:
tags:
- "v*"
branches: [main]
permissions:
contents: write
pull-requests: write
jobs:
release-please:
runs-on: ubuntu-latest
steps:
- uses: googleapis/release-please-action@v4
id: release
outputs:
release_created: ${{ steps.release.outputs.release_created }}
tag_name: ${{ steps.release.outputs.tag_name }}
release:
runs-on: ubuntu-latest
needs: release-please
if: ${{ needs.release-please.outputs.release_created }}
steps:
- name: Checkout
uses: actions/checkout@v4
@@ -22,12 +38,13 @@ jobs:
run: sudo apt update && sudo apt install -y sassc inkscape optipng
- name: Generate themes
run: |
python patches/xfwm4/generate_assets.py
python ./build.py mocha --all-accents --zip -d $PWD/releases &&
python ./build.py macchiato --all-accents --zip -d $PWD/releases &&
python ./build.py frappe --all-accents --zip -d $PWD/releases &&
python ./build.py latte --all-accents --zip -d $PWD/releases
- name: Add zips to release
uses: softprops/action-gh-release@v2
with:
draft: true
files: ./releases/*.zip
run: gh release upload ${{ needs.release-please.outputs.tag_name }} releases/*.zip
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -0,0 +1,3 @@
{
".": "1.0.2"
}

15
CHANGELOG.md Normal file
View File

@@ -0,0 +1,15 @@
# Changelog
## [1.0.2](https://github.com/catppuccin/gtk/compare/v1.0.1...v1.0.2) (2024-05-27)
### Bug Fixes
* alt tab menu ([#209](https://github.com/catppuccin/gtk/issues/209)) ([cae57c8](https://github.com/catppuccin/gtk/commit/cae57c80f81fd1cc40fab2655109b09fa97103b9))
## [1.0.1](https://github.com/catppuccin/gtk/compare/v1.0.0...v1.0.1) (2024-05-27)
### Bug Fixes
* alt tab menu ([#209](https://github.com/catppuccin/gtk/issues/209)) ([cae57c8](https://github.com/catppuccin/gtk/commit/cae57c80f81fd1cc40fab2655109b09fa97103b9))

View File

@@ -28,8 +28,10 @@ This GTK theme requires:
We provide a Python script to automate the process of installing the theme:
<!-- x-release-please-start-version -->
```bash
curl -LsS "https://raw.githubusercontent.com/catppuccin/gtk/main/install.py" -o install.py
curl -LsSO "https://raw.githubusercontent.com/catppuccin/gtk/v1.0.2/install.py"
python3 install.py <flavor> <accent>
[catppuccin-gtk] [INFO] - Installation info:
flavor: mocha
@@ -37,7 +39,7 @@ python3 install.py <flavor> <accent>
dest: /home/<user>/.local/share/themes
link: False
remote_url: https://github.com/catppuccin/gtk/releases/download/v1.0.0-alpha/catppuccin-mocha-blue-standard+default.zip
remote_url: https://github.com/catppuccin/gtk/releases/download/v1.0.2/catppuccin-mocha-blue-standard+default.zip
[catppuccin-gtk] [INFO] - Starting download...
[catppuccin-gtk] [INFO] - Response status: 200
[catppuccin-gtk] [INFO] - Download finished, zip is valid
@@ -101,7 +103,7 @@ sudo flatpak override --env=GTK_THEME="catppuccin-${FLAVOR}-${ACCENT}-standard+d
### Manual installation
If your distro does not package our theme, and the installation script will not work for your use case, you can pull down releases and extract them yourself. You can find the [latest release on GitHub](https://github.com/catppuccin/gtk/releases/latest).
If your distro does not package our theme, and the installation script will not work for your use case, you can pull down releases and extract them yourself. You can find the [latest release on GitHub](https://github.com/catppuccin/gtk/releases/tag/v1.0.2).
```bash
cd ~/.local/share/themes
@@ -110,7 +112,7 @@ cd ~/.local/share/themes
export ROOT_URL="https://https://github.com/catppuccin/gtk/releases/download"
# Change to the tag you want to download
export RELEASE="v1.0.0"
export RELEASE="v1.0.2"
# Change to suite your flavor / accent combination
export FLAVOR="mocha"
@@ -130,6 +132,8 @@ ln -sf "${THEME_DIR}/gtk-4.0/gtk.css" "${HOME}/.config/gtk-4.0/gtk.css" &&
ln -sf "${THEME_DIR}/gtk-4.0/gtk-dark.css" "${HOME}/.config/gtk-4.0/gtk-dark.css"
```
<!-- x-release-please-end -->
## Building
If our prebuilt offerings do not match your requirements, you will have to build the theme from source.

View File

@@ -55,10 +55,7 @@ class BuildContext:
tweaks: Tweaks
def output_dir(self) -> str:
suffix = "light"
if self.flavor.dark:
suffix = "dark"
return f"{self.build_root}/{self.build_id()}-{suffix}"
return f"{self.build_root}/{self.build_id()}"
def build_id(self) -> str:
return f"{self.theme_name}-{self.flavor.identifier}-{self.accent.identifier}-{self.size}+{self.tweaks.id() or 'default'}"
@@ -118,8 +115,7 @@ def build(ctx: BuildContext):
[
"sassc",
*SASSC_OPT,
# NOTE: This uses 'Dark' for the source, but 'dark' for the destination. This is intentional. Do !!NOT!! change it without consultation
f"{SRC_DIR}/main/gtk-3.0/gtk-Dark.scss",
f"{SRC_DIR}/main/gtk-3.0/gtk{ctx.apply_suffix(DARK_LIGHT)}.scss",
f"{output_dir}/gtk-3.0/gtk-dark.css",
]
)
@@ -137,8 +133,7 @@ def build(ctx: BuildContext):
[
"sassc",
*SASSC_OPT,
# NOTE: This uses 'Dark' for the source, but 'dark' for the destination. This is intentional. Do !!NOT!! change it without consultation
f"{SRC_DIR}/main/gtk-4.0/gtk-Dark.scss",
f"{SRC_DIR}/main/gtk-4.0/gtk{ctx.apply_suffix(DARK_LIGHT)}.scss",
f"{output_dir}/gtk-4.0/gtk-dark.css",
]
)
@@ -215,7 +210,6 @@ def subst_text(path, _from, to):
GS_VERSION = "46-0"
def gnome_shell_version():
shutil.copyfile(
f"{SRC_DIR}/sass/gnome-shell/_common.scss",
@@ -459,6 +453,7 @@ def apply_colloid_patches():
"sass-palette-mocha.patch",
"sass-palette-latte.patch",
"sass-palette-macchiato.patch",
"fixes/alt-tab-background-color.patch"
]:
path = f"./patches/colloid/{patch}"
logger.info(f"Applying patch '{patch}', located at '{path}'")

View File

@@ -94,7 +94,7 @@ def parse_args():
def build_release_url(ctx: InstallContext) -> str:
repo_root = "https://github.com/catppuccin/gtk/releases/download"
release = "v1.0.0-rc5"
release = "v1.0.2" # x-release-please-version
zip_name = f"catppuccin-{ctx.flavor}-{ctx.accent}-standard+default.zip"
return f"{repo_root}/{release}/{zip_name}"

View File

@@ -0,0 +1,13 @@
diff --git a/src/sass/gnome-shell/common/_switcher-popup.scss b/src/sass/gnome-shell/common/_switcher-popup.scss
index 90b51ab4..408662fb 100644
--- a/src/sass/gnome-shell/common/_switcher-popup.scss
+++ b/src/sass/gnome-shell/common/_switcher-popup.scss
@@ -14,6 +14,8 @@
border-radius: $base_radius;
border: 1px solid transparent;
+ background-color: $osd;
+
&:outlined {
background-color: $divider;
color: $text; // for Ubuntu session

View File

@@ -0,0 +1,15 @@
{
"last-release-sha": "8b54c05ff5de6c7fabc68fab410cfd093a91193c",
"draft": true,
"packages": {
".": {
"package-name": "",
"release-type": "simple",
"extra-files": [
{ "type": "generic", "path": "README.md" },
{ "type": "generic", "path": "install.py" }
]
}
},
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
}