From f885223155122854b0df01bbbb9a018ffb25df99 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 6 Aug 2017 10:48:24 +0200 Subject: [PATCH 1/4] More tweaks to repo top panel --- public/css/index.css | 5 ++++- public/less/_repository.less | 8 +++++++- templates/repo/branch_dropdown.tmpl | 2 +- templates/repo/home.tmpl | 27 ++++++++------------------- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/public/css/index.css b/public/css/index.css index 32fefb92e4af..774b55962130 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -1290,7 +1290,6 @@ footer .ui.language .menu { margin-bottom: 20px; } .repository #clone-panel { - margin-top: -8px; margin-left: 5px; width: 350px; } @@ -1318,6 +1317,10 @@ footer .ui.language .menu { .repository.file.list .choose.reference .header .icon { font-size: 1.4em; } +.repository.file.list .repo-path .section, +.repository.file.list .repo-path .divider { + display: inline; +} .repository.file.list #file-buttons { font-weight: normal; } diff --git a/public/less/_repository.less b/public/less/_repository.less index 2b254123e4d2..170eb4feb00b 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -133,7 +133,6 @@ } #clone-panel { - margin-top: -8px; margin-left: 5px; width: 350px; @@ -167,6 +166,13 @@ font-size: 1.4em; } } + + .repo-path { + .section, .divider { + display: inline; + } + } + #file-buttons { font-weight: normal; .ui.button { diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl index ae09b25246a4..063006314baa 100644 --- a/templates/repo/branch_dropdown.tmpl +++ b/templates/repo/branch_dropdown.tmpl @@ -1,6 +1,6 @@
-
+
{{if .IsViewBranch}}{{.i18n.Tr "repo.branch"}}{{else}}{{.i18n.Tr "repo.tree"}}{{end}}: diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 24ce082da6a5..57c320bfce6b 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -9,29 +9,18 @@

{{if .PullRequestCtx.Allowed}} + {{if ne .BranchName .BaseRepo.DefaultBranch}}
- +
{{end}} + {{end}} {{template "repo/branch_dropdown" .}} -
- - {{EllipsisString .Repository.Name 30}} - {{ $n := len .TreeNames}} - {{ $l := Subtract $n 1}} - {{range $i, $v := .TreeNames}} - / - {{if eq $i $l}} - {{EllipsisString $v 30}} - {{else}} - {{ $p := index $.Paths $i}} - {{EllipsisString $v 30}} - {{end}} - {{end}} - -
+ {{ $n := len .TreeNames}} + {{ $l := Subtract $n 1}} +
{{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}}
{{if .Repository.CanEnableEditor}}
@@ -48,9 +37,9 @@
{{end}} - + {{if eq $n 0}} -
+
{{if not $.DisableHTTP}}
{{end}} - {{end}} {{template "repo/branch_dropdown" .}} {{ $n := len .TreeNames}} {{ $l := Subtract $n 1}} From 089e694dc37344c02915ed277eb267a462aba43a Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 11 Aug 2017 14:50:04 +0200 Subject: [PATCH 3/4] attempt to fix ci issue --- templates/repo/home.tmpl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index f3feb149c6f7..8a671d5ec8e4 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -16,9 +16,7 @@
{{end}} {{template "repo/branch_dropdown" .}} - {{ $n := len .TreeNames}} - {{ $l := Subtract $n 1}} -
{{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}}
+
{{EllipsisString .Repository.Name 30}}{{ $n := len .TreeNames}}{{ $l := Subtract $n 1}}{{range $i, $v := .TreeNames}}/{{if eq $i $l}}{{EllipsisString $v 30}}{{else}}{{ $p := index $.Paths $i}}{{EllipsisString $v 30}}{{end}}{{end}}
{{if .Repository.CanEnableEditor}}
From 63410d6c42ba66c56673c43bd3cbb0dad449b689 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 11 Aug 2017 15:13:50 +0200 Subject: [PATCH 4/4] another ci attempt --- integrations/pull_create_test.go | 2 +- templates/repo/home.tmpl | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/integrations/pull_create_test.go b/integrations/pull_create_test.go index ee7a92ce2c55..7db1ce1ecfd0 100644 --- a/integrations/pull_create_test.go +++ b/integrations/pull_create_test.go @@ -19,7 +19,7 @@ func testPullCreate(t *testing.T, session *TestSession, user, repo, branch strin // Click the little green button to create a pull htmlDoc := NewHTMLParser(t, resp.Body) - link, exists := htmlDoc.doc.Find("button.ui.green.small.button").Parent().Attr("href") + link, exists := htmlDoc.doc.Find("button.ui.green.tiny.compact.button").Parent().Attr("href") assert.True(t, exists, "The template has changed") if branch != "master" { link = strings.Replace(link, ":master", ":"+branch, 1) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 8a671d5ec8e4..f3feb149c6f7 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -16,7 +16,9 @@
{{end}} {{template "repo/branch_dropdown" .}} -
{{EllipsisString .Repository.Name 30}}{{ $n := len .TreeNames}}{{ $l := Subtract $n 1}}{{range $i, $v := .TreeNames}}/{{if eq $i $l}}{{EllipsisString $v 30}}{{else}}{{ $p := index $.Paths $i}}{{EllipsisString $v 30}}{{end}}{{end}}
+ {{ $n := len .TreeNames}} + {{ $l := Subtract $n 1}} +
{{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}}
{{if .Repository.CanEnableEditor}}