Skip to content

Commit 9c25f80

Browse files
jacobloganJacob Loganreesscot
authored
Merge flattened css into main branch (#1772)
* flatten angular css (#1739) * flatten angular css * add existence checks * remove commented code Co-authored-by: Jacob Logan <[email protected]> * flatten css to 010 specificity (#1742) * flatten css to 010 specificity * update styling based on PR feedback * add comments in code and additional instruction to the ui contributing page * move styling to more consistant block * Update packages/ui/CONTRIBUTING.md Co-authored-by: Scott Rees <[email protected]> * Update packages/ui/CONTRIBUTING.md Co-authored-by: Scott Rees <[email protected]> * Update packages/ui/CONTRIBUTING.md Co-authored-by: Scott Rees <[email protected]> * Update packages/ui/src/theme/css/component/loader.scss Co-authored-by: Scott Rees <[email protected]> Co-authored-by: Jacob Logan <[email protected]> Co-authored-by: Scott Rees <[email protected]> * update react code to use the flattened css selectors (#1741) * update react code to use the flattened css selectors * add ComponentClasses type and separate logic in classNameModifier * updates based on PR feedback Co-authored-by: Jacob Logan <[email protected]> * use flattened css in vue (#1740) * use flattened css in vue * Update federated-sign-in.vue * fix type, update button disabled attr, update header classes * move augmented class attribute to overwrite the passed in class Co-authored-by: Jacob Logan <[email protected]> * updating tests * update vue disabled type * update togglebutton styling * Create new-years-itch.md * Update packages/angular/projects/ui-angular/src/lib/primitives/button/button.component.ts * Update packages/angular/projects/ui-angular/src/lib/primitives/button/button.component.ts * Update packages/react/src/primitives/shared/utils.ts * correct checkbox checked and disabled classes * remove linear height variable from loader styling * pass through isDisabled on view and update button disabled styles * add amplify-heading--{level} classes to react authenticator * update divider label * adding tests to check that correct classes are added * update togglebutton styling to use flattened css for all states * remove extra code * add unit tests for primitive classes Co-authored-by: Jacob Logan <[email protected]> Co-authored-by: Scott Rees <[email protected]>
1 parent 2f91ec7 commit 9c25f80

File tree

115 files changed

+2335
-762
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+2335
-762
lines changed

.changeset/new-years-itch.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
"@aws-amplify/ui-react": patch
3+
"@aws-amplify/ui-angular": patch
4+
"@aws-amplify/ui": patch
5+
"@aws-amplify/ui-vue": patch
6+
---
7+
8+
Refactor of styling to flatten css selectors across angular, react, and vue

packages/angular/projects/ui-angular/src/lib/components/authenticator/components/confirm-reset-password/amplify-confirm-reset-password.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[disabled]="authenticator.isPending"
77
>
88
<amplify-slot name="confirm-reset-password-header" [context]="context">
9-
<h3 class="amplify-heading">{{ headerText }}</h3>
9+
<h3 class="amplify-heading amplify-heading--3">{{ headerText }}</h3>
1010
</amplify-slot>
1111

1212
<amplify-base-form-fields

packages/angular/projects/ui-angular/src/lib/components/authenticator/components/confirm-sign-in/confirm-sign-in.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[disabled]="authenticator.isPending"
77
>
88
<amplify-slot name="confirm-sign-in-header" [context]="context">
9-
<h3 class="amplify-heading">{{ headerText }}</h3>
9+
<h3 class="amplify-heading amplify-heading--3">{{ headerText }}</h3>
1010
</amplify-slot>
1111
<amplify-base-form-fields route="confirmSignIn"></amplify-base-form-fields>
1212

packages/angular/projects/ui-angular/src/lib/components/authenticator/components/confirm-sign-up/confirm-sign-up.component.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
[disabled]="context.isPending"
88
>
99
<amplify-slot name="confirm-sign-up-header" [context]="context">
10-
<h3 class="amplify-heading" style="font-size: 1.5rem">
10+
<h3
11+
class="amplify-heading amplify-heading--3"
12+
style="font-size: 1.5rem"
13+
>
1114
{{ confirmSignUpHeading }}
1215
</h3>
1316
</amplify-slot>

packages/angular/projects/ui-angular/src/lib/components/authenticator/components/confirm-verify-user/amplify-confirm-verify-user.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[disabled]="authenticator.isPending"
77
>
88
<amplify-slot name="confirm-verify-user-header" [context]="context">
9-
<h3 class="amplify-heading">{{ this.headerText }}</h3>
9+
<h3 class="amplify-heading amplify-heading--3">{{ this.headerText }}</h3>
1010
</amplify-slot>
1111
<amplify-base-form-fields
1212
route="confirmVerifyUser"

packages/angular/projects/ui-angular/src/lib/components/authenticator/components/federated-sign-in/federated-sign-in.component.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,8 @@
102102
</p>
103103
</amplify-federated-sign-in-button>
104104

105-
106105
<hr
107-
class="amplify-divider amplify-divider--label"
106+
class="amplify-divider amplify-divider--label amplify-divider--small"
108107
aria-orientation="horizontal"
109108
data-size="small"
110109
data-label="or"

packages/angular/projects/ui-angular/src/lib/components/authenticator/components/force-new-password/force-new-password.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[disabled]="authenticator.isPending"
77
>
88
<amplify-slot name="force-new-password-header" [context]="context">
9-
<h3 class="amplify-heading">{{ this.headerText }}</h3>
9+
<h3 class="amplify-heading amplify-heading--3">{{ this.headerText }}</h3>
1010
</amplify-slot>
1111

1212
<amplify-slot name="force-new-form-fields" [context]="context">

packages/angular/projects/ui-angular/src/lib/components/authenticator/components/form-field/form-field.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
></amplify-text-field>
3737
<div data-amplify-sign-up-errors *ngIf="errors?.length > 0">
3838
<div
39-
class="amplify-text"
39+
class="amplify-text amplify-text--error"
4040
data-variation="error"
4141
*ngFor="let error of errors"
4242
>

packages/angular/projects/ui-angular/src/lib/components/authenticator/components/reset-password/reset-password.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
name="reset-password-header"
1111
[context]="context"
1212
>
13-
<h3 class="amplify-heading">{{ this.headerText }}</h3>
13+
<h3 class="amplify-heading amplify-heading--3">{{ this.headerText }}</h3>
1414
</amplify-slot>
1515

1616
<amplify-base-form-fields route="resetPassword"></amplify-base-form-fields>

packages/angular/projects/ui-angular/src/lib/components/authenticator/components/setup-totp/setup-totp.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[disabled]="authenticator.isPending"
77
>
88
<amplify-slot name="setup-totp-header" [context]="context">
9-
<h3 class="amplify-heading">{{ this.headerText }}</h3>
9+
<h3 class="amplify-heading amplify-heading--3">{{ this.headerText }}</h3>
1010
</amplify-slot>
1111
<p *ngIf="!qrCodeSource">Loading...</p>
1212
<img

0 commit comments

Comments
 (0)