Merge branch 'main' of https://github.com/WPI-Roadmap/client-side

WPI-Roadmap · Jan 13, 2024 · 171dc84 · 171dc84
2 parents b00fb61 + 2457d36
commit 171dc84
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/src/components/Dashboard/Dashboard.js b/src/components/Dashboard/Dashboard.js
@@ -11,7 +11,7 @@ import RequirementsSidebar from './Requirements/Requirements.js';
 
 import 'reactflow/dist/style.css';
 
-const data = require('./Courses.json');
+const data = require('./courses.json');
 const { Option } = Select;
 const { Header, Sider, Content } = Layout;
 
@@ -318,16 +318,28 @@ function Dashboard() {
                             style={{
                                 padding: 0,
                                 background: colorBgContainer,
+                                position: "relative",
+                                height: 0,
                             }}
                         >
                             <Button
                                 type="text"
                                 icon={collapsed ? <MenuUnfoldOutlined /> : <MenuFoldOutlined />}
                                 onClick={() => setCollapsed(!collapsed)}
+                                className="sideButt"
                                 style={{
                                     fontSize: '16px',
-                                    width: 64,
-                                    height: 64,
+                                    width: 48,
+                                    height: 48,
+                                    position: "absolute",
+                                    top: 16,
+                                    left: 16,
+                                    zIndex: 1,
+                                    background: "black",
+                                    color: "white",
+                                    borderStyle: "solid",
+                                    borderWidth: 1,
+                                    borderColor: "white",
                                 }}
                             />
                         </Header>

diff --git a/src/components/Dashboard/Requirements/Requirements.css b/src/components/Dashboard/Requirements/Requirements.css
@@ -13,6 +13,18 @@ ul {
     padding: 0;
 }
 
+/* .course-select .ant-select-selector, .course-select .ant-select-selection-item {
+    background-color: black !important;
+    border-color: white !important;
+    color: white !important;
+}
+
+.course-select .ant-select-arrow {
+    color: white !important;
+} */
+
+/* TODO: figure out for expanded */
+
 /* .req-courses li .ant-progress-steps-outer {
     display: grid;
     grid-template-rows: 1fr;