teckids/kalle-ui

Watch

Fork 1

Resolve "UI Enhancements" #6

Open

skyhopper4697 wants to merge 9 commits from 2-ui-enhancements into main

skyhopper4697 commented

2024-06-19 19:57:23 +02:00

(Migrated from edugit.org)

Closes #2

skyhopper4697 commented

2024-06-19 20:01:00 +02:00

(Migrated from edugit.org)

added 1 commit

949c6bd0 - Enhance UI

Compare with previous version

added 1 commit <ul><li>949c6bd0 - Enhance UI</li></ul> [Compare with previous version](/Teckids/hacknfun/kalle-ui/-/merge_requests/3/diffs?diff_id=44181&start_sha=1b5ace376150a6c345a1c5e50436533810a068a2)

pinguin commented

2024-06-19 20:01:57 +02:00

(Migrated from edugit.org)

marked this merge request as ready

marked this merge request as **ready**

skyhopper4697 commented

2024-06-19 20:02:27 +02:00

(Migrated from edugit.org)

marked this merge request as draft

marked this merge request as **draft**

skyhopper4697 commented

2024-06-19 20:28:52 +02:00

(Migrated from edugit.org)

marked this merge request as ready

marked this merge request as **ready**

skyhopper4697 commented

2024-06-20 15:36:50 +02:00

(Migrated from edugit.org)

added 1 commit

e5719eef - Enhance UI and center

Compare with previous version

added 1 commit <ul><li>e5719eef - Enhance UI and center</li></ul> [Compare with previous version](/Teckids/hacknfun/kalle-ui/-/merge_requests/3/diffs?diff_id=44208&start_sha=949c6bd0cfd942b7673b43dc089b85a36cd61b2e)

skyhopper4697 commented

2024-06-20 15:50:15 +02:00

(Migrated from edugit.org)

added 1 commit

b1a400a5 - Enlarge Texts

Compare with previous version

added 1 commit <ul><li>b1a400a5 - Enlarge Texts</li></ul> [Compare with previous version](/Teckids/hacknfun/kalle-ui/-/merge_requests/3/diffs?diff_id=44209&start_sha=e5719eefad6827b8bf3163ef5e5bc9e9244898b1)

skyhopper4697 commented

2024-06-20 15:52:24 +02:00

(Migrated from edugit.org)

added 1 commit

146c72e8 - Add CSS file

Compare with previous version

added 1 commit <ul><li>146c72e8 - Add CSS file</li></ul> [Compare with previous version](/Teckids/hacknfun/kalle-ui/-/merge_requests/3/diffs?diff_id=44210&start_sha=b1a400a591e9c3f96d6425199ace13eab8d0946a)

skyhopper4697 commented

2024-06-20 16:13:23 +02:00

(Migrated from edugit.org)

added 1 commit

1851e0c2 - resize buttons and colorpickers

Compare with previous version

added 1 commit <ul><li>1851e0c2 - resize buttons and colorpickers</li></ul> [Compare with previous version](/Teckids/hacknfun/kalle-ui/-/merge_requests/3/diffs?diff_id=44219&start_sha=146c72e8e485454e6a624755fb1a50b3f59991ce)

skyhopper4697 commented

2024-06-20 16:15:06 +02:00

(Migrated from edugit.org)

added 1 commit

4fd4d2fe - resize buttons and colorpickers

Compare with previous version

added 1 commit <ul><li>4fd4d2fe - resize buttons and colorpickers</li></ul> [Compare with previous version](/Teckids/hacknfun/kalle-ui/-/merge_requests/3/diffs?diff_id=44220&start_sha=1851e0c2e59ebebdf628e716ccdfb724d6e64513)

skyhopper4697 commented

2024-06-20 16:31:34 +02:00

(Migrated from edugit.org)

added 1 commit

b028d7ea - resize

Compare with previous version

added 1 commit <ul><li>b028d7ea - resize</li></ul> [Compare with previous version](/Teckids/hacknfun/kalle-ui/-/merge_requests/3/diffs?diff_id=44222&start_sha=4fd4d2fe9ee046f5ef9cebf686e949cb989ef925)

skyhopper4697 commented

2024-06-20 16:37:25 +02:00

(Migrated from edugit.org)

added 1 commit

ce3db355 - remove padding

Compare with previous version

added 1 commit <ul><li>ce3db355 - remove padding</li></ul> [Compare with previous version](/Teckids/hacknfun/kalle-ui/-/merge_requests/3/diffs?diff_id=44223&start_sha=b028d7eac3fcd64f3bb1f53fcc5ceb2a7e7fff7f)

skyhopper4697 commented

2024-06-20 16:41:13 +02:00

(Migrated from edugit.org)

approved this merge request

skyhopper4697 commented

2024-06-20 16:41:23 +02:00

(Migrated from edugit.org)

marked this merge request as draft

marked this merge request as **draft**

skyhopper4697 commented

2024-06-20 16:42:53 +02:00

(Migrated from edugit.org)

added 1 commit

20416f5e - .

Compare with previous version

added 1 commit <ul><li>20416f5e - .</li></ul> [Compare with previous version](/Teckids/hacknfun/kalle-ui/-/merge_requests/3/diffs?diff_id=44224&start_sha=ce3db355305bae0332779ad711f91d748233b460)

skyhopper4697 commented

2024-06-20 17:03:21 +02:00

(Migrated from edugit.org)

marked this merge request as ready

marked this merge request as **ready**

skyhopper4697 (Migrated from edugit.org) approved these changes

2026-07-31 21:58:42 +02:00

This pull request has changes conflicting with the target branch.

public/index.html

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'Resolve "UI Enhancements"' (#6) from 2-ui-enhancements into main

Merge commit body

Reviewed-on: https://code.teckids.org/teckids/kalle-ui/pulls/6

Merge pull request 'Resolve "UI Enhancements"' (#6) from 2-ui-enhancements into main

Reviewed-on: https://code.teckids.org/teckids/kalle-ui/pulls/6

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin 2-ui-enhancements:2-ui-enhancements

git switch 2-ui-enhancements

Merge

Merge the changes and update on Forgejo.

git switch main

git merge --no-ff 2-ui-enhancements

git switch 2-ui-enhancements

git rebase main

git switch main

git merge --ff-only 2-ui-enhancements

git switch 2-ui-enhancements

git rebase main

git switch main

git merge --no-ff 2-ui-enhancements

git switch main

git merge --squash 2-ui-enhancements

git switch main

git merge --ff-only 2-ui-enhancements

git switch main

git merge 2-ui-enhancements

git push origin main

No reviewers

skyhopper4697

No labels

Doing

To Do

No milestone

No project

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

teckids/kalle-ui!6

No description provided.

Rows
Columns