diff --git a/my-workspace/projects/sae-lib/buttons/feedback-button/feedback-button.css b/my-workspace/projects/sae-lib/buttons/feedback-button/feedback-button.css deleted file mode 100644 index dd36fe1..0000000 --- a/my-workspace/projects/sae-lib/buttons/feedback-button/feedback-button.css +++ /dev/null @@ -1,172 +0,0 @@ -.feedback-button { - - &:hover { - background: #d9e8f6; - } - - i { - font-size: 16px; - } -} - -.feedback-modal-overlay { - position: fixed; - top: 0; - left: 0; - right: 0; - bottom: 0; - background-color: rgba(0, 0, 0, 0.5); - display: flex; - justify-content: center; - align-items: center; - z-index: 1000; -} - -.feedback-modal { - background: white; - border-radius: 8px; - width: 90%; - max-width: 500px; - box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15); - display: flex; - flex-direction: column; - max-height: 90vh; - overflow: hidden; -} - -.modal-header { - display: flex; - justify-content: space-between; - align-items: center; - padding: 16px 20px; - border-bottom: 1px solid #eee; - - h3 { - margin: 0; - font-size: 18px; - font-weight: 600; - color: #083b7d; - } - - .close-button { - background: none; - border: none; - cursor: pointer; - font-size: 20px; - color: #666; - padding: 4px; - - &:hover { - color: #333; - } - } -} - -.modal-body { - padding: 20px; - overflow-y: auto; - - .modal-description { - margin-bottom: 16px; - color: #555; - } - - textarea { - width: 100%; - padding: 12px; - border: 1px solid #ddd; - border-radius: 4px; - resize: vertical; - font-family: inherit; - font-size: 14px; - - &:focus { - outline: none; - border-color: #083b7d; - } - - &:disabled { - background-color: #f5f5f5; - cursor: not-allowed; - } - } - - .success-message, .error-message { - margin-top: 16px; - padding: 10px; - border-radius: 4px; - display: flex; - align-items: center; - gap: 8px; - - i { - font-size: 18px; - } - } - - .success-message { - background-color: #e6f7e6; - color: #2e7d32; - } - - .error-message { - background-color: #fdecea; - color: #d32f2f; - } -} - -.modal-footer { - padding: 16px 20px; - border-top: 1px solid #eee; - display: flex; - justify-content: flex-end; - gap: 12px; - - button { - padding: 8px 16px; - border-radius: 4px; - font-weight: 500; - cursor: pointer; - - &:disabled { - opacity: 0.6; - cursor: not-allowed; - } - } - - .cancel-button { - background: none; - border: 1px solid #ddd; - color: #555; - - &:hover:not(:disabled) { - background-color: #f5f5f5; - } - } - - .submit-button { - background-color: #083b7d; - color: white; - border: none; - display: flex; - align-items: center; - gap: 8px; - - &:hover:not(:disabled) { - background-color: #062c5e; - } - } -} - -.spinning { - animation: spin 1s linear infinite; -} - -@keyframes spin { - from { - transform: rotate(0deg); - } - to { - transform: rotate(360deg); - } -} diff --git a/my-workspace/projects/sae-lib/buttons/feedback-button/feedback-button.html b/my-workspace/projects/sae-lib/buttons/feedback-button/feedback-button.html index 920aa95..0e08552 100644 --- a/my-workspace/projects/sae-lib/buttons/feedback-button/feedback-button.html +++ b/my-workspace/projects/sae-lib/buttons/feedback-button/feedback-button.html @@ -10,16 +10,16 @@
diff --git a/my-workspace/projects/sae-lib/inputs/multi-selector/multi-selector.scss b/my-workspace/projects/sae-lib/inputs/multi-selector/multi-selector.scss index 813dfbb..b6598d6 100644 --- a/my-workspace/projects/sae-lib/inputs/multi-selector/multi-selector.scss +++ b/my-workspace/projects/sae-lib/inputs/multi-selector/multi-selector.scss @@ -81,8 +81,12 @@ .is-disabled & { - border-color: #525668; - background: #8D91A4; + border-color: #8D91A4; + background: #fff; + color: #8D91A4; + i{ + color: #525668; + } } } @@ -95,9 +99,8 @@ z-index: 100; border-top-left-radius: 0; border-top-right-radius: 0; - width: 210px; - - top: 42px; + width: 218px; + top: -57px; left: 0; border-left: 1px solid #8D91A4; border-bottom: 1px solid #8D91A4; diff --git a/my-workspace/projects/sae-lib/src/styles/_variables.scss b/my-workspace/projects/sae-lib/src/styles/_variables.scss index 41f7f61..33b3540 100644 --- a/my-workspace/projects/sae-lib/src/styles/_variables.scss +++ b/my-workspace/projects/sae-lib/src/styles/_variables.scss @@ -1,3 +1,5 @@ +// typo suites -------------------------- +$font-family: Barlow, Ubuntu Sans, Noto Sans, Calibri, Arial, sans-serif; // gradient -------------------------- $degrade: #0069B4; $degrade-hover: #0069B4; diff --git a/sae-csc/src/app/pages/login/login.html b/sae-csc/src/app/pages/login/login.html index b6d1f79..6ba4c31 100644 --- a/sae-csc/src/app/pages/login/login.html +++ b/sae-csc/src/app/pages/login/login.html @@ -43,12 +43,12 @@ diff --git a/sae-csc/src/app/pages/login/login.scss b/sae-csc/src/app/pages/login/login.scss index bfb13fa..1d24e7e 100644 --- a/sae-csc/src/app/pages/login/login.scss +++ b/sae-csc/src/app/pages/login/login.scss @@ -2,7 +2,8 @@ #cscLogin { - background: #1b1d27; + font-family: variables.$font-family; + background: variables.$neutral-blue; color: white; display: flex; width: 100vw; @@ -17,8 +18,8 @@ } .sub-title { - color: #FFF; - font-family: Barlow; + color: variables.$neutral-white; + font-family: variables.$font-family; font-size: 24px; font-style: normal; font-weight: 600; @@ -34,13 +35,13 @@ a { /* Body/Body 4/Sb */ - font-family: Barlow; + font-family: variables.$font-family; font-size: 14px; font-style: normal; font-weight: 600; line-height: 20px; /* 142.857% */ &:hover { - color: white; + color: variables.$neutral-white; } text-decoration: none; @@ -48,37 +49,56 @@ } .external-link { - color: #337DC3; + text-decoration: none; + color: variables.$main-color-300; width: 100%; + margin-left: 24px; + .label{ + font-size: variables.$spacing-4; + text-decoration: underline; + } + &.bottom{ + margin-left: 10px; + font-size: 14px; + } } .magic-text { color: variables.$csc-magic-color; + i{ + font-size: 24px; + } } .button { display: inline-flex; height: 44px; - padding: 14px 16px; + padding: 14px variables.$spacing-4; align-items: center; gap: 8px; flex-shrink: 0; background: linear-gradient(77deg, #073A7C -4.23%, #1767AD 51.8%, #255B8E 87.72%); - color: var(--Light-base-solid-white, #FFF); + color: var(--Light-base-solid-white, variables.$neutral-white); border-radius: 10px; border: 0; + /* Body/Body 3/Sb */ - font-family: Barlow; - font-size: 16px; + + font-size: variables.$spacing-4; font-style: normal; font-weight: 600; - line-height: 24px; /* 150% */ + line-height: 24px; } .request_access { margin-top: 32px; + color: variables.$neutral-white; + font-size: variables.$spacing-4; + font-weight: 600; + line-height: 24px; + } .technical-contact { @@ -90,6 +110,10 @@ color: white; } } + + i{ + font-size: variables.$spacing-4; + } } .Aligner { @@ -107,7 +131,7 @@ } .bg-login { - background: url(/safran_bg.jpg) center no-repeat; + background: url('/safran_bg.jpg') center no-repeat; background-size: cover; width: 591px; height: 100%; diff --git a/sae-csc/src/app/pages/main/main.html b/sae-csc/src/app/pages/main/main.html index 1272cd9..2ce8c69 100644 --- a/sae-csc/src/app/pages/main/main.html +++ b/sae-csc/src/app/pages/main/main.html @@ -32,13 +32,11 @@