Fix merges

CS2103JAN2018-W15-B4 · Apr 11, 2018 · 5efb51f · 5efb51f
1 parent 76285bd
commit 5efb51f
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 11 deletions.
diff --git a/src/main/java/seedu/club/MainApp.java b/src/main/java/seedu/club/MainApp.java
@@ -42,7 +42,7 @@
  */
 public class MainApp extends Application {
 
-    public static final Version VERSION = new Version(1, 4, 0, true);
+    public static final Version VERSION = new Version(1, 5, 0, true);
 
     private static final Logger logger = LogsCenter.getLogger(MainApp.class);
 

diff --git a/src/main/java/seedu/club/ui/MemberOverviewPanel.java b/src/main/java/seedu/club/ui/MemberOverviewPanel.java
@@ -226,13 +226,13 @@ private void loadMemberPage(Member member) {
         group.setText(member.getGroup().groupName);
         group.setAlignment(Pos.CENTER);
         createTags(member);
-        setIcons();
+        //setIcons();
     }
 
     /**
      * Set Icon pictures
      */
-    private void setIcons() {
+    /*private void setIcons() {
         Image phoneImg;
         Image emailImg;
         phoneImg = new Image(MainApp.class.getResourceAsStream(PHONE_ICON),
@@ -241,7 +241,7 @@ private void setIcons() {
         emailImg = new Image(MainApp.class.getResourceAsStream(EMAIL_ICON),
                 21, 21, false, true);
         emailIcon.setImage(emailImg);
-    }
+    }*/
     //@@author
 
     //@@author yash-chowdhary

diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/DarkTheme.css
@@ -146,7 +146,7 @@
 .cell_big_label {
     -fx-font-family: "Segoe UI Semibold";
     -fx-font-size: 18px;
-    -fx-text-fill: white;
+    -fx-text-fill: #010504;
 }
 
 .cell_small_label {
@@ -158,7 +158,7 @@
 .cell_medium_label {
     -fx-font-family: "Segoe UI";
     -fx-font-size: 20px;
-    -fx-text-fill: #ffffff;
+    -fx-text-fill: #000000;
 }
 
 .anchor-pane {

diff --git a/src/test/java/systemtests/ClubBookSystemTest.java b/src/test/java/systemtests/ClubBookSystemTest.java
@@ -10,8 +10,6 @@
 import static seedu.club.ui.testutil.GuiTestAssert.assertListMatching;
 
 import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;

diff --git a/src/test/java/systemtests/DeleteCommandSystemTest.java b/src/test/java/systemtests/DeleteCommandSystemTest.java
@@ -177,7 +177,6 @@ private void assertCommandSuccess(String command, Model expectedModel, String ex
      * Performs the same verification as {@code assertCommandSuccess(String, Model, String)} except that the browser url
      * and selected card are expected to update accordingly depending on the card at {@code expectedSelectedCardIndex}.
      * @see DeleteCommandSystemTest#assertCommandSuccess(String, Model, String)
-     * @see ClubBookSystemTest#assertSelectedCardChanged(Index)
      */
     private void assertCommandSuccess(String command, Model expectedModel, String expectedResultMessage,
             Index expectedSelectedCardIndex) {

diff --git a/src/test/java/systemtests/DeleteTaskCommandSystemTest.java b/src/test/java/systemtests/DeleteTaskCommandSystemTest.java
@@ -103,7 +103,6 @@ private void assertCommandSuccess(String command, Model expectedModel, String ex
      * Performs the same verification as {@code assertCommandSuccess(String, Model, String)} except that the browser url
      * and selected card are expected to update accordingly depending on the card at {@code expectedSelectedCardIndex}.
      * @see DeleteCommandSystemTest#assertCommandSuccess(String, Model, String)
-     * @see ClubBookSystemTest#assertSelectedCardChanged(Index)
      */
     private void assertCommandSuccess(String command, Model expectedModel, String expectedResultMessage,
                                       Index expectedSelectedCardIndex) {

diff --git a/src/test/java/systemtests/SelectCommandSystemTest.java b/src/test/java/systemtests/SelectCommandSystemTest.java
@@ -118,7 +118,6 @@ public void select() {
      * Verifications 1, 3 and 4 are performed by
      * {@code ClubBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.<br>
      * @see ClubBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)
-     * @see ClubBookSystemTest#assertSelectedCardChanged(Index)
      */
     private void assertCommandSuccess(String command, Index expectedSelectedCardIndex) {
         Model expectedModel = getModel();