From fc29a405e8c210fa62ad4cbe4250617e4b85d6c8 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 14 Aug 2017 00:49:38 +0200 Subject: [PATCH] More tweaks to repo top panel (#2267) * More tweaks to repo top panel * undo hiding of compare button on master * attempt to fix ci issue * another ci attempt --- integrations/pull_create_test.go | 2 +- public/css/index.css | 5 ++++- public/less/_repository.less | 8 +++++++- templates/repo/branch_dropdown.tmpl | 2 +- templates/repo/home.tmpl | 25 ++++++------------------- 5 files changed, 19 insertions(+), 23 deletions(-) diff --git a/integrations/pull_create_test.go b/integrations/pull_create_test.go index ee7a92ce2c..7db1ce1ecf 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/public/css/index.css b/public/css/index.css index 32fefb92e4..774b559621 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 2b254123e4..170eb4feb0 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 ae09b25246..063006314b 100644 --- a/templates/repo/branch_dropdown.tmpl +++ b/templates/repo/branch_dropdown.tmpl @@ -1,6 +1,6 @@