Merge pull request #248 from althea28/Fix-Command-Box-Visibility

Fix command box visibility
AY2425S1-CS2103-F11-1 · Nov 6, 2024 · d4d9d4e · d4d9d4e
2 parents 646274a + d20d0cd
commit d4d9d4e
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 26 deletions.
diff --git a/docs/UserGuide.md b/docs/UserGuide.md
@@ -260,6 +260,8 @@ Format: `mark si/INDEX ai/INDEX`
 Examples:
 * `list` followed by `mark si/3 ai/1` marks the 1st assignment of the 3rd student in the app.
 * `mark si/1 ai/1`
+
+  ![result for 'mark si/1 ai/1'](images/mark.png)
 
 ### Unmarking an assignment: `unmark`
 
@@ -274,6 +276,8 @@ Format: `unmark si/INDEX ai/INDEX`
 Examples:
 * `unmark si/1 ai/1`
 
+  ![result for 'unmark si/1 ai/1'](images/unmark.png)
+
 ### Grading an assignment: `grade`
 
 Edits the score of an assignment belonging to a student and marks it as submitted.
@@ -300,6 +304,8 @@ Format: `remark si/INDEX r/REMARK`
 
 Examples:
 * `remark si/1 r/Weak in Math`
+
+  ![result for 'remark si/1 r/Weak in Math'](images/remark.png)
 
 ### Clearing all entries : `clear`
 

diff --git a/docs/images/mark.png b/docs/images/mark.png
diff --git a/docs/images/remark.png b/docs/images/remark.png
diff --git a/docs/images/unmark.png b/docs/images/unmark.png
diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/DarkTheme.css
@@ -11,9 +11,9 @@
     -status-unsubmitted: #d55050;
 }
 
-.background { /*?*/
+.background {
     -fx-background-color: derive(-blue-dark, 20%);
-    background-color: #383838; /* Used in the default.html file */
+    background-color: #383838;
 }
 
 .label {
@@ -52,7 +52,7 @@
     -fx-max-height: 0;
 }
 
-.table-view { /* ?*/
+.table-view {
     -fx-base: -blue-dark;
     -fx-control-inner-background: -blue-dark;
     -fx-background-color: -blue-dark;
@@ -89,12 +89,12 @@
     -fx-background-color: -fx-focus-color;
 }
 
-.split-pane:horizontal .split-pane-divider { /*middle bar btwn 2 planes*/
+.split-pane:horizontal .split-pane-divider {
     -fx-background-color: derive(-white-dark, 20%);
     -fx-border-color: transparent;
 }
 
-.split-pane { /*border arnd list and details panel*/
+.split-pane {
     -fx-border-radius: 1;
     -fx-border-width: 1;
     -fx-background-color: derive(-white-dark, 1%);
@@ -110,7 +110,7 @@
     -fx-label-padding: 0 0 0 0;
     -fx-graphic-text-gap : 0;
     -fx-padding: 0 0 0 0;
-    -fx-background-color: derive(-white-blue,10%);
+    -fx-background-color: derive(-white-dark,30%);
 }
 
 .list-cell:filled:even {
@@ -160,45 +160,46 @@
 
 .details_field_headers {
     -fx-font-family: "Segoe UI";
-    -fx-font-size: 15px;
+    -fx-font-size: 20px;
     -fx-text-fill: -text-dark;
 }
 
 .details-pane {
     -fx-background-color: -white-light;
     -fx-border-color: derive(-white-dark, 10%);
     -fx-border-top-width: 1px;
+    -fx-alignment: top-left;
 }
 
 .details-pane .viewport {
     -fx-background-color: -white-light;
 }
 
-.stack-pane { /*enter command bar*/
+.stack-pane {
      -fx-background-color: derive(-blue-dark, 20%);
 }
 
-.pane-with-border { /*border arnd command bar and feedback box*/
+.pane-with-border {
      -fx-background-color: derive(-blue-dark, 20%);
      -fx-border-color: derive(-blue-dark, 10%);
      -fx-border-top-width: 1px;
 }
 
-.results-pane { /*border arnd command bar and feedback box*/
+.results-pane {
      -fx-background-color: derive(-blue-dark, 20%);
      -fx-border-color: derive(-white-dark, 10%);
      -fx-border-top-width: 1px;
 }
 
-.status-bar { /*last bar addressbook.json*/
+.status-bar {
     -fx-background-color: derive(-blue-dark, 30%);
 }
 
-.result-display { /*bg color=border arnd feedback box*/
+.result-display {
     -fx-background-color: transparent;
     -fx-font-family: "Segoe UI Light";
     -fx-font-size: 13pt;
-    -fx-text-fill: white; /*feedback text*/
+    -fx-text-fill: white;
 }
 
 .result-display .label {
@@ -222,25 +223,25 @@
     -fx-text-fill: white;
 }
 
-.grid-pane { /*?*/
+.grid-pane {
     -fx-background-color: derive(-blue-dark, 30%);
     -fx-border-color: derive(-white-dark, 30%);
     -fx-border-width: 1px;
 }
 
-.grid-pane .stack-pane { /*?*/
+.grid-pane .stack-pane {
     -fx-background-color: derive(-blue-dark, 30%);
 }
 
-.context-menu { /* file and help popup*/
+.context-menu {
     -fx-background-color: derive(-blue-dark, 50%);
 }
 
 .context-menu .label {
     -fx-text-fill: white;
 }
 
-.menu-bar { /*file, help label*/
+.menu-bar {
     -fx-background-color: derive(-blue-dark, 20%);
 }
 
@@ -304,7 +305,7 @@
     -fx-background-color: derive(-fx-focus-color, 30%);
 }
 
-.dialog-pane { /*?*/
+.dialog-pane {
     -fx-background-color: -blue-dark;
 }
 
@@ -380,7 +381,7 @@
     -fx-effect: innershadow(gaussian, black, 10, 0, 0, 0);
 }
 
-#resultDisplay .content { /*1st is ?, 2nd is feedback box*/
+#resultDisplay .content {
     -fx-background-color: transparent, transparent, transparent, -blue-dark;
     -fx-background-radius: 0;
 }

diff --git a/src/main/resources/view/Extensions.css b/src/main/resources/view/Extensions.css
@@ -1,11 +1,11 @@
 
 .error {
-    -fx-text-fill: #d06651 !important; /* The error class should always override the default text-fill style */
+    -fx-text-fill: #c60606 !important; /* The error class should always override the default text-fill style */
 }
 
 .list-cell:empty {
     /* Empty cells will not have alternating colours */
-    -fx-background: #383838;
+    -fx-background: #e51515;
 }
 
 .tag-selector {

diff --git a/src/main/resources/view/StudentDetailsPanel.fxml b/src/main/resources/view/StudentDetailsPanel.fxml
@@ -23,7 +23,7 @@
                     <padding>
                         <Insets bottom="5" left="15" right="5" top="5" />
                     </padding>
-                    <HBox alignment="CENTER_LEFT" spacing="0.5">
+                    <HBox alignment="TOP_LEFT" spacing="0.5">
                         <Label fx:id="id" styleClass="details_big_label">
                             <minWidth>
                                 <Region fx:constant="USE_PREF_SIZE" />
@@ -45,7 +45,7 @@
                         </padding>
                     </FlowPane>
                     <HBox alignment="CENTER_LEFT">
-                        <VBox minWidth="70" spacing="10">
+                        <VBox minWidth="90" spacing="10">
                             <padding>
                                 <Insets left="8" />
                             </padding>
@@ -57,7 +57,7 @@
                     </HBox>
 
                     <HBox alignment="CENTER_LEFT">
-                        <VBox minWidth="70" spacing="10">
+                        <VBox minWidth="90" spacing="10">
                             <padding>
                                 <Insets left="8" />
                             </padding>
@@ -69,7 +69,7 @@
                     </HBox>
 
                     <HBox alignment="CENTER_LEFT">
-                        <VBox minWidth="70" spacing="10">
+                        <VBox minWidth="90" spacing="10">
                             <padding>
                                 <Insets left="8" />
                             </padding>

diff --git a/src/main/resources/view/StudentListCard.fxml b/src/main/resources/view/StudentListCard.fxml
@@ -18,7 +18,7 @@
       <padding>
         <Insets top="5" right="5" bottom="5" left="15" />
       </padding>
-      <HBox spacing="0.5" alignment="CENTER_LEFT">
+      <HBox spacing="0.5" alignment="TOP_LEFT">
         <Label fx:id="id" styleClass="cell_big_label">
           <minWidth>
             <!-- Ensures that the label text is never truncated -->