summaryrefslogtreecommitdiffstats
path: root/web_src
diff options
context:
space:
mode:
authorJames Lakin <jamesorlakin@users.noreply.github.com>2020-02-03 22:14:38 +0000
committerGitHub <noreply@github.com>2020-02-04 00:14:38 +0200
commit3ff95cef606fad166527b092cb063081e3b3b84e (patch)
treeda17ccedb0810d163de22ad41999977800f46293 /web_src
parent20c513be6e376231a33f01625f5ae747d2051241 (diff)
downloadgitea-3ff95cef606fad166527b092cb063081e3b3b84e.tar.gz
gitea-3ff95cef606fad166527b092cb063081e3b3b84e.zip
Show if a PR has conflicting files on the PR lists (#10130)
Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'web_src')
-rw-r--r--web_src/less/_repository.less4
1 files changed, 4 insertions, 0 deletions
diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
index a5037276a7..32449abfaf 100644
--- a/web_src/less/_repository.less
+++ b/web_src/less/_repository.less
@@ -2129,6 +2129,10 @@
}
}
+ .conflicting {
+ padding-left: 5px;
+ }
+
.due-date {
padding-left: 5px;
}