From 5a56f9699c904e45e62d2bd97b3d0cf5b6f5cb9c Mon Sep 17 00:00:00 2001 From: puni9869 <80308335+puni9869@users.noreply.github.com> Date: Tue, 25 Jul 2023 23:23:16 +0530 Subject: [PATCH] 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 image image image image Editor image Editor preview image image #### After image image image image image Markdown preview change image Wiki page Before image image Preview of mark down. image Footer image After image image image Preview tab block has min-height image Mobile view image image image ## Subscription page ### Before image image After image image image --- templates/repo/release/new.tmpl | 31 +++++++++---------- templates/repo/wiki/new.tmpl | 5 +-- .../notification_subscriptions.tmpl | 8 ++--- web_src/css/repo/release-tag.css | 4 +++ web_src/css/repo/wiki.css | 1 + 5 files changed, 26 insertions(+), 23 deletions(-) diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index 6f7dc09a66..1b32aa675d 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -12,9 +12,9 @@ {{end}} {{template "base/alert" .}} -
+ {{.CsrfTokenHtml}} -
+
{{if .PageIsEditRelease}} {{.tag_name}}@{{.tag_target}} @@ -44,7 +44,7 @@ {{end}}
-
+
@@ -83,9 +83,9 @@
{{end}}
-
-
-
+
+
+
{{if not .PageIsEditRelease}}
@@ -103,30 +103,27 @@
{{.locale.Tr "repo.release.prerelease_helper"}} -
+
+
{{if .PageIsEditRelease}} - + {{.locale.Tr "repo.release.cancel"}} - + {{$.locale.Tr "repo.release.delete_release"}} {{if .IsDraft}} - - + {{else}} - {{end}} {{else}} - {{if not .tag_name}} - - {{end}} - - {{end}} diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl index 0765cb2c35..cda1924544 100644 --- a/templates/repo/wiki/new.tmpl +++ b/templates/repo/wiki/new.tmpl @@ -6,8 +6,8 @@
{{.locale.Tr "repo.wiki.new_page"}} {{if .PageIsWikiEdit}} -
- {{.locale.Tr "repo.wiki.new_page_button"}} +
+ {{.locale.Tr "repo.wiki.new_page_button"}}
{{end}}
@@ -37,6 +37,7 @@
+
{{if eq .Status 1}} -
-
+
+
{{.locale.Tr "all"}} @@ -27,8 +27,8 @@
-
-
+
+
diff --git a/web_src/css/repo/release-tag.css b/web_src/css/repo/release-tag.css index c537a7cfe0..33ff2cddd9 100644 --- a/web_src/css/repo/release-tag.css +++ b/web_src/css/repo/release-tag.css @@ -132,3 +132,7 @@ .repository.new.release .field .attachment_edit { width: 450px !important; } + +.repository.new.release .markup { + min-height: 240px; +} diff --git a/web_src/css/repo/wiki.css b/web_src/css/repo/wiki.css index b13679f615..c0a2c0ddb8 100644 --- a/web_src/css/repo/wiki.css +++ b/web_src/css/repo/wiki.css @@ -9,6 +9,7 @@ .repository.wiki .markup { overflow: visible; + min-height: 340px; } .repository.wiki .wiki-content-parts .markup {