ilot/ilot-io
2
0
Fork 1
Code Issues 8 Pull requests 3 Projects Releases Packages Wiki Activity Actions

Make beautiful #7

Open
ayakael wants to merge 13 commits from make-beautiful into main
pull from: make-beautiful
merge into: ilot:main
Conversation 1 Commits 13 Files changed 32 +1397 -340
ayakael commented 2024-09-08 20:20:29 +00:00
Owner
Copy link
No description provided.
ayakael added 1 commit 2024-09-08 20:20:29 +00:00
templates/page.tmpl: drop unused code
Some checks failed
/ preview (pull_request) Failing after 31s
Details
8b8f5f3438
ayakael changed title from Make beautifuil to Make beautiful 2024-09-08 20:20:39 +00:00
ayakael force-pushed make-beautiful from 8b8f5f3438 to b039af4160 2024-09-08 20:25:52 +00:00 Compare
ayakael added 1 commit 2024-09-08 20:27:27 +00:00
templates/pages: trailing if statement
Some checks failed
/ preview (pull_request) Successful in 44s
Details
/ cleanup (pull_request) Failing after 28s
Details
fdebe12df7
ayakael added 3 commits 2024-09-08 21:49:37 +00:00
templates/*: move to bootstrap 5
All checks were successful
/ preview (pull_request) Successful in 38s
Details
61956a69c9
content/index: block concept draft
All checks were successful
/ preview (pull_request) Successful in 35s
Details
6bf66149a1
ayakael added 5 commits 2024-09-08 22:50:22 +00:00
{bootstrap.local.css,local.css}: import from rewrite draft
All checks were successful
/ preview (pull_request) Successful in 38s
Details
7d45b0e710
ayakael added 1 commit 2024-09-10 11:44:29 +00:00
forgejo-ci: use default actions
All checks were successful
/ preview (pull_request) Successful in 39s
Details
399a864125
ayakael commented 2024-09-10 12:32:50 +00:00
Author
Owner
Copy link

This PR also updated to bootstrap 5, and cleans-up the code-base. These changes should be in a different so that this PR only focused on the design changes.

This PR also updated to bootstrap 5, and cleans-up the code-base. These changes should be in a different so that this PR only focused on the design changes.
All checks were successful
/ preview (pull_request) Successful in 39s
Details
This pull request has changes conflicting with the target branch.
  • .forgejo/workflows/cleanup.yaml
  • .forgejo/workflows/deploy.yaml
  • basewiki/bootstrap.local.css
  • basewiki/local.css
  • content/footer.fr.po
  • content/footer.html
  • content/footer.pot
  • content/index.fr.po
  • content/index.mdwn
  • content/index.pot
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin make-beautiful:make-beautiful
git checkout make-beautiful

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 checkout main
git merge --no-ff make-beautiful
git checkout make-beautiful
git rebase main
git checkout main
git merge --ff-only make-beautiful
git checkout make-beautiful
git rebase main
git checkout main
git merge --no-ff make-beautiful
git checkout main
git merge --squash make-beautiful
git checkout main
git merge --ff-only make-beautiful
git checkout main
git merge make-beautiful
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
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: ilot/ilot-io#7
No description provided.
Delete branch "make-beautiful"

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?