diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2020-12-10 10:59:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-10 03:59:05 +0100 |
| commit | 2d71cdb6687435cf91d23793b0d3fce9db9881a6 (patch) | |
| tree | b991f906b4112f65b73d23bb6a15afb3962e670e /web_src/less | |
| parent | c85bb6263503ebd335863f413214a775973a1fac (diff) | |
| download | gitea-2d71cdb6687435cf91d23793b0d3fce9db9881a6.tar.gz gitea-2d71cdb6687435cf91d23793b0d3fce9db9881a6.zip | |
Add pull request manually merge instruction (#13840)
* add pull request command line instructions
* Add pull request manually merge instuction
* Fix styles
* Fix lint
* Move inline style to class file
* add space between merge button and hint text
* Add sentence end charcter
* Change the language file
* adjust secondary bg
* further adjustment
Co-authored-by: silverwind <me@silverwind.io>
Diffstat (limited to 'web_src/less')
| -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 |
3 files changed, 10 insertions, 5 deletions
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; |