Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 16:35:45 +01:00
Code Issues Packages Projects Releases Activity

Hack for conflict marker

Browse Source
This commit is contained in:
Rene Pfeuffer
2020-01-08 12:58:13 +01:00
parent b261709b52
commit cf96b1b998
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scm-ui/ui-styles/src/scm.scss
View File

@@ -829,4 +829,12 @@ form .field:not(.is-grouped) {
font-weight: 500 !important;
}
.diff-gutter-conflict {
background: $warning-50;
}
.diff-code-conflict {
background: $warning-25;
}
@import "bulma-popover/css/bulma-popover";