Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix UI for release tag page / wiki page / subscription page #25948

Merged
merged 20 commits into from
Jul 25, 2023
Merged

Fix UI for release tag page / wiki page / subscription page #25948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
192563e
Removing unused style
puni9869 Jul 17, 2023
fbef9e9
Fix:
puni9869 Jul 17, 2023
48f914d
Fixing margin bottom for new page button on edit wiki page
puni9869 Jul 17, 2023
c984ee7
Merge branch 'main' into punit/fix-ui
puni9869 Jul 18, 2023
a1f30f7
Fixing margin bottom for release tag page
puni9869 Jul 18, 2023
e4c955e
Fixing action buttons on release page wrapping to `gt-df`
puni9869 Jul 18, 2023
c0f12a9
Merge branch 'main' into punit/fix-ui
puni9869 Jul 18, 2023
8b7473f
Merge branch 'go-gitea:main' into punit/fix-ui
puni9869 Jul 19, 2023
4faf38f
Removing overflow css
puni9869 Jul 19, 2023
a65f897
Merge branch 'main' into punit/fix-ui
puni9869 Jul 19, 2023
69f9420
Merge branch 'main' into punit/fix-ui
puni9869 Jul 20, 2023
cc69202
Merge branch 'main' into punit/fix-ui
puni9869 Jul 20, 2023
17cc822
Merge branch 'main' into punit/fix-ui
puni9869 Jul 21, 2023
ed208ca
Merge branch 'main' into punit/fix-ui
puni9869 Jul 21, 2023
289d5bd
Merge branch 'main' into punit/fix-ui
puni9869 Jul 22, 2023
d740739
Merge branch 'main' into punit/fix-ui
puni9869 Jul 23, 2023
017207a
Merge branch 'main' into punit/fix-ui
puni9869 Jul 24, 2023
6a3d0dd
Merge branch 'main' into punit/fix-ui
puni9869 Jul 24, 2023
a91385b
Merge branch 'main' into punit/fix-ui
puni9869 Jul 25, 2023
ac2da72
Merge branch 'main' into punit/fix-ui
GiteaBot Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 14 additions & 17 deletions templates/repo/release/new.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
{{end}}
</h2>
{{template "base/alert" .}}
<form class="ui form stackable grid" action="{{.Link}}" method="post">
<form class="ui form" action="{{.Link}}" method="post">
{{.CsrfTokenHtml}}
<div class="ui seven wide column target">
<div class="ui seven wide target">
<div class="inline field {{if .Err_TagName}}error{{end}}">
{{if .PageIsEditRelease}}
<b>{{.tag_name}}</b><span class="at">@</span><strong>{{.tag_target}}</strong>
Expand Down Expand Up @@ -44,7 +44,7 @@
{{end}}
</div>
</div>
<div class="eleven wide column gt-pt-0">
<div class="eleven wide gt-pt-0">
<div class="field {{if .Err_Title}}error{{end}}">
<input name="title" aria-label="{{.locale.Tr "repo.release.title"}}" placeholder="{{.locale.Tr "repo.release.title"}}" value="{{.title}}" autofocus maxlength="255">
</div>
Expand Down Expand Up @@ -83,9 +83,9 @@
</div>
{{end}}
</div>
<div class="ui container">
<div class="divider"></div>
<div class="ui text right">
<div class="divider"></div>
<div class="ui">
<div>
{{if not .PageIsEditRelease}}
<div class="tag-message field">
<div class="ui checkbox">
Expand All @@ -103,30 +103,27 @@
</div>
</div>
<span class="help">{{.locale.Tr "repo.release.prerelease_helper"}}</span>
<div class="field">
<div class="divider gt-mt-0"></div>
<div class="gt-df gt-je">
{{if .PageIsEditRelease}}
<a class="ui button" href="{{.RepoLink}}/releases">
<a class="ui small button" href="{{.RepoLink}}/releases">
{{.locale.Tr "repo.release.cancel"}}
</a>
<a class="ui red button delete-button" data-url="{{$.RepoLink}}/releases/delete" data-id="{{.ID}}">
<a class="ui small red button delete-button" data-url="{{$.RepoLink}}/releases/delete" data-id="{{.ID}}">
{{$.locale.Tr "repo.release.delete_release"}}
</a>
{{if .IsDraft}}
<button class="ui button" type="submit" name="draft" value="{{.locale.Tr "repo.release.save_draft"}}">{{.locale.Tr "repo.release.save_draft"}}</button>
<button class="ui primary button">
<button class="ui small button" type="submit" name="draft" value="{{.locale.Tr "repo.release.save_draft"}}">{{.locale.Tr "repo.release.save_draft"}}</button>
<button class="ui small primary button">
{{.locale.Tr "repo.release.publish"}}
</button>
{{else}}
<button class="ui primary button">
<button class="ui small primary button">
{{.locale.Tr "repo.release.edit_release"}}
</button>
{{end}}
{{else}}
{{if not .tag_name}}
<button class="ui button" type="submit" name="tag_only" value="{{.locale.Tr "repo.release.add_tag"}}">{{.locale.Tr "repo.release.add_tag"}}</button>
{{end}}
<button class="ui button" type="submit" name="draft" value="{{.locale.Tr "repo.release.save_draft"}}">{{.locale.Tr "repo.release.save_draft"}}</button>
<button class="ui primary button">
<button class="ui small primary button">
{{.locale.Tr "repo.release.publish"}}
</button>
{{end}}
Expand Down
5 changes: 3 additions & 2 deletions templates/repo/wiki/new.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<div class="ui header">
{{.locale.Tr "repo.wiki.new_page"}}
{{if .PageIsWikiEdit}}
<div class="ui right">
<a class="ui green small button" href="{{.RepoLink}}/wiki?action=_new">{{.locale.Tr "repo.wiki.new_page_button"}}</a>
<div class="ui right gt-mb-3">
<a class="ui green tiny button" href="{{.RepoLink}}/wiki?action=_new">{{.locale.Tr "repo.wiki.new_page_button"}}</a>
</div>
{{end}}
</div>
Expand Down Expand Up @@ -37,6 +37,7 @@
<div class="field gt-mt-4">
<input name="message" aria-label="{{.locale.Tr "repo.wiki.default_commit_message"}}" placeholder="{{.locale.Tr "repo.wiki.default_commit_message"}}">
</div>
<div class="divider"></div>
<div class="text right">
<button class="ui green button">
{{.locale.Tr "repo.wiki.save_page"}}
Expand Down
8 changes: 4 additions & 4 deletions templates/user/notification/notification_subscriptions.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
</div>
<div class="ui bottom attached active tab segment">
{{if eq .Status 1}}
<div class="ui stackable grid">
<div class="six wide column">
<div class="gt-df gt-sb">
<div class="gt-df">
<div class="small-menu-items ui compact tiny menu">
<a class="{{if eq .State "all"}}active {{end}}item" href="{{$.Link}}?sort={{$.SortType}}&state=all&issueType={{$.IssueType}}&labels={{$.Labels}}">
{{.locale.Tr "all"}}
Expand All @@ -27,8 +27,8 @@
</a>
</div>
</div>
<div class="seven wide right aligned right floated column">
<div class="ui right aligned secondary filter stackable menu labels">
<div class="gt-df gt-sb">
<div class="ui right aligned secondary filter menu labels">
<!-- Type -->
<div class="ui dropdown type jump item">
<span class="text">
Expand Down
4 changes: 4 additions & 0 deletions web_src/css/repo/release-tag.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,3 +132,7 @@
.repository.new.release .field .attachment_edit {
width: 450px !important;
}

.repository.new.release .markup {
min-height: 240px;
}
1 change: 1 addition & 0 deletions web_src/css/repo/wiki.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

.repository.wiki .markup {
overflow: visible;
min-height: 340px;
}

.repository.wiki .wiki-content-parts .markup {
Expand Down