From 6cf240338918c371575f2c6c0466bf9db6cd1c77 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 9 Mar 2023 23:26:20 +0100 Subject: [PATCH 1/7] Fix and move "Use this template" button --- templates/repo/home.tmpl | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 2a79c51ddf946..d59bc4f4f7f12 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -99,20 +99,16 @@ {{svg "octicon-triangle-down" 14 "dropdown icon"}} {{end}} + {{if and (eq $n 0) (.Repository.IsTemplate)}} + + {{.locale.Tr "repo.use_template"}} + + {{end}} {{if ne $n 0}} {{EllipsisString .Repository.Name 30}}{{range $i, $v := .TreeNames}}/{{if eq $i $l}}{{EllipsisString $v 30}}{{else}}{{$p := index $.Paths $i}}{{EllipsisString $v 30}}{{end}}{{end}} {{end}}
- {{if eq $n 0}} - {{if .Repository.IsTemplate}} -
- - {{.locale.Tr "repo.use_template"}} - -
- {{end}} - {{end}} {{if eq $n 0}}
From 39d66dc3661e42e8f401c8c38c57905a08122670 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 9 Mar 2023 23:45:04 +0100 Subject: [PATCH 2/7] move back to right, add gap --- templates/repo/home.tmpl | 10 +++++----- web_src/less/helpers.less | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index d59bc4f4f7f12..912e24e289a39 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -99,16 +99,16 @@ {{svg "octicon-triangle-down" 14 "dropdown icon"}} {{end}} + {{if ne $n 0}} + {{EllipsisString .Repository.Name 30}}{{range $i, $v := .TreeNames}}/{{if eq $i $l}}{{EllipsisString $v 30}}{{else}}{{$p := index $.Paths $i}}{{EllipsisString $v 30}}{{end}}{{end}} + {{end}} +
+
{{if and (eq $n 0) (.Repository.IsTemplate)}} {{.locale.Tr "repo.use_template"}} {{end}} - {{if ne $n 0}} - {{EllipsisString .Repository.Name 30}}{{range $i, $v := .TreeNames}}/{{if eq $i $l}}{{EllipsisString $v 30}}{{else}}{{$p := index $.Paths $i}}{{EllipsisString $v 30}}{{end}}{{end}} - {{end}} -
-
{{if eq $n 0}}
diff --git a/web_src/less/helpers.less b/web_src/less/helpers.less index baa5959946e82..08589fdaab9ff 100644 --- a/web_src/less/helpers.less +++ b/web_src/less/helpers.less @@ -172,6 +172,27 @@ .gt-py-4 { padding-top: 1rem !important; padding-bottom: 1rem !important; } .gt-py-5 { padding-top: 2rem !important; padding-bottom: 2rem !important; } +.gt-gap-0 { gap: 0 !important; } +.gt-gap-1 { gap: .125rem !important; } +.gt-gap-2 { gap: .25rem !important; } +.gt-gap-3 { gap: .5rem !important; } +.gt-gap-4 { gap: 1rem !important; } +.gt-gap-5 { gap: 2rem !important; } + +.gt-gap-x-0 { column-gap: 0 !important; } +.gt-gap-x-1 { column-gap: .125rem !important; } +.gt-gap-x-2 { column-gap: .25rem !important; } +.gt-gap-x-3 { column-gap: .5rem !important; } +.gt-gap-x-4 { column-gap: 1rem !important; } +.gt-gap-x-5 { column-gap: 2rem !important; } + +.gt-gap-y-0 { row-gap: 0 !important; } +.gt-gap-y-1 { row-gap: .125rem !important; } +.gt-gap-y-2 { row-gap: .25rem !important; } +.gt-gap-y-3 { row-gap: .5rem !important; } +.gt-gap-y-4 { row-gap: 1rem !important; } +.gt-gap-y-5 { row-gap: 2rem !important; } + .gt-content-center { align-content: center !important; } @media @mediaSm { From 32a123eac55268f4f0c119c53b5ac5cfe121c967 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 9 Mar 2023 23:47:22 +0100 Subject: [PATCH 3/7] move to left, add gap left --- templates/repo/home.tmpl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 912e24e289a39..30fdb1a41aeb4 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -63,7 +63,7 @@ {{end}} {{template "repo/sub_menu" .}}
-
+
{{template "repo/branch_dropdown" dict "root" .}} {{$n := len .TreeNames}} {{$l := Subtract $n 1}} @@ -99,16 +99,16 @@ {{svg "octicon-triangle-down" 14 "dropdown icon"}} {{end}} - {{if ne $n 0}} - {{EllipsisString .Repository.Name 30}}{{range $i, $v := .TreeNames}}/{{if eq $i $l}}{{EllipsisString $v 30}}{{else}}{{$p := index $.Paths $i}}{{EllipsisString $v 30}}{{end}}{{end}} - {{end}} -
-
{{if and (eq $n 0) (.Repository.IsTemplate)}} {{.locale.Tr "repo.use_template"}} {{end}} + {{if ne $n 0}} + {{EllipsisString .Repository.Name 30}}{{range $i, $v := .TreeNames}}/{{if eq $i $l}}{{EllipsisString $v 30}}{{else}}{{$p := index $.Paths $i}}{{EllipsisString $v 30}}{{end}}{{end}} + {{end}} +
+
{{if eq $n 0}}
From 78a40e813d93df670ccf2f2b11efd5bdbf01a1d7 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 9 Mar 2023 23:49:45 +0100 Subject: [PATCH 4/7] tweak margin --- web_src/less/_repository.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 3b93a76a16ebc..156c904417c97 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -1073,7 +1073,7 @@ } .edit.buttons { - margin-top: 10px; + margin-top: 8px; } } From bdedb4025a94b262844c34ae3b8edc349b71960c Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 9 Mar 2023 23:52:45 +0100 Subject: [PATCH 5/7] remove unneeded fw --- templates/repo/home.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 30fdb1a41aeb4..73afbd663db39 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -108,7 +108,7 @@ {{EllipsisString .Repository.Name 30}}{{range $i, $v := .TreeNames}}/{{if eq $i $l}}{{EllipsisString $v 30}}{{else}}{{$p := index $.Paths $i}}{{EllipsisString $v 30}}{{end}}{{end}} {{end}}
-
+
{{if eq $n 0}}
From 44a33cc9b382dadfcc4f53875e496c101084f391 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 9 Mar 2023 23:57:31 +0100 Subject: [PATCH 6/7] revert incorrect margin change --- web_src/less/_repository.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 156c904417c97..3b93a76a16ebc 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -1073,7 +1073,7 @@ } .edit.buttons { - margin-top: 8px; + margin-top: 10px; } } From 30649ce46eae5be8b5efe4b9c18fe3f32ee8c2f6 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 9 Mar 2023 23:59:17 +0100 Subject: [PATCH 7/7] fix correct margin --- web_src/less/_repository.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 3b93a76a16ebc..2c47135a2452b 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -2876,7 +2876,7 @@ } .repo-button-row > * { - margin-top: 10px; + margin-top: 8px; } .wiki .repo-button-row {