Skip to content

Commit

Permalink
Merge pull request nus-cs2103-AY1718S2#63 from jasmoon/master
Browse files Browse the repository at this point in the history
UI Change
  • Loading branch information
karenfrilya97 authored Mar 20, 2018
2 parents f58aef8 + fb34f3b commit 9903599
Show file tree
Hide file tree
Showing 10 changed files with 226 additions and 91 deletions.
8 changes: 0 additions & 8 deletions src/main/java/seedu/address/ui/MainWindow.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ public class MainWindow extends UiPart<Stage> {
private Logic logic;

// Independent Ui parts residing in this Ui container
private BrowserPanel browserPanel;
private ActivityListPanel activityListPanel;
private Config config;
private UserPrefs prefs;
Expand Down Expand Up @@ -116,9 +115,6 @@ private void setAccelerator(MenuItem menuItem, KeyCombination keyCombination) {
* Fills up all the placeholders of this window.
*/
void fillInnerParts() {
browserPanel = new BrowserPanel();
browserPlaceholder.getChildren().add(browserPanel.getRoot());

activityListPanel = new ActivityListPanel(logic.getFilteredPersonList());
activityListPanelPlaceholder.getChildren().add(activityListPanel.getRoot());

Expand Down Expand Up @@ -185,10 +181,6 @@ public ActivityListPanel getActivityListPanel() {
return this.activityListPanel;
}

void releaseResources() {
browserPanel.freeResources();
}

@Subscribe
private void handleShowHelpEvent(ShowHelpRequestEvent event) {
logger.info(LogsCenter.getEventHandlingLogMessage(event));
Expand Down
1 change: 0 additions & 1 deletion src/main/java/seedu/address/ui/UiManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ public void start(Stage primaryStage) {
public void stop() {
prefs.updateLastUsedGuiSetting(mainWindow.getCurrentGuiSetting());
mainWindow.hide();
mainWindow.releaseResources();
}

private void showFileOperationAlertAndWait(String description, String details, Throwable cause) {
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added src/main/resources/images/light-veneer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 0 additions & 8 deletions src/main/resources/view/BrowserPanel.fxml

This file was deleted.

141 changes: 141 additions & 0 deletions src/main/resources/view/ClinderStyler.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
@font-face {
font-family: 'Open Sans Bold Italic';
src: url('../fonts/open-sans/OpenSans-BoldItalic.ttf');
}

@font-face {
font-family: 'Open Sans Italic';
src: url('../fonts/open-sans/OpenSans-Italic.ttf');
}

@font-face {
font-family: 'Open Sans';
src: url('../fonts/open-sans/OpenSans-Regular.ttf');
}

/* menu bar*/
.menu-bar {
-fx-background-color: #f7e399;
-fx-padding: 0 2 0 2;
-fx-border-width: 0 0 2 0;
-fx-border-color: #dbdad9;
}

.menu-bar .label {
-fx-font-size: 11pt;
-fx-font-family: "Segoe UI Light";
-fx-text-fill: black;
}

.context-menu {
-fx-background-color: #ffd177;
-fx-border-width: 2 0 0 0;
-fx-border-color: #969594;
}

/* taskList and eventList */

#taskListPlaceholder {
-fx-background-color: white;
-fx-background-radius: 5px 5px 5px 5px;
}

.list-cell:filled:even {
-fx-background-color: #a0f0ff;
}

.list-cell:filled:odd {
-fx-background-color: #b2d3ff;
}

.list-cell .label {
-fx-text-fill: black;
}

.cell_big_label {
-fx-font-family: "Open Sans Bold Italic";
-fx-font-size: 14pt;
-fx-text-fill: #010504;
}

.cell_small_label {
-fx-font-family: "Open Sans Italic";
-fx-font-size: 10pt;
-fx-text-fill: #010504;
}

#tags {
-fx-hgap: 7;
-fx-vgap: 3;
}

#tags .label {
-fx-font-family: "Open Sans";
-fx-text-fill: white;
-fx-background-color: #787d84;
-fx-padding: 1 3 1 3;
-fx-border-radius: 2;
-fx-background-radius: 2;
-fx-font-size: 11;
}

#tags {
-fx-hgap: 7;
-fx-vgap: 3;
}

#eventListPlaceholder {
-fx-background-color: white;
-fx-background-radius: 5px 5px 5px 5px;
}

/* resultBox */

#resultBox {
-fx-background-color: grey;
-fx-opacity: 0.45;
-fx-background-radius: 2px 2px 2px 2px;
}

/* commandBox */

#commandBoxPlaceholder {
-fx-background-color: grey;
-fx-opacity: 0.4;
-fx-background-radius: 4px 4px 4px 4px;
}

.text-field {
-fx-prompt-text-fill: black;
}

/* statusBar */

#statusBarPlaceholder {
-fx-background-color: #f7e399 /*silver #d8d7d0*/;
-fx-font-color: black;
-fx-border-width: 1 0 0 0;
-fx-border-color: #dbdad9;

}

.status-bar .label {
-fx-font-family: "Segoe UI Light";
-fx-text-fill: black;
}

.grid-pane .anchor-pane {
-fx-background-color: #f7e399;
-fx-border-width: 1 0 0 0;
-fx-border-color: #dbdad9;
}

/* miscs */
.background {
-fx-background-image: url("../images/light-veneer.png");
-fx-background-repeat: repeat;
}

.split-pane-divider {
-fx-background-color: transparent;
}
38 changes: 14 additions & 24 deletions src/main/resources/view/DarkTheme.css
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,11 @@
-fx-graphic-text-gap : 0;
-fx-padding: 0 0 0 0;
}

.list-cell:filled:even {
-fx-background-color: #3c3e3f;
}

.list-cell:filled:odd {
-fx-background-color: #515658;
-fx-border-radius: 10px;
-fx-border-width: 2;
-fx-border-color: black;
}

.list-cell:filled:selected {
Expand Down Expand Up @@ -158,6 +156,7 @@
-fx-text-fill: black !important;
}

/* status bar */
.status-bar .label {
-fx-font-family: "Segoe UI Light";
-fx-text-fill: white;
Expand All @@ -182,28 +181,24 @@
.grid-pane .anchor-pane {
-fx-background-color: derive(#1d1d1d, 30%);
}

/* menuBar */
.context-menu {
-fx-background-color: derive(#1d1d1d, 50%);
}

.context-menu .label {
-fx-text-fill: white;
-fx-background-color: #ffd177;
-fx-border-width: 2 0 0 0;
-fx-border-color: #969594;
}

.menu-bar {
-fx-background-color: derive(#1d1d1d, 20%);
-fx-background-color: #f7e399;
-fx-padding: 0 2 0 2;
-fx-border-width: 0 0 2 0;
-fx-border-color: #dbdad9;
}

.menu-bar .label {
-fx-font-size: 14pt;
-fx-font-size: 13pt;
-fx-font-family: "Segoe UI Light";
-fx-text-fill: white;
-fx-opacity: 0.9;
}

.menu .left-container {
-fx-background-color: black;
-fx-text-fill: black;
}

/*
Expand Down Expand Up @@ -336,11 +331,6 @@
-fx-background-radius: 0;
}

#tags {
-fx-hgap: 7;
-fx-vgap: 3;
}

#tags .label {
-fx-text-fill: white;
-fx-background-color: #3e7b91;
Expand Down
Loading

0 comments on commit 9903599

Please sign in to comment.