1
0
Fork 0
forked from forgejo/forgejo

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>
This commit is contained in:
Lunny Xiao 2020-12-10 10:59:05 +08:00 committed by GitHub
parent c85bb62635
commit 2d71cdb668
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 78 additions and 42 deletions

View file

@ -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);

View file

@ -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; }

View file

@ -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;