From c0fd0f241cb8b4b6c8f0a5caff38ee7703421a45 Mon Sep 17 00:00:00 2001 From: Daniel Palafox Date: Tue, 12 Mar 2024 18:34:13 -0600 Subject: [PATCH 1/2] style: Align progress bad and update max width authorize card --- .../form-authorize.component.html | 584 +++++++++--------- .../form-authorize.component.scss | 238 +++---- .../pages/authorize/authorize.component.html | 56 +- .../pages/sign-in/sign-in.component.html | 308 ++++----- 4 files changed, 597 insertions(+), 589 deletions(-) diff --git a/src/app/authorize/components/form-authorize/form-authorize.component.html b/src/app/authorize/components/form-authorize/form-authorize.component.html index a419322a32..9e4324be28 100644 --- a/src/app/authorize/components/form-authorize/form-authorize.component.html +++ b/src/app/authorize/components/form-authorize/form-authorize.component.html @@ -1,292 +1,292 @@ - - - - - Authorize access - - - - -

- You are currently signed in as: -

-
-
- {{ userName }} -
- {{ - orcidUrl - }} -
- - - - - -

- has asked for the following access to your ORCID record: -

- -
    - -
  • - -
    - -
    {{ getDescription(scope) }}
    -
    - -
  • -
    -
- - - - -

- - If authorized, this organization will have access to your ORCID - record, as outlined above and described in further detail - in - ORCID’s privacy policy. -

-

- - You can manage access permissions for this and other Trusted - Organizations in your - - account settings. -

-
- - - update - - - - remove_red_eye - - - - - - -
- - - - - - -

- Authorize access -

-
-
- - -

- You are currently signed in as: -

- -
-
-
- - -
-
-
-
-
-
- {{ userName }} -
- {{ orcidUrl }} -
-
- -
-
- - - - -

- This organization has asked for the following access to your ORCID - record -

- -
    - -
  • - -
    - -
    {{ getDescription(scope) }}
    -
    - -
  • -
    -
- - - -
- - - update - - - - remove_red_eye - - - - - - -
-
+ + + + + Authorize access + + + + +

+ You are currently signed in as: +

+
+
+ {{ userName }} +
+ {{ + orcidUrl + }} +
+ + + + + +

+ has asked for the following access to your ORCID record: +

+ +
    + +
  • + +
    + +
    {{ getDescription(scope) }}
    +
    + +
  • +
    +
+ + + + +

+ + If authorized, this organization will have access to your ORCID + record, as outlined above and described in further detail + in + ORCID’s privacy policy. +

+

+ + You can manage access permissions for this and other Trusted + Organizations in your + + account settings. +

+
+ + + update + + + + remove_red_eye + + + + + + +
+ + + + + + + +

+ Authorize access +

+
+
+ +

+ You are currently signed in as: +

+ +
+
+
+ + +
+
+
+
+
+
+ {{ userName }} +
+ {{ orcidUrl }} +
+
+ +
+
+ + + + +

+ This organization has asked for the following access to your ORCID + record +

+ +
    + +
  • + +
    + +
    {{ getDescription(scope) }}
    +
    + +
  • +
    +
+ + + +
+ + + update + + + + remove_red_eye + + + + + + +
+
diff --git a/src/app/authorize/components/form-authorize/form-authorize.component.scss b/src/app/authorize/components/form-authorize/form-authorize.component.scss index d9ed7f1ca8..ca59249302 100644 --- a/src/app/authorize/components/form-authorize/form-authorize.component.scss +++ b/src/app/authorize/components/form-authorize/form-authorize.component.scss @@ -1,117 +1,121 @@ -@import '../../../../assets/scss/orcid.spacing.scss'; - -.logo { - width: 130px; -} - -.user-links { - display: flex; - justify-content: space-between; -} - -.university-dropdown { - display: flex; - align-items: center; - cursor: pointer; -} - -:host { - ul { - padding: 0; - - li { - list-style-type: none; - flex-direction: column; - align-items: baseline; - - div { - display: flex; - align-items: center; - mat-icon { - margin-bottom: -4px; // Compensates mat icon bottom with space - margin-left: $spacing-small; - margin-right: $spacing-small; - } - } - } - } -} - -button { - width: 100%; - margin-bottom: $spacing-base; -} - -mat-divider { - margin-top: $spacing-12; - margin-bottom: $spacing-12; -} - -mat-icon > img { - height: 20px; - margin-top: 2px; // Fix icon component with SVG image -} - -.col { - overflow: hidden; -} - -app-info-drop-down { - max-width: 100%; - display: block; -} - -mat-card-header.authorize-header { - mat-card-title { - margin: 0 0 32px 0 !important; - } - - h1 { - margin-top: 0; - } - - .orc-font-heading-small { - font-style: normal; - font-weight: 500; - } - - mat-icon.logo-icon { - height: 80px; - width: 64px; - img { - height: 64px; - } - } -} - -mat-card-content.authorize-content { - margin: 0px !important; - - div.profile-icon-wrapper { - padding: 0 !important; - } - - div.user-wrapper { - padding: 0 !important; - } - - div.deny-button-wrapper { - justify-content: center; - } - - mat-icon.profile-icon { - height: 80px; - width: 64px; - img { - height: 64px; - } - } - - mat-icon.scope { - width: 32px; - } - - .user-links { - width: 100%; - } -} +@import '../../../../assets/scss/orcid.spacing.scss'; + +.logo { + width: 130px; +} + +.user-links { + display: flex; + justify-content: space-between; +} + +.university-dropdown { + display: flex; + align-items: center; + cursor: pointer; +} + +:host { + ul { + padding: 0; + + li { + list-style-type: none; + flex-direction: column; + align-items: baseline; + + div { + display: flex; + align-items: center; + mat-icon { + margin-bottom: -4px; // Compensates mat icon bottom with space + margin-left: $spacing-small; + margin-right: $spacing-small; + } + } + } + } +} + +button { + width: 100%; + margin-bottom: $spacing-base; +} + +mat-divider { + margin-top: $spacing-12; + margin-bottom: $spacing-12; +} + +mat-icon > img { + height: 20px; + margin-top: 2px; // Fix icon component with SVG image +} + +.col { + overflow: hidden; +} + +app-info-drop-down { + max-width: 100%; + display: block; +} + +.progress-bar { + top: 0; +} + +mat-card-header.authorize-header { + mat-card-title { + margin: 0 0 32px 0 !important; + } + + h1 { + margin-top: 0; + } + + .orc-font-heading-small { + font-style: normal; + font-weight: 500; + } + + mat-icon.logo-icon { + height: 80px; + width: 64px; + img { + height: 64px; + } + } +} + +mat-card-content.authorize-content { + margin: 0px !important; + + div.profile-icon-wrapper { + padding: 0 !important; + } + + div.user-wrapper { + padding: 0 !important; + } + + div.deny-button-wrapper { + justify-content: center; + } + + mat-icon.profile-icon { + height: 80px; + width: 64px; + img { + height: 64px; + } + } + + mat-icon.scope { + width: 32px; + } + + .user-links { + width: 100%; + } +} diff --git a/src/app/authorize/pages/authorize/authorize.component.html b/src/app/authorize/pages/authorize/authorize.component.html index ab75457170..a4a6ce17f4 100644 --- a/src/app/authorize/pages/authorize/authorize.component.html +++ b/src/app/authorize/pages/authorize/authorize.component.html @@ -1,26 +1,30 @@ -
-
-
-
- - - - -
-
-
-
+
+
+
+
+ + + + +
+
+
+
diff --git a/src/app/sign-in/pages/sign-in/sign-in.component.html b/src/app/sign-in/pages/sign-in/sign-in.component.html index cdccbed2cb..f2fc029df4 100644 --- a/src/app/sign-in/pages/sign-in/sign-in.component.html +++ b/src/app/sign-in/pages/sign-in/sign-in.component.html @@ -1,154 +1,154 @@ -
- -
-
-
- - - - -
- -
- Sign in to ORCID -
-
- - - - - -

or

- -
- -
- - -
-
- -
-
-
-
+
+ +
+
+
+ + + + +
+ +
+ Sign in to ORCID +
+
+ + + + + +

or

+ +
+ +
+ + +
+
+ +
+
+
+
From f36d05dd2bbfc560ab2a16a2ebc38a38bf2fc506 Mon Sep 17 00:00:00 2001 From: Daniel Palafox Date: Tue, 12 Mar 2024 18:34:33 -0600 Subject: [PATCH 2/2] fix: Remove whitespace --- src/app/authorize/pages/authorize/authorize.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/authorize/pages/authorize/authorize.component.html b/src/app/authorize/pages/authorize/authorize.component.html index a4a6ce17f4..bb5ca7f75f 100644 --- a/src/app/authorize/pages/authorize/authorize.component.html +++ b/src/app/authorize/pages/authorize/authorize.component.html @@ -2,7 +2,7 @@