diff --git a/res/images/skins/darkascension/sprite_icons.png b/res/images/skins/darkascension/sprite_icons.png index 7c991f0b9cc..ff451319f97 100644 Binary files a/res/images/skins/darkascension/sprite_icons.png and b/res/images/skins/darkascension/sprite_icons.png differ diff --git a/res/images/skins/default/sprite_icons.png b/res/images/skins/default/sprite_icons.png index 2d148b6dedf..43f784d33af 100644 Binary files a/res/images/skins/default/sprite_icons.png and b/res/images/skins/default/sprite_icons.png differ diff --git a/res/images/skins/rebel/sprite_icons.png b/res/images/skins/rebel/sprite_icons.png index 976ff22c3c8..431cf34444f 100644 Binary files a/res/images/skins/rebel/sprite_icons.png and b/res/images/skins/rebel/sprite_icons.png differ diff --git a/res/images/skins/smith/sprite_icons.png b/res/images/skins/smith/sprite_icons.png index ccd364cfa86..7ac33cef51e 100644 Binary files a/res/images/skins/smith/sprite_icons.png and b/res/images/skins/smith/sprite_icons.png differ diff --git a/src/main/java/forge/view/bazaar/ViewItem.java b/src/main/java/forge/view/bazaar/ViewItem.java index d9e0f07b6c0..6c9bca64916 100644 --- a/src/main/java/forge/view/bazaar/ViewItem.java +++ b/src/main/java/forge/view/bazaar/ViewItem.java @@ -35,7 +35,7 @@ public class ViewItem extends FRoundedPanel { btnPurchase = new SubButton("Buy"); // Component styling - this.setBackground(Singletons.getView().getSkin().getColor(FSkin.Colors.CLR_THEME).darker().darker()); + this.setBackground(Singletons.getView().getSkin().getColor(FSkin.Colors.CLR_THEME2)); this.lblName.setFontStyle(Font.BOLD); this.lblPrice.setFontStyle(Font.BOLD); this.lblPrice.setFontScaleFactor(0.8); diff --git a/src/main/java/forge/view/home/ViewQuest.java b/src/main/java/forge/view/home/ViewQuest.java index 2aabf804740..1af08607a49 100644 --- a/src/main/java/forge/view/home/ViewQuest.java +++ b/src/main/java/forge/view/home/ViewQuest.java @@ -87,7 +87,7 @@ public class ViewQuest extends JScrollPane { // Non-final inits this.parentView = v0; this.skin = Singletons.getView().getSkin(); - this.clrBorders = skin.getColor(FSkin.Colors.CLR_THEME).darker().darker(); + this.clrBorders = skin.getColor(FSkin.Colors.CLR_THEME2); this.eventPanelConstraints = "w 100%!, h 86px!, gap 0 0 5px 5px"; // Final component inits @@ -205,7 +205,7 @@ public class ViewQuest extends JScrollPane { /** Layout and details for Swing components in title panel. */ private void populateTitle() { pnlTitle.setLayout(new MigLayout("insets 0, gap 0, align center")); - pnlTitle.setBackground(skin.getColor(FSkin.Colors.CLR_THEME).darker()); + pnlTitle.setBackground(skin.getColor(FSkin.Colors.CLR_THEME2)); ((FRoundedPanel) pnlTitle).setBorderColor(clrBorders); ((FLabel) lblTitle).setFontScaleBy(SwingConstants.HORIZONTAL); @@ -268,7 +268,7 @@ public class ViewQuest extends JScrollPane { final FRoundedPanel pnl = new FRoundedPanel(); pnl.setLayout(new MigLayout("insets 0, align center")); pnl.setBorderColor(clrBorders); - pnl.setBackground(skin.getColor(FSkin.Colors.CLR_THEME)); + pnl.setBackground(skin.getColor(FSkin.Colors.CLR_THEME2)); pnl.add(new FLabel("Load a previous Quest"), "h 95%!, gap 0 0 2.5% 0"); final FLabel lbl = new FLabel("To use quest files " @@ -293,7 +293,7 @@ public class ViewQuest extends JScrollPane { final FRoundedPanel pnl1 = new FRoundedPanel(); pnl1.setLayout(new MigLayout("insets 0, align center")); pnl1.setBorderColor(clrBorders); - pnl1.setBackground(skin.getColor(FSkin.Colors.CLR_THEME)); + pnl1.setBackground(skin.getColor(FSkin.Colors.CLR_THEME2)); pnl1.add(new FLabel("Start a new quest"), "h 95%!, gap 0 0 2.5% 0"); final ButtonGroup group1 = new ButtonGroup(); diff --git a/src/main/java/forge/view/toolbox/FSkin.java b/src/main/java/forge/view/toolbox/FSkin.java index e02fb3e3ae3..7af6a280b59 100644 --- a/src/main/java/forge/view/toolbox/FSkin.java +++ b/src/main/java/forge/view/toolbox/FSkin.java @@ -64,7 +64,8 @@ public class FSkin { CLR_PHASE_INACTIVE_ENABLED (new int[] {70, 150}), /** */ CLR_PHASE_INACTIVE_DISABLED (new int[] {70, 170}), /** */ CLR_PHASE_ACTIVE_ENABLED (new int[] {70, 190}), /** */ - CLR_PHASE_ACTIVE_DISABLED (new int[] {70, 210}); + CLR_PHASE_ACTIVE_DISABLED (new int[] {70, 210}), /** */ + CLR_THEME2 (new int[] {70, 230}); private int[] coords; /** @param xy   int[] coordinates */