diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-19 15:25:05 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-08-19 15:25:05 -0700 |
commit | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (patch) | |
tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java | |
parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
parent | 02cf98d65c798d368fcec43ed64a001d513bdd4f (diff) | |
download | idea-060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8.tar.gz |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
build/scripts/tests.gant
Change-Id: I9a1fe25b61f1004e0f62419a5f64e1452644b784
Diffstat (limited to 'platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java')
-rw-r--r-- | platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java index 20a41e3a886a..931458ff8bc0 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java @@ -161,7 +161,7 @@ public abstract class PluginManagerMain implements Disposable { g.fillRect(0,0, getWidth(), getHeight()); } }; - header.setBorder(new CustomLineBorder(UIUtil.getBorderColor(), 1, 1, 0, 1)); + header.setBorder(new CustomLineBorder(1, 1, 0, 1)); final JLabel mySortLabel = new JLabel(); mySortLabel.setForeground(UIUtil.getLabelDisabledForeground()); mySortLabel.setBorder(new EmptyBorder(1, 1, 1, 5)); |