opendev/gerrit
Code Issues Proposed changes

Display 'Merge Conflict' in changes tables in standard black font

Browse Source 
Users find the bold red font too distracting.

Bug: issue 2299
Change-Id: Ia6a114c864930d03a1bd9c1234607b0a90b9d8c4
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
This commit is contained in:
Edwin Kempin
2013-12-06 08:56:11 +01:00
parent cc30d53ccd
commit 4b1f84c742
3 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable2.java
View File

@@ -215,7 +215,6 @@ public class ChangeTable2 extends NavigationTable<ChangeInfo> {
table.setText(row, C_STATUS, Util.toLongString(status));
} else if (!c.mergeable() && useNewFeatures) {
table.setText(row, C_STATUS, Util.C.changeTableNotMergeable());
table.getCellFormatter().addStyleName(row, C_STATUS, Gerrit.RESOURCES.css().notMergeable());
}
if (c.owner() != null) {