Skip to content

Commit 5a56f96

Browse files
puni9869puni9869
authored
Fix UI for release tag page / wiki page / subscription page (#25948)
Agenda: This PR contains UI fixes for release tag page / wiki page / subscription page. Here is the list of changes made in this PR. 1. Release tag page a. In the New Release page the whole ui got change. Now it is covering in full page page with mobile view port. Description about the release the editor preview now has a min-height. and the check boxes for `Prerelease` and option are left aligned. Couple of divider are added. 2. Subscription page: a. In the subscription page the ui was distorted in mobile view. Now its fix. Couple of unused styles were removed. 3. Create Wiki page:- a. In the page the preview of markdown is now contains a fix min-height so this it will not distorted in desktop view and a divider is added before action buttons. Couple of unused styles were removed. # Before ## Release page <img width="1391" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/319dec2e-08cf-40c5-920a-d651930ee28e"> <img width="494" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/03249f40-2d36-4552-bb93-43832aac2f8b"> <img width="1390" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/bf8b2d31-4857-480b-abd9-66a3ae6e24d8"> <img width="484" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/c3a58210-a337-4c8e-89a6-edb3975986bb"> Editor <img width="958" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/3bdd299d-d12b-4774-ace9-7184b1a57b18"> Editor preview <img width="1293" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/2b61c528-c018-4800-ab86-07aae56adecd"> <img width="484" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/ff7bc5ee-9dc0-4f78-a0b1-94277ab27700"> #### After <img width="1439" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/94f7e073-5977-40bd-98ef-0711ed0815cc"> <img width="1384" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/83e3105f-c1ee-4329-b90f-8bb724dac50f"> <img width="1440" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/05f024a5-52eb-4072-8599-d6ca12f6fad1"> <img width="1387" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/c73f069b-572a-4a13-aaa9-fc5b4dd3420d"> <img width="1440" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/2f98f012-8e64-4a12-9595-5acdef18f85c"> Markdown preview change <img width="1368" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/31e583ec-48f6-4f1a-8b56-0164fcb127a5"> Wiki page Before <img width="1393" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/9c9cfdf6-3c2a-4f47-883b-76624d96f9a0"> <img width="499" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/522ad573-1ad2-4fa2-8bf7-48a3dded14e7"> Preview of mark down. <img width="488" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/998f3c25-9fca-43c8-b1ff-648aab291727"> Footer <img width="490" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/89c6cf4e-4599-4403-bac8-285efdd9361a"> After <img width="1389" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/1ee0fc72-f864-44c0-b2e4-e0e8a8470204"> <img width="498" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/b35b9a5d-8e26-4869-a6ed-6cef1f4a87a6"> <img width="499" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/b40bcbaa-fca6-42ab-9556-f950811b565d"> Preview tab block has min-height <img width="1392" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/4a53d6c2-596c-423a-91b1-533cef734f93"> Mobile view <img width="496" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/c5ffc4c9-3c21-4cad-bc32-2ea3f0644a08"> <img width="497" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/08dd560f-4333-41ec-95b9-8154910d2254"> <img width="496" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/9fba8f55-727b-4756-a4a6-2070c719b15b"> ## Subscription page ### Before <img width="1393" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/0a7d561b-f56c-4ebe-93bd-952abecd437f"> <img width="492" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/4dc44d0c-ea81-4130-8afb-8f271c029e8a"> After <img width="1394" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/a3567e30-2b5b-49d6-9ecb-2ab481ea4d36"> <img width="494" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/024da9e2-dfc4-4672-95cc-a6ac034d9712"> <img width="508" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/b748ecea-427c-4f8b-a1bf-08f82f9a42e6">
1 parent 5446d65 commit 5a56f96

File tree

5 files changed

+26
-23
lines changed

5 files changed

+26
-23
lines changed

‎templates/repo/release/new.tmpl

+14-17
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
{{end}}
1313
</h2>
1414
{{template "base/alert" .}}
15-
<form class="ui form stackable grid" action="{{.Link}}" method="post">
15+
<form class="ui form" action="{{.Link}}" method="post">
1616
{{.CsrfTokenHtml}}
17-
<div class="ui seven wide column target">
17+
<div class="ui seven wide target">
1818
<div class="inline field {{if .Err_TagName}}error{{end}}">
1919
{{if .PageIsEditRelease}}
2020
<b>{{.tag_name}}</b><span class="at">@</span><strong>{{.tag_target}}</strong>
@@ -44,7 +44,7 @@
4444
{{end}}
4545
</div>
4646
</div>
47-
<div class="eleven wide column gt-pt-0">
47+
<div class="eleven wide gt-pt-0">
4848
<div class="field {{if .Err_Title}}error{{end}}">
4949
<input name="title" aria-label="{{.locale.Tr "repo.release.title"}}" placeholder="{{.locale.Tr "repo.release.title"}}" value="{{.title}}" autofocus maxlength="255">
5050
</div>
@@ -83,9 +83,9 @@
8383
</div>
8484
{{end}}
8585
</div>
86-
<div class="ui container">
87-
<div class="divider"></div>
88-
<div class="ui text right">
86+
<div class="divider"></div>
87+
<div class="ui">
88+
<div>
8989
{{if not .PageIsEditRelease}}
9090
<div class="tag-message field">
9191
<div class="ui checkbox">
@@ -103,30 +103,27 @@
103103
</div>
104104
</div>
105105
<span class="help">{{.locale.Tr "repo.release.prerelease_helper"}}</span>
106-
<div class="field">
106+
<div class="divider gt-mt-0"></div>
107+
<div class="gt-df gt-je">
107108
{{if .PageIsEditRelease}}
108-
<a class="ui button" href="{{.RepoLink}}/releases">
109+
<a class="ui small button" href="{{.RepoLink}}/releases">
109110
{{.locale.Tr "repo.release.cancel"}}
110111
</a>
111-
<a class="ui red button delete-button" data-url="{{$.RepoLink}}/releases/delete" data-id="{{.ID}}">
112+
<a class="ui small red button delete-button" data-url="{{$.RepoLink}}/releases/delete" data-id="{{.ID}}">
112113
{{$.locale.Tr "repo.release.delete_release"}}
113114
</a>
114115
{{if .IsDraft}}
115-
<button class="ui button" type="submit" name="draft" value="{{.locale.Tr "repo.release.save_draft"}}">{{.locale.Tr "repo.release.save_draft"}}</button>
116-
<button class="ui primary button">
116+
<button class="ui small button" type="submit" name="draft" value="{{.locale.Tr "repo.release.save_draft"}}">{{.locale.Tr "repo.release.save_draft"}}</button>
117+
<button class="ui small primary button">
117118
{{.locale.Tr "repo.release.publish"}}
118119
</button>
119120
{{else}}
120-
<button class="ui primary button">
121+
<button class="ui small primary button">
121122
{{.locale.Tr "repo.release.edit_release"}}
122123
</button>
123124
{{end}}
124125
{{else}}
125-
{{if not .tag_name}}
126-
<button class="ui button" type="submit" name="tag_only" value="{{.locale.Tr "repo.release.add_tag"}}">{{.locale.Tr "repo.release.add_tag"}}</button>
127-
{{end}}
128-
<button class="ui button" type="submit" name="draft" value="{{.locale.Tr "repo.release.save_draft"}}">{{.locale.Tr "repo.release.save_draft"}}</button>
129-
<button class="ui primary button">
126+
<button class="ui small primary button">
130127
{{.locale.Tr "repo.release.publish"}}
131128
</button>
132129
{{end}}

‎templates/repo/wiki/new.tmpl

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<div class="ui header">
77
{{.locale.Tr "repo.wiki.new_page"}}
88
{{if .PageIsWikiEdit}}
9-
<div class="ui right">
10-
<a class="ui green small button" href="{{.RepoLink}}/wiki?action=_new">{{.locale.Tr "repo.wiki.new_page_button"}}</a>
9+
<div class="ui right gt-mb-3">
10+
<a class="ui green tiny button" href="{{.RepoLink}}/wiki?action=_new">{{.locale.Tr "repo.wiki.new_page_button"}}</a>
1111
</div>
1212
{{end}}
1313
</div>
@@ -37,6 +37,7 @@
3737
<div class="field gt-mt-4">
3838
<input name="message" aria-label="{{.locale.Tr "repo.wiki.default_commit_message"}}" placeholder="{{.locale.Tr "repo.wiki.default_commit_message"}}">
3939
</div>
40+
<div class="divider"></div>
4041
<div class="text right">
4142
<button class="ui green button">
4243
{{.locale.Tr "repo.wiki.save_page"}}

‎templates/user/notification/notification_subscriptions.tmpl

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</div>
1212
<div class="ui bottom attached active tab segment">
1313
{{if eq .Status 1}}
14-
<div class="ui stackable grid">
15-
<div class="six wide column">
14+
<div class="gt-df gt-sb">
15+
<div class="gt-df">
1616
<div class="small-menu-items ui compact tiny menu">
1717
<a class="{{if eq .State "all"}}active {{end}}item" href="{{$.Link}}?sort={{$.SortType}}&state=all&issueType={{$.IssueType}}&labels={{$.Labels}}">
1818
{{.locale.Tr "all"}}
@@ -27,8 +27,8 @@
2727
</a>
2828
</div>
2929
</div>
30-
<div class="seven wide right aligned right floated column">
31-
<div class="ui right aligned secondary filter stackable menu labels">
30+
<div class="gt-df gt-sb">
31+
<div class="ui right aligned secondary filter menu labels">
3232
<!-- Type -->
3333
<div class="ui dropdown type jump item">
3434
<span class="text">

‎web_src/css/repo/release-tag.css

+4
Original file line numberDiff line numberDiff line change
@@ -132,3 +132,7 @@
132132
.repository.new.release .field .attachment_edit {
133133
width: 450px !important;
134134
}
135+
136+
.repository.new.release .markup {
137+
min-height: 240px;
138+
}

‎web_src/css/repo/wiki.css

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
.repository.wiki .markup {
1111
overflow: visible;
12+
min-height: 340px;
1213
}
1314

1415
.repository.wiki .wiki-content-parts .markup {

0 commit comments

Comments
 (0)