Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Report Bug color scheme doesn't match issue #161

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/seedu/address/ui/MainWindowNew.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@

@FXML
private MenuItem reportBugItem;

@FXML
private MenuItem summaryMenuItem;

Expand Down Expand Up @@ -89,7 +90,7 @@
}

private void setAcceleratorsBugReport() {
setAccelerator(reportBugItem, KeyCombination.valueOf("F2"));
setAccelerator(reportBugItem, KeyCombination.valueOf("F10"));

Check warning on line 93 in src/main/java/seedu/address/ui/MainWindowNew.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/seedu/address/ui/MainWindowNew.java#L93

Added line #L93 was not covered by tests
}

/**
Expand Down
Binary file added src/main/resources/images/report_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion src/main/resources/view/HelpWindow.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
-fx-background-color: derive(#141a21, 20%);
}

#reportBugContainer {
#reportBugMessageContainer {
-fx-background-color: derive(#141a21, 20%);
}

#reportBugMessage {
-fx-text-fill: white;
}
1 change: 0 additions & 1 deletion src/main/resources/view/HelpWindow.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<stylesheets>
<URL value="@HelpWindow.css" />
</stylesheets>

<HBox alignment="BOTTOM_RIGHT" fx:id="helpMessageContainer">
<children>
<Label fx:id="helpMessage" text="Label">
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/view/MainWindowNew.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<menus>
<Menu id="menu" mnemonicParsing="false" style="-fx-background-color: #0b0f14;" text="File">
<MenuItem fx:id="closeMenuItem" text="Close" mnemonicParsing="false" onAction="#handleExit" />
<MenuItem fx:id="summaryMenuItem" mnemonicParsing="false" onAction="#handleSummary" text="Summary" />
<MenuItem fx:id="summaryMenuItem" mnemonicParsing="false" onAction="#handleSummary" text="Summary" />
</Menu>
<Menu id="menu" mnemonicParsing="false" style="-fx-background-color: #0b0f14;" text="Help">
<MenuItem fx:id="helpMenuItem" mnemonicParsing="false" onAction="#handleHelp" text="Help" />
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/view/ReportBugWindow.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<fx:root resizable="false" title="Report Bug" type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
<icons>
<Image url="@/images/help_icon.png" />
<Image url="@/images/report_icon.png" />
</icons>
<scene>
<Scene>
Expand Down