Updated color scheme

COS301-SE-2023 · Oct 14, 2023 · 69288e2 · 69288e2
1 parent 134c5c2
commit 69288e2
Show file tree

Hide file tree

Showing 38 changed files with 90 additions and 91 deletions.
diff --git a/frontend/infosafe_frontend/src/components/Charts/SystemAnalyticsChart.js b/frontend/infosafe_frontend/src/components/Charts/SystemAnalyticsChart.js
@@ -106,13 +106,13 @@ const SystemAnalyticsChart = () => {
                     datasets: [
                         {
                             label: 'System Total',
-                            backgroundColor: '#49D4D0',
+                            backgroundColor: '#50C9CE',
                             barThickness: 20,
                             data: [dataScopeCount, totalTasks, totalAssets, suppTotal, assetTotal],
                         },
                         {
                             label: 'My Total',
-                            backgroundColor: '#9E0000',
+                            backgroundColor: '#00003E',
                             barThickness: 20,
                             data: [myDataScopeCount, myTotalTasks, assetCount, mySuppTotal, myAssetTotal],
                             pointStyle: 'circle',

diff --git a/frontend/infosafe_frontend/src/components/Charts/TasksChart.js b/frontend/infosafe_frontend/src/components/Charts/TasksChart.js
@@ -36,7 +36,7 @@ const TasksChart = () => {
                     {
                         label: 'Tasks',
                         data: [15, taskCount],
-                        backgroundColor: ['#9E0000', '#444040'],
+                        backgroundColor: ['#00003E', '#444040'],
                     }
                 ]
             },

diff --git a/frontend/infosafe_frontend/src/styling/AccessRequestApproval.css b/frontend/infosafe_frontend/src/styling/AccessRequestApproval.css
@@ -39,7 +39,7 @@
     display: none;
 }
 .approveAccessRequestBackButton {
-    background-color: #9E0000;
+    background-color: #00003E;
     border: none;
     position: relative;
     height: 6%;

diff --git a/frontend/infosafe_frontend/src/styling/AccessRequests.css b/frontend/infosafe_frontend/src/styling/AccessRequests.css
@@ -9,7 +9,7 @@
 }
 .accessHelpPopupIcon {
     font-size: 2em;
-    color: #9E0000;
+    color: #00003E;
 }
 .accessRequestsBackground{
     background-color: #FFFFFF;
@@ -44,14 +44,14 @@
     font-size: 16px;
 }
 .accessRequestsSearchInput:focus{
-    border: 2px solid #9E0000;
+    border: 2px solid #00003E;
 }
 .accessRequestsSearchIcon {
     position: absolute;
     right: 10px;
     top: 54%;
     transform: translateY(-50%);
-    color: #9E0000;
+    color: #00003E;
 }
 .accessRequests {
     background-color: transparent;
@@ -147,7 +147,7 @@
     margin: 0 auto;
     height: 8%;
     width: 30%;
-    border: 4px solid #9E0000;
+    border: 4px solid #00003E;
     border-radius: 20px;
     box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.25)
 }

diff --git a/frontend/infosafe_frontend/src/styling/AssetRequests.css b/frontend/infosafe_frontend/src/styling/AssetRequests.css
@@ -31,14 +31,14 @@
     font-size: 16px;
 }
 .assetRequestSearchInput:focus{
-    border: 2px solid #9E0000;
+    border: 2px solid #00003E;
 }
 .assetRequestSearchIcon {
     position: absolute;
     right: 10px;
     top: 54%;
     transform: translateY(-50%);
-    color: #9E0000;
+    color: #00003E;
 }
 .EditIcon {
     position: absolute;
@@ -135,7 +135,7 @@
 }
 .helpPopupIcon {
     font-size: 2em;
-    color: #9E0000;
+    color: #00003E;
 }
 .loadingScreen{
     background-color: #FFFFFF;
@@ -149,7 +149,7 @@
     margin: 0 auto;
     height: 8%;
     width: 30%;
-    border: 4px solid #9E0000;
+    border: 4px solid #00003E;
     border-radius: 20px;
     box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.25)
 }

diff --git a/frontend/infosafe_frontend/src/styling/ChangePassword.css b/frontend/infosafe_frontend/src/styling/ChangePassword.css
@@ -40,7 +40,7 @@
     display: none;
 }
 .changePassBackButton {
-    background-color: #9E0000;
+    background-color: #00003E;
     border: none;
     position: relative;
     height: 6%;

diff --git a/frontend/infosafe_frontend/src/styling/CreateDataScopePopup.css b/frontend/infosafe_frontend/src/styling/CreateDataScopePopup.css
@@ -39,7 +39,7 @@
     display: none;
 }
 .createDataScopeBackButton {
-    background-color: #9E0000;
+    background-color: #00003E;
     border: none;
     position: relative;
     height: 6%;
@@ -194,7 +194,7 @@
 }
 .createDataScopeError{
     display: none;
-    color: #9E0000;
+    color: #00003E;
     font-family: 'Roboto', sans-serif;
     font-style: normal;
     font-weight: bold;

diff --git a/frontend/infosafe_frontend/src/styling/CreateDevicePopup.css b/frontend/infosafe_frontend/src/styling/CreateDevicePopup.css
@@ -39,7 +39,7 @@
     display: none;
 }
 .createDeviceBackButton {
-    background-color: #9E0000;
+    background-color: #00003E;
     border: none;
     position: relative;
     height: 6%;
@@ -296,7 +296,7 @@
 }
 .createDeviceError{
     display: none;
-    color: #9E0000;
+    color: #00003E;
     font-family: 'Roboto', sans-serif;
     font-style: normal;
     font-weight: bold;

diff --git a/frontend/infosafe_frontend/src/styling/CreateRisk.css b/frontend/infosafe_frontend/src/styling/CreateRisk.css
@@ -39,7 +39,7 @@
     display: none;
 }
 .createRiskBackButton {
-    background-color: #9E0000;
+    background-color: #00003E;
     border: none;
     position: relative;
     height: 6%;
@@ -289,7 +289,7 @@
 }
 .createRiskError{
     display: none;
-    color: #9E0000;
+    color: #00003E;
     font-family: 'Roboto', sans-serif;
     font-style: normal;
     font-weight: bold;

diff --git a/frontend/infosafe_frontend/src/styling/CreateTask.css b/frontend/infosafe_frontend/src/styling/CreateTask.css
@@ -46,7 +46,7 @@
     left: 15%;
 }
 .createTaskBackButton {
-    background-color: #9E0000;
+    background-color: #00003E;
     border: none;
     position: relative;
     height: 6%;
@@ -220,7 +220,7 @@
 }
 .createTaskError{
     display: none;
-    color: #9E0000;
+    color: #00003E;
     font-family: 'Roboto', sans-serif;
     font-style: normal;
     font-weight: bold;

diff --git a/frontend/infosafe_frontend/src/styling/Dashboard.css b/frontend/infosafe_frontend/src/styling/Dashboard.css
@@ -127,7 +127,7 @@
     top: 20%;
 }
 .currentRequestsInfo {
-    background: #49D4D0;
+    background: #50C9CE;
     width: 22%;
     height: 100%;
     border-radius: 4px;
@@ -217,7 +217,7 @@
     top: 30%;
 }
 .systemIcon{
-    color: #49D4D0;
+    color: #50C9CE;
     align-self: center;
 }
 .myTotals
@@ -395,13 +395,13 @@
     background-color: transparent;
     /*padding: 5px;*/
     border-radius: 4px;
-    border: 2px solid #00003E;
+    /*border: 2px solid #00003E;*/
     margin-top: 3px;
     /*display: flex;*/
 }
-.inUseDevicesList li:nth-child(even) {
-    border-color: #49D4D0;
-}
+/*.inUseDevicesList li:nth-child(even) {*/
+/*    border-color: #50C9CE;*/
+/*}*/
 .inUseDevicesList li p {
     font-family: 'Roboto', sans-serif;
     /*transform: translateY(-50%);*/
@@ -473,7 +473,7 @@
     gap: 10%;
 }
 .timeDisplay {
-    background-color:  #49D4D0;
+    background-color:  #50C9CE;
     width: 20%;
     justify-content: center;
     border-radius: 12px;
@@ -536,7 +536,7 @@
     box-sizing: content-box;
 }
 .deadline2 {
-    background-color: #49D4D0;
+    background-color: #50C9CE;
     width: 30%;
     justify-content: center;
     border-radius: 12px;

diff --git a/frontend/infosafe_frontend/src/styling/DataScopes.css b/frontend/infosafe_frontend/src/styling/DataScopes.css
@@ -9,7 +9,7 @@
 }
 .dsHelpPopupIcon {
     font-size: 2em;
-    color: #9E0000;
+    color: #00003E;
 }
 .dataScopesBackground{
     background-color: #FFFFFF;
@@ -90,15 +90,15 @@
     font-size: 16px;
 }
 .dataScopesSearchInput:focus{
-    border: 2px solid #9E0000;
+    border: 2px solid #00003E;
 }
 .dataScopesSearchIcon
 {
     position: absolute;
     right: 10px;
     top: 54%;
     transform: translateY(-50%);
-    color: #9E0000;
+    color: #00003E;
 }
 .dataScopesEditButton{
     background-color: #444040;
@@ -178,7 +178,7 @@
     margin: 0 auto;
     height: 8%;
     width: 30%;
-    border: 4px solid #9E0000;
+    border: 4px solid #00003E;
     border-radius: 20px;
     box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.25)
 }

diff --git a/frontend/infosafe_frontend/src/styling/Devices.css b/frontend/infosafe_frontend/src/styling/Devices.css
@@ -31,14 +31,14 @@
     font-size: 16px;
 }
 .deviceSearchInput:focus{
-    border: 2px solid #9E0000;
+    border: 2px solid #00003E;
 }
 .deviceSearchIcon {
     position: absolute;
     right: 10px;
     top: 54%;
     transform: translateY(-50%);
-    color: #9E0000;
+    color: #00003E;
 }
 .devices {
     background-color: transparent;
@@ -150,7 +150,7 @@
 }
 .helpPopupIcon {
     font-size: 2em;
-    color: #9E0000;
+    color: #00003E;
 }
 .loadingScreen{
     background-color: #FFFFFF;
@@ -164,7 +164,7 @@
     margin: 0 auto;
     height: 8%;
     width: 30%;
-    border: 4px solid #9E0000;
+    border: 4px solid #00003E;
     border-radius: 20px;
     box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.25)
 }

diff --git a/frontend/infosafe_frontend/src/styling/EditAccessRequest.css b/frontend/infosafe_frontend/src/styling/EditAccessRequest.css
@@ -46,7 +46,7 @@
     left: 15%;
 }
 .editAccessRequestBackButton {
-    background-color: #9E0000;
+    background-color: #00003E;
     border: none;
     position: relative;
     height: 6%;

diff --git a/frontend/infosafe_frontend/src/styling/EditDataScopePopup.css b/frontend/infosafe_frontend/src/styling/EditDataScopePopup.css
@@ -39,7 +39,7 @@
     display: none;
 }
 .editDataScopeBackButton {
-    background-color: #9E0000;
+    background-color: #00003E;
     border: none;
     position: relative;
     height: 6%;

diff --git a/frontend/infosafe_frontend/src/styling/EditDevice.css b/frontend/infosafe_frontend/src/styling/EditDevice.css
@@ -39,7 +39,7 @@
     display: none;
 }
 .editDeviceBackButton {
-    background-color: #9E0000;
+    background-color: #00003E;
     border: none;
     position: relative;
     height: 6%;
@@ -238,7 +238,7 @@
 }
 .editDeviceError{
     display: none;
-    color: #9E0000;
+    color: #00003E;
     font-family: 'Roboto', sans-serif;
     font-style: normal;
     font-weight: bold;

diff --git a/frontend/infosafe_frontend/src/styling/EditRisk.css b/frontend/infosafe_frontend/src/styling/EditRisk.css
@@ -46,7 +46,7 @@
     left: 15%;
 }
 .editRiskBackButton {
-    background-color: #9E0000;
+    background-color: #00003E;
     border: none;
     position: relative;
     height: 6%;

diff --git a/frontend/infosafe_frontend/src/styling/EditSupportRequest.css b/frontend/infosafe_frontend/src/styling/EditSupportRequest.css
@@ -46,7 +46,7 @@
     display: none;
 }
 .editSupportRequestBackButton {
-    background-color: #9E0000;
+    background-color: #00003E;
     border: none;
     position: relative;
     height: 6%;

diff --git a/frontend/infosafe_frontend/src/styling/EditUser.css b/frontend/infosafe_frontend/src/styling/EditUser.css
@@ -46,7 +46,7 @@
     left: 15%;
 }
 .editUserBackButton {
-    background-color: #9E0000;
+    background-color: #00003E;
     border: none;
     position: relative;
     height: 6%;
@@ -192,7 +192,7 @@
 }
 
 input:focus{
-    border: 2px solid #9E0000;
+    border: 2px solid #00003E;
 }
 .editUserRolesLoading{
     font-family: 'Roboto', sans-serif;

diff --git a/frontend/infosafe_frontend/src/styling/HelpPopup.css b/frontend/infosafe_frontend/src/styling/HelpPopup.css
@@ -39,7 +39,7 @@
     display: none;
 }
 .helpBackButton{
-    background-color: #9E0000;
+    background-color: #00003E;
     border: none;
     position: relative;
     height: 6%;
@@ -108,7 +108,7 @@
     padding: 0;
     text-align: center;
     font-size: 3em;
-    color: #9E0000;
+    color: #00003E;
     margin: 0 0 0 1.5vw;
 }
 .helpImage{