diff options
Diffstat (limited to 'web_src')
-rw-r--r-- | web_src/js/index.js | 7 | ||||
-rw-r--r-- | web_src/less/_base.less | 8 | ||||
-rw-r--r-- | web_src/less/helpers.less | 2 | ||||
-rw-r--r-- | web_src/less/themes/theme-arc-green.less | 5 |
4 files changed, 17 insertions, 5 deletions
diff --git a/web_src/js/index.js b/web_src/js/index.js index 496495a1cd..0dc0a9273b 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -1201,6 +1201,12 @@ async function initRepository() { } } +function initPullRequestMergeInstruction() { + $('.show-instruction').on('click', () => { + $('.instruct').toggle(); + }); +} + function initPullRequestReview() { if (window.location.hash && window.location.hash.startsWith('#issuecomment-')) { const commentDiv = $(window.location.hash); @@ -2526,6 +2532,7 @@ $(document).ready(async () => { initContextPopups(); initTableSort(); initNotificationsTable(); + initPullRequestMergeInstruction(); const routes = { 'div.user.settings': initUserSettings, diff --git a/web_src/less/_base.less b/web_src/less/_base.less index 2cecd59c93..517075db8b 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -99,7 +99,8 @@ --color-markdown-code-block: #00000008; --color-button: #ffffff; --color-code-bg: #ffffff; - --color-shadow: #00000024; + --color-markdown-code-block: #00000010; + --color-secondary-bg: #f4f4f4; } :root:lang(ja) { @@ -1691,6 +1692,11 @@ a.ui.basic.label:hover { border-color: var(--color-secondary); } +.ui.secondary.segment { + background: var(--color-secondary-bg); + color: var(--color-text-light); +} + .ui.attached.header { position: relative; background: var(--color-box-header); diff --git a/web_src/less/helpers.less b/web_src/less/helpers.less index c611076f48..04c1b6567b 100644 --- a/web_src/less/helpers.less +++ b/web_src/less/helpers.less @@ -1,5 +1,7 @@ .df { display: flex !important; } +.di { display: inline !important; } .dif { display: inline-flex !important; } +.dib { display: inline-block !important; } .ac { align-items: center !important; } .tc { text-align: center !important; } .jc { justify-content: center !important; } diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index 526fa58730..7002d18c6f 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/less/themes/theme-arc-green.less @@ -95,6 +95,7 @@ --color-button: #353846; --color-code-bg: #2a2e3a; --color-shadow: #00000060; + --color-secondary-bg: #2a2e3a; } /* LineTableTD */ @@ -827,10 +828,6 @@ td.blob-hunk { color: #dbdbdb; } -.ui.secondary.segment { - background: #353945; -} - .ui.attached.info.message, .ui.info.message { box-shadow: 0 0 0 1px #4b5e71 inset, 0 0 0 0 transparent; |