From 192563e1eaccc77aeb6d3cdd5a50df277c598f09 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Mon, 17 Jul 2023 18:48:04 +0530 Subject: [PATCH 1/6] Removing unused style --- .../user/notification/notification_subscriptions.tmpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/user/notification/notification_subscriptions.tmpl b/templates/user/notification/notification_subscriptions.tmpl index b5119394478c..5263845afd3a 100644 --- a/templates/user/notification/notification_subscriptions.tmpl +++ b/templates/user/notification/notification_subscriptions.tmpl @@ -11,8 +11,8 @@
{{if eq .Status 1}} -
-
+
+
{{.locale.Tr "all"}} @@ -27,8 +27,8 @@
-
-
+
+
From fbef9e92ed1a874d8e75f411412335841d90c6a0 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Mon, 17 Jul 2023 19:26:44 +0530 Subject: [PATCH 2/6] Fix: 1. Subscriptions page 2. Wiki page crate new wiki preview md content 3. margins of wiki page --- templates/repo/wiki/new.tmpl | 1 + templates/user/notification/notification_subscriptions.tmpl | 4 ++-- web_src/css/repo/wiki.css | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl index 0765cb2c353d..6ff136a556b3 100644 --- a/templates/repo/wiki/new.tmpl +++ b/templates/repo/wiki/new.tmpl @@ -37,6 +37,7 @@
+
{{if eq .Status 1}} -
-
+
+
{{.locale.Tr "all"}} diff --git a/web_src/css/repo/wiki.css b/web_src/css/repo/wiki.css index b13679f615c1..c0a2c0ddb8e4 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 { From 48f914d8653ecf4ea7fe250e69e278b2d8ae33db Mon Sep 17 00:00:00 2001 From: puni9869 Date: Mon, 17 Jul 2023 20:25:34 +0530 Subject: [PATCH 3/6] Fixing margin bottom for new page button on edit wiki page --- templates/repo/wiki/new.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl index 6ff136a556b3..cda192454402 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}}
From a1f30f7eed0195bfc907ff1b70f5604405c23b34 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Tue, 18 Jul 2023 11:22:59 +0530 Subject: [PATCH 4/6] Fixing margin bottom for release tag page --- templates/repo/release/new.tmpl | 19 ++++++++----------- web_src/css/repo/release-tag.css | 5 +++++ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index 6f7dc09a66c2..834df810647d 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,7 +103,8 @@
{{.locale.Tr "repo.release.prerelease_helper"}} -
+
+
{{if .PageIsEditRelease}} {{.locale.Tr "repo.release.cancel"}} @@ -122,10 +123,6 @@ {{end}} {{else}} - {{if not .tag_name}} - - {{end}} - diff --git a/web_src/css/repo/release-tag.css b/web_src/css/repo/release-tag.css index c537a7cfe045..88d578d7fc32 100644 --- a/web_src/css/repo/release-tag.css +++ b/web_src/css/repo/release-tag.css @@ -132,3 +132,8 @@ .repository.new.release .field .attachment_edit { width: 450px !important; } + +.repository.new.release .markup { + min-height: 240px; + overflow: visible; +} From e4c955eba0a43e6f1c44fee41a40bb9bdcf06782 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Tue, 18 Jul 2023 12:34:14 +0530 Subject: [PATCH 5/6] Fixing action buttons on release page wrapping to `gt-df` --- templates/repo/release/new.tmpl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index 834df810647d..1b32aa675d6c 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -104,26 +104,26 @@
{{.locale.Tr "repo.release.prerelease_helper"}}
-
+
{{if .PageIsEditRelease}} - + {{.locale.Tr "repo.release.cancel"}} - + {{$.locale.Tr "repo.release.delete_release"}} {{if .IsDraft}} - - + {{else}} - {{end}} {{else}} - {{end}} From 4faf38f91658752619512572806fdeac6f65e001 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Wed, 19 Jul 2023 21:01:09 +0530 Subject: [PATCH 6/6] Removing overflow css --- web_src/css/repo/release-tag.css | 1 - 1 file changed, 1 deletion(-) diff --git a/web_src/css/repo/release-tag.css b/web_src/css/repo/release-tag.css index 88d578d7fc32..33ff2cddd983 100644 --- a/web_src/css/repo/release-tag.css +++ b/web_src/css/repo/release-tag.css @@ -135,5 +135,4 @@ .repository.new.release .markup { min-height: 240px; - overflow: visible; }