Merge pull request #120 from amosproj/main

distribution of the sprint 9 development
amosproj · Jun 16, 2021 · 3886ab1 · 3886ab1
2 parents cdb10ac + 5d197ac
commit 3886ab1
Show file tree

Hide file tree

Showing 19 changed files with 1 addition and 1 deletion.
diff --git a/deliverables/2021-06-16 - AMOS SS2021 - Team 8 - Planning Document.pdf b/deliverables/2021-06-16 - AMOS SS2021 - Team 8 - Planning Document.pdf
diff --git a/deliverables/2021-06-16 Kanban Board.png b/deliverables/2021-06-16 Kanban Board.png
diff --git a/frontend/src/routes/privateSection.css b/frontend/src/routes/privateSection.css
@@ -6,6 +6,6 @@
 /* Resizes the content to match the sidebar */
 .resizingContent {
     width: calc(100% - 200px);
-    overflow-y: visible;
+    overflow-y: auto;
     height: 100vh;
 }
diff --git a/wiki-images/Tests/01_login.png b/wiki-images/Tests/01_login.png
diff --git a/wiki-images/Tests/02_login_action.png b/wiki-images/Tests/02_login_action.png
diff --git a/wiki-images/Tests/03_dashboard.png b/wiki-images/Tests/03_dashboard.png
diff --git a/wiki-images/Tests/04_dashboard_closed_side_bar.png b/wiki-images/Tests/04_dashboard_closed_side_bar.png
diff --git a/wiki-images/Tests/05-dropdown.png b/wiki-images/Tests/05-dropdown.png
diff --git a/wiki-images/Tests/06_Generation.png b/wiki-images/Tests/06_Generation.png
diff --git a/wiki-images/Tests/07_transmission.png b/wiki-images/Tests/07_transmission.png
diff --git a/wiki-images/Tests/08_Industrial_Applications.png b/wiki-images/Tests/08_Industrial_Applications.png
diff --git a/wiki-images/Tests/09_model.png b/wiki-images/Tests/09_model.png
diff --git a/wiki-images/Tests/10_Solutions.png b/wiki-images/Tests/10_Solutions.png
diff --git a/wiki-images/Tests/11_Services.png b/wiki-images/Tests/11_Services.png
diff --git a/wiki-images/Tests/12_Details.png b/wiki-images/Tests/12_Details.png
diff --git a/wiki-images/Tests/13_Compare.png b/wiki-images/Tests/13_Compare.png
diff --git a/wiki-images/Tests/14_Logout.png b/wiki-images/Tests/14_Logout.png
diff --git a/wiki-images/Tests/15_Compare_closed_sidebar.png b/wiki-images/Tests/15_Compare_closed_sidebar.png
diff --git a/wiki-images/Tests/16_details_closed_sidebar.png b/wiki-images/Tests/16_details_closed_sidebar.png