diff options
| author | Cirno the Strongest <1447794+CirnoT@users.noreply.github.com> | 2020-12-15 07:09:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-15 01:09:24 -0500 |
| commit | 27d0a5554f82859d6967f2643f802d51f0b3ba94 (patch) | |
| tree | a8922b1ef82b39bf5f8f6a399bc61ab7efd6c2c9 /web_src | |
| parent | c3fc190372cb525fdacf60606bf8aaf1c33e7da7 (diff) | |
| download | gitea-27d0a5554f82859d6967f2643f802d51f0b3ba94.tar.gz gitea-27d0a5554f82859d6967f2643f802d51f0b3ba94.zip | |
Hide command line instructions when merge form is visible (#13956)
* Hide commandline instructions when merge form is visible
* As per @silverwind
Co-authored-by: zeripath <art27@cantab.net>
Diffstat (limited to 'web_src')
| -rw-r--r-- | web_src/js/index.js | 5 | ||||
| -rw-r--r-- | web_src/less/_repository.less | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/web_src/js/index.js b/web_src/js/index.js index d4928a01a3..e55e2febe0 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -1120,6 +1120,8 @@ async function initRepository() { e.preventDefault(); $(`.${$(this).data('do')}-fields`).show(); $(this).parent().hide(); + $('.instruct-toggle').hide(); + $('.instruct-content').hide(); }); $('.merge-button > .dropdown').dropdown({ onChange(_text, _value, $choice) { @@ -1133,6 +1135,7 @@ async function initRepository() { e.preventDefault(); $(this).closest('.form').hide(); $mergeButton.parent().show(); + $('.instruct-toggle').show(); }); initReactionSelector(); } @@ -1199,7 +1202,7 @@ async function initRepository() { function initPullRequestMergeInstruction() { $('.show-instruction').on('click', () => { - $('.instruct').toggle(); + $('.instruct-content').toggle(); }); } diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index b35718c29d..7cac37207e 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -593,6 +593,10 @@ } &.view.issue { + .instruct-toggle { + display: inline-block; + } + .title { padding-bottom: 0 !important; |