diff options
| author | 赵智超 <1012112796@qq.com> | 2020-06-14 02:49:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-13 14:49:59 -0400 |
| commit | 48842ed1085c9186c40c1a07aa0887f70707fce4 (patch) | |
| tree | 011fc485ac6c8406fd1aab26cc56f9c85fcc314a /web_src | |
| parent | 0159851cc3fa80e4df4908a5e760afa20452f712 (diff) | |
| download | gitea-48842ed1085c9186c40c1a07aa0887f70707fce4.tar.gz gitea-48842ed1085c9186c40c1a07aa0887f70707fce4.zip | |
ui: Show update branch item in merge box when it's necessary (#11761)
* ui: Show update branch item in merge box when it's necessary
As title, should show it without care about whether
this pr can be merged.
fix #10959
Signed-off-by: a1012112796 <1012112796@qq.com>
* fix ui
* Fix ui, thanks to @silverwind.
Co-authored-by: silverwind <me@silverwind.io>
* fix lint
* Update templates/repo/issue/view_content/pull.tmpl
Co-authored-by: silverwind <me@silverwind.io>
* Apply review suggestion
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'web_src')
| -rw-r--r-- | web_src/less/_repository.less | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 2414a4f13b..0687347efd 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -995,8 +995,17 @@ > .merge-section { background-color: #f7f7f7; - .item + .item { - padding-top: .5rem; + .item { + padding: .25rem 0; + } + + .item-section { + display: flex; + align-items: center; + justify-content: space-between; + padding: 0; + margin-top: -.25rem; + margin-bottom: -.25rem; } .divider { |