Merge remote-tracking branch 'origin/dev' into dev

Author: cuttle-fish-my

package.json

@@ -20,6 +20,7 @@
     "@testing-library/react": "13.4.0",
     "@testing-library/user-event": "13.5.0",
     "ajv": "6.12.6",
+    "antd": "^5.26.3",
     "babel-plugin-macros": "3.1.0",
     "buffer": "6.0.3",
     "cm6-theme-basic-dark": "0.2.0",

public/TableDark.css

@@ -1082,6 +1082,7 @@
         overflow: hidden;
         display: flex;
         align-items: center;
+        border-bottom: 1px solid #2a2a2a;
     }
 
     .p-dropdown-item-group {
@@ -9421,16 +9422,52 @@
 
 .p-rowgroup-header {
     background-color: #3b3b3b;
+    border-bottom: 1px solid #2a2a2a;
 }
 
 .p-datatable-thead > tr > th {
     background: #313131;
 }
 
 .p-datatable-header {
-    background-color: #313131;
+    background-color: #2b2b2b;
 }
 
 .p-dropdown-item:hover {
-    background-color: #3d3d3d;
-}
+    background-color: #2f3033;
+}
+
+.chip-plain {
+    color: white;
+    background-color: #414041;
+}
+
+.chip-status-admit-green {
+    color: white;
+    background-color: #5cc754;
+}
+
+.chip-status-reject-red {
+    color: white;
+    background-color: #e54757;
+}
+
+.chip-status-waitlist-grey {
+    color: white;
+    background-color: #414041;
+}
+
+.chip-status-defer-orange {
+    color: white;
+    background-color: #ec9727;
+}
+
+.chip-semester-fall-orange {
+    color: white;
+    background-color: #eb7f2b;
+}
+
+.chip-semester-spring-cyan {
+    color: white;
+    background-color: #51b991;
+}

public/TableLight.css

@@ -1082,6 +1082,7 @@
         overflow: hidden;
         display: flex;
         align-items: center;
+        border-bottom: 1px solid #e0e0e0;
     }
 
     .p-dropdown-item-group {
@@ -9421,16 +9422,53 @@
 
 .p-rowgroup-header {
     background-color: #f1f0f0;
+    border-bottom: 1px solid #e0e0e0;
 }
 
 .p-datatable-thead > tr > th {
     background: #e3e3e3;
 }
 
 .p-datatable-header {
-    background-color: #efefef;
+    background-color: #dfdfdf;
 }
 
 .p-dropdown-item:hover {
-    background-color: #999999;
-}
+    background-color: #efefef;
+}
+
+/* Color for self-made Chips */
+.chip-plain {
+    color: black;
+    background-color: #ebebeb;
+}
+
+.chip-status-admit-green {
+    color: white;
+    background-color: #59bc54;
+}
+
+.chip-status-reject-red {
+    color: white;
+    background-color: #e5414e;
+}
+
+.chip-status-waitlist-grey {
+    color: black;
+    background-color: #eaeaea;
+}
+
+.chip-status-defer-orange {
+    color: white;
+    background-color: #eb9223;
+}
+
+.chip-semester-fall-orange {
+    color: white;
+    background-color: #eb7f2b;
+}
+
+.chip-semester-spring-cyan {
+    color: white;
+    background-color: #51b991;
+}

src/Components/DataPoints/DataPoints.css

@@ -1,6 +1,6 @@
 .DataPointsContent {
     width: 100%;
-    margin: 10px;
+    margin-top: 10px;
     overflow-x: auto;
     user-select: text;
     height: calc(100% - 20px);
@@ -22,18 +22,6 @@
     padding: 8px;
 }
 
-@keyframes fadeIn {
-    from { opacity: 0; transform: translateY(-10px); }
-    to { opacity: 1; transform: translateY(0); }
-}
-
-.filter-container {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 16px;
-    align-items: flex-start;
-}
-
 /* 优化每个过滤器元素的宽度和样式 */
 .filter-container > .MuiTextField-root,
 .filter-container > .MuiFormControl-root {
@@ -54,12 +42,12 @@
 /* 搜索结果指示器 */
 .search-results-indicator {
     background-color: rgba(128, 128, 128, 0.08);
-    padding: 8px 16px;
+    padding: 6px 16px;
     border-radius: 8px;
-    margin-bottom: 12px;
+    margin: 6px;
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    justify-content: center;
     animation: fadeIn 0.3s ease;
 }
 
@@ -119,12 +107,6 @@
     form .MuiFab-root {
         z-index: 1060 !important; /* Match the z-index with the close button */
     }
-    
-    /* Ensure the help/close button is always visible and on top */
-    .HiddenHelpButton {
-        z-index: 1070 !important; /* Higher than everything else */
-        box-shadow: 0 4px 10px rgba(0, 0, 0, 0.3) !important; /* Enhanced shadow */
-    }
 }
 
 .DataTableStyle {
@@ -256,4 +238,29 @@
 
 .p-dropdown-panel .p-dropdown-items .p-dropdown-item {
     padding: 5px 1rem 5px 1rem;
-}
+}
+
+.group-header {
+    height: 40px;
+    padding-top: 10px;
+}
+
+@media (max-width: 1024px) {
+    .group-header {
+        height: 25px;
+        padding-top: 6px;
+    }
+}
+
+.refresh-button {
+    position: fixed;
+    z-index: 20;
+    bottom: 40px;
+    right: 20px;
+}
+
+@media (max-width: 768px) {
+    bottom: 20px;
+    right: 16px;
+    transform: scale(0.9);
+}