Merge 4fb2538 into dcbcb1e

appknox · Nov 27, 2024 · 1999749 · 1999749
2 parents dcbcb1e + 4fb2538
commit 1999749
Show file tree

Hide file tree

Showing 29 changed files with 161 additions and 226 deletions.
diff --git a/app/components/notifications-page/messages/nf-apistcmpltd1/index.scss b/app/components/notifications-page/messages/nf-apistcmpltd1/index.scss
@@ -37,20 +37,20 @@
   margin-right: 0.4em;
 }
 .severity-color--critical {
-  background-color: var(--risk-critical);
+  background-color: var(--severity-critical);
 }
 .severity-color--high {
-  background-color: var(--risk-high);
+  background-color: var(--severity-high);
 }
 .severity-color--medium {
-  background-color: var(--risk-medium);
+  background-color: var(--severity-medium);
 }
 .severity-color--low {
-  background-color: var(--risk-low);
+  background-color: var(--severity-low);
 }
 .severity-color--passed {
-  background-color: var(--risk-passed);
+  background-color: var(--severity-passed);
 }
 .severity-color--untested {
-  background-color: var(--risk-untested);
+  background-color: var(--severity-untested);
 }
diff --git a/app/components/notifications-page/messages/nf-dastcmpltd1/index.scss b/app/components/notifications-page/messages/nf-dastcmpltd1/index.scss
@@ -37,20 +37,20 @@
   margin-right: 0.4em;
 }
 .severity-color--critical {
-  background-color: var(--risk-critical);
+  background-color: var(--severity-critical);
 }
 .severity-color--high {
-  background-color: var(--risk-high);
+  background-color: var(--severity-high);
 }
 .severity-color--medium {
-  background-color: var(--risk-medium);
+  background-color: var(--severity-medium);
 }
 .severity-color--low {
-  background-color: var(--risk-low);
+  background-color: var(--severity-low);
 }
 .severity-color--passed {
-  background-color: var(--risk-passed);
+  background-color: var(--severity-passed);
 }
 .severity-color--untested {
-  background-color: var(--risk-untested);
+  background-color: var(--severity-untested);
 }
diff --git a/app/components/notifications-page/messages/nf-sastcmpltd1/index.scss b/app/components/notifications-page/messages/nf-sastcmpltd1/index.scss
@@ -37,20 +37,20 @@
   margin-right: 0.4em;
 }
 .severity-color--critical {
-  background-color: var(--risk-critical);
+  background-color: var(--severity-critical);
 }
 .severity-color--high {
-  background-color: var(--risk-high);
+  background-color: var(--severity-high);
 }
 .severity-color--medium {
-  background-color: var(--risk-medium);
+  background-color: var(--severity-medium);
 }
 .severity-color--low {
-  background-color: var(--risk-low);
+  background-color: var(--severity-low);
 }
 .severity-color--passed {
-  background-color: var(--risk-passed);
+  background-color: var(--severity-passed);
 }
 .severity-color--untested {
-  background-color: var(--risk-untested);
+  background-color: var(--severity-untested);
 }
diff --git a/app/components/partner/client-info/styles.scss b/app/components/partner/client-info/styles.scss
@@ -2,10 +2,10 @@ $card-header-height: 5rem;
 $card-thumbnail-size: 2.8rem;
 
 .client-info-card {
-  border: 1px solid var(--bg-gray-darken-050);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
   grid-template-rows: $card-header-height 1fr;
-  background-color: var(--bg-gray-lighten-015);
+  background-color: var(--background-light);
 }
 
 .client-info-header {
@@ -21,7 +21,7 @@ $card-thumbnail-size: 2.8rem;
   width: $card-thumbnail-size;
   height: $card-thumbnail-size;
   border-radius: 50%;
-  background-color: var(--bg-darkgray);
+  background-color: var(--neutral-grey-400);
   color: #ffffff;
   display: grid;
   align-items: center;
@@ -35,14 +35,14 @@ $card-thumbnail-size: 2.8rem;
 .title {
   text-transform: capitalize;
   font-weight: bold;
-  color: var(--black-700);
+  color: var(--text-primary);
   max-height: 92%;
   font-size: 1.1rem;
   overflow: hidden;
   text-overflow: ellipsis;
 
   &.empty-title {
-    color: var(--black-400);
+    color: var(--text-secondary);
     font-size: 0.95rem;
     font-style: italic;
   }
@@ -56,7 +56,7 @@ $card-thumbnail-size: 2.8rem;
 
 .row {
   display: flex;
-  border-bottom: 1px dashed var(--bg-gray-darken-050);
+  border-bottom: 1px dashed var(--border-color-1);
   padding: 0.2rem 0;
 
   &:last-child {

diff --git a/app/components/partner/client-list/index.scss b/app/components/partner/client-list/index.scss
@@ -9,7 +9,7 @@
 .title {
   font-size: 1.2rem;
   font-weight: bold;
-  color: #5e5f63;
+  color: var(--text-secondary);
   padding-top: 0.8rem;
   padding-bottom: 0.9rem;
 }
@@ -41,21 +41,21 @@
 .loading-error {
   display: flex;
   height: 7.5rem;
-  background: var(--bg-gray);
-  border: 1px solid var(--bg-gray-darken-040);
+  background: var(--neutral-grey-100);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
-  color: var(--loading-error-color);
+  color: var(--primary-main);
   align-items: center;
   justify-content: center;
 }
 
 .empty-data {
   display: flex;
   height: 7.5rem;
-  background: var(--bg-gray);
-  border: 1px solid var(--bg-gray-darken-040);
+  background: var(--neutral-grey-100);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
-  color: var(--empty-state-color);
+  color: var(--neutral-grey-500);
   font-style: italic;
   align-items: center;
   justify-content: center;

diff --git a/app/components/partner/client-plan/styles.scss b/app/components/partner/client-plan/styles.scss
@@ -15,28 +15,28 @@
   justify-content: center;
 
   &.per-app {
-    color: var(--label-blue-color);
-    background-color: var(--label-blue-bg);
+    color: var(--info-dark);
+    background-color: var(--info-light);
   }
 
   &.per-scan {
-    color: var(--label-green-color);
-    background-color: var(--label-green-bg);
+    color: var(--success-main);
+    background-color: var(--success-light);
   }
 }
 
 .plan-status {
   display: flex;
   align-items: center;
-  color: var(--black);
+  color: var(--text-primary);
   margin-left: 0.5rem;
 }
 
 .expiry-date {
   font-size: 0.9em;
-  color: var(--empty-state-color);
+  color: var(--neutral-grey-500);
 }
 
 .expiry-date-expired {
-  color: var(--text-error);
+  color: var(--error-main);
 }
diff --git a/app/components/partner/client-project-detail/index.scss b/app/components/partner/client-project-detail/index.scss
@@ -2,9 +2,9 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  border: 1px solid var(--bg-gray-darken-050);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
-  background-color: var(--bg-gray-lighten-015);
+  background-color: var(--background-light);
   padding: 1rem;
   gap: 0.5rem;
 }
diff --git a/app/components/partner/client-project-list/index.scss b/app/components/partner/client-project-list/index.scss
@@ -4,15 +4,16 @@
   display: flex;
   align-items: center;
 }
+
 .title {
   font-size: 1.1rem;
   font-weight: bold;
-  color: var(--black-600);
+  color: var(--neutral-grey-700);
   margin-bottom: 0 !important;
 }
 
 .table {
-  border: 1px solid var(--border-table);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
 }
 
@@ -21,23 +22,25 @@
   align-items: center;
   justify-content: space-between;
   padding: 0.6rem 1rem;
-  background-color: var(--bg-gray);
+  background-color: var(--neutral-grey-100);
   word-break: break-all;
   grid-template-columns: 10% 1fr 15%;
+
   &.add-column {
     grid-template-columns: 10% 1fr 15% 15%;
   }
 }
 
 .table-row {
-  border-top: 1px solid var(--border-table);
+  border-top: 1px solid var(--border-color-1);
   display: grid;
   justify-content: space-between;
   align-items: center;
   width: 100%;
   padding: 0.3rem 0.8rem;
   min-height: 2.5rem;
   grid-template-columns: 10% 1fr 15%;
+
   &.add-column {
     grid-template-columns: 10% 1fr 15% 15%;
   }
@@ -50,10 +53,10 @@
 .loading-error {
   display: flex;
   height: 7.5rem;
-  background: var(--bg-gray);
-  border: 1px solid var(--bg-gray-darken-040);
+  background: var(--neutral-grey-100);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
-  color: var(--loading-error-color);
+  color: var(--primary-main);
   align-items: center;
   justify-content: center;
 }
@@ -68,10 +71,10 @@
 .empty-data {
   display: flex;
   height: 7.5rem;
-  background: var(--bg-gray);
-  border: 1px solid var(--bg-gray-darken-040);
+  background: var(--neutral-grey-100);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
-  color: var(--empty-state-color);
+  color: var(--neutral-grey-500);
   font-style: italic;
   align-items: center;
   justify-content: center;

diff --git a/app/components/partner/client-project-list/item/index.scss b/app/components/partner/client-project-list/item/index.scss
@@ -1,6 +1,6 @@
 .platform {
   padding-left: 1.5em;
-  color: var(--black-500);
+  color: var(--text-secondary);
 }
 
 .version {

diff --git a/app/components/partner/client-report-download/index.scss b/app/components/partner/client-report-download/index.scss
@@ -29,7 +29,7 @@
 }
 
 .report-loading-error {
-  color: var(--text-error);
+  color: var(--error-main);
   font-size: 0.95rem;
   line-height: 1.2;
   display: flex;

diff --git a/app/components/partner/client-report-download/report-password/index.scss b/app/components/partner/client-report-download/report-password/index.scss
@@ -34,20 +34,20 @@
 }
 
 .password-loading {
-  color: var(--black-400);
+  color: var(--text-secondary);
 }
 
 .password-loading-error {
-  color: var(--text-error);
+  color: var(--error-main);
   display: flex;
   align-items: center;
   justify-content: center;
   gap: 0.8rem;
 }
 
 .password-input {
-  background-color: var(--black-025);
-  border: 1px solid var(--black-100);
+  background-color: var(--background-main);
+  border: 1px solid var(--border-color-1);
   border-radius: 0.3rem;
   height: 2.5rem;
   padding-left: 0.3rem;

diff --git a/app/components/partner/client-report-summary/index.scss b/app/components/partner/client-report-summary/index.scss
@@ -14,32 +14,32 @@
 .riskkey-color {
   width: 0.8rem;
   height: 0.8rem;
-  background-color: var(--black-200);
+  background-color: var(--neutral-grey-200);
 }
 
 .riskblock--critical,
 .riskkey-color--critical {
-  background: var(--risk-critical);
+  background: var(--severity-critical);
 }
 .riskblock--high,
 .riskkey-color--high {
-  background: var(--risk-high);
+  background: var(--severity-high);
 }
 .riskblock--medium,
 .riskkey-color--medium {
-  background: var(--risk-medium);
+  background: var(--severity-medium);
 }
 .riskblock--low,
 .riskkey-color--low {
-  background: var(--risk-low);
+  background: var(--severity-low);
 }
 .riskblock--passed,
 .riskkey-color--passed {
-  background: var(--risk-passed);
+  background: var(--severity-passed);
 }
 .riskblock--untested,
 .riskkey-color--untested {
-  background: var(--risk-untested);
+  background: var(--severity-untested);
 }
 
 .index {
@@ -61,9 +61,9 @@
   gap: 0.36rem;
 }
 .riskkey-text {
-  color: var(--black-800);
+  color: var(--neutral-grey-800);
 }
 .riskkey-count {
-  color: var(--black-900);
+  color: var(--neutral-grey-900);
   font-weight: 600;
 }