1
0
Fork
You've already forked Somix
1

Branding update #6

Open
heartade wants to merge 6 commits from heartade/Somix:heartade/logo into master
pull from: heartade/Somix:heartade/logo
merge into: imbev:master
imbev:master
imbev:pages
First-time contributor
Copy link
  • Added build.ps1 to try to run on Windows
  • Updated favicon and navbar wordmark
  • The wordmark SVG is hard-coded in a separate component (wordmark.rs)
- Added `build.ps1` to try to run on Windows - Updated favicon and navbar wordmark - The wordmark SVG is hard-coded in a separate component (`wordmark.rs`)
Owner
Copy link

I approve the changes, however the powershell build script is unnecessary. build.sh is for production builds, while the developer is expected to install dependencies manually.

I wouldn't be opposed to changing parts of build.ps1 and build.sh into setup.ps1 and setup.sh.

I approve the changes, however the powershell build script is unnecessary. build.sh is for production builds, while the developer is expected to install dependencies manually. I wouldn't be opposed to changing parts of build.ps1 and build.sh into setup.ps1 and setup.sh.
Owner
Copy link

Also, I believe the logo has the wrong green. The branding color pallet can be found at tailwind.config.js

Also, I believe the logo has the wrong green. The branding color pallet can be found at tailwind.config.js
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u heartade/logo:heartade-heartade/logo
git switch heartade-heartade/logo

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff heartade-heartade/logo
git switch heartade-heartade/logo
git rebase master
git switch master
git merge --ff-only heartade-heartade/logo
git switch heartade-heartade/logo
git rebase master
git switch master
git merge --no-ff heartade-heartade/logo
git switch master
git merge --squash heartade-heartade/logo
git switch master
git merge --ff-only heartade-heartade/logo
git switch master
git merge heartade-heartade/logo
git push origin master
Sign in to join this conversation.
No reviewers
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
imbev/Somix!6
Reference in a new issue
imbev/Somix
No description provided.
Delete branch "heartade/Somix:heartade/logo"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?