Skip to content
This repository has been archived by the owner on Mar 18, 2022. It is now read-only.

ADAPT-000: Add Identity Bar, Logo, Global Footer, SR only Text, Button #4

Merged
merged 79 commits into from
Feb 17, 2021
Merged

ADAPT-000: Add Identity Bar, Logo, Global Footer, SR only Text, Button #4

merged 79 commits into from
Feb 17, 2021

Conversation

yvonnetangsu
Copy link
Member

@yvonnetangsu yvonnetangsu commented Feb 10, 2021 •
edited
Loading

READY

Summary

  • Add Logo, Identity Bar, Global Footer, Button, SrOnlyText components

Needed By (Date)

  • When does this need to be merged by?

Urgency

  • How critical is this PR?

Steps to Test

  1. Pull down to local, nvm use, npm run dev
  2. Look at Storybook local site and check that the new components are there
  3. Look at code

Affected Projects or Products

  • Does this PR impact any particular projects, products, or modules?

Associated Issues and/or People

  • JIRA ticket
  • Other PRs
  • Any other contextual information that might be helpful (e.g., description of a bug that this PR fixes, new functionality that it adds, etc.)
  • Anyone who should be notified? (@mention them here)

See Also

sherakama and others added 28 commits February 5, 2021 01:00
@sherakama
Playing around with an idea.
7335bbc
@sherakama
Playing around some more.
20692d8
@sherakama
added twin.
79fe464
@sherakama
Wip.
80c55b5
@sherakama
Wip.
5facb78
@sherakama
Demo code.
ca7cd0b
@yvonnetangsu
WIP IdentityBar.js; install Classnames and uninstall TW classnames
31e6fac
@yvonnetangsu
fixup
c4f9aee
@yvonnetangsu
remove active link class
5483a11
@yvonnetangsu
fix path and run build
117c020
@sherakama
wip!
bb8a732
@yvonnetangsu
Merge branch 'variants' into variants-yt
c175ffb 
* variants:
  wip!

# Conflicts:
#	src/Alert/AlertLarge.js
@sherakama
moar.better.
a7cbb3a
@sherakama
switch.
00d4389
@sherakama
Moar updates.
e645ac2
@yvonnetangsu
Merge branch 'variants' into variants-yt
20f6b4b 
* variants:
  Moar updates.
  switch.
  moar.better.
@yvonnetangsu
Add identity bar levers and stories files; use case convention and fo…
d481a2a 
…r the switching and use props destructuring
@yvonnetangsu
fixup
76ed592
@sherakama
fixup! progress.
c285ae0
@sherakama
Remove css file.
77cebec
@yvonnetangsu
Merge branch 'variants' into variants-yt
1b4e15d 
* variants:
  Remove css file.
  fixup! progress.

# Conflicts:
#	dist/index.css
#	dist/index.js
#	dist/index.modern.js
#	src/Alert/Alert.stories.js
@yvonnetangsu
Add SrOnlyLabel component; WIP Global footer
5b2081c
@sherakama
fixup! wip.
79a8848
@yvonnetangsu
Merge branch 'variants' into variants-yt
2ec89b3 
* variants:
  fixup! wip.

# Conflicts:
#	src/Alert/Alert.levers.js
@sherakama
fixup! wip.
a45bcab
@sherakama
fixup! wip.
604d5d5
@yvonnetangsu
Merge branch "variants" into "variants-yt"
2801ac9
@yvonnetangsu
Finish global footer styles
4a7eef4
sherakama
sherakama reviewed Feb 12, 2021
View reviewed changes
package.json Outdated Show resolved Hide resolved
@yvonnetangsu yvonnetangsu changed the title Add components following the lever/variants convention Add Identity Bar, Logo, Global Footer and Button Feb 17, 2021
@yvonnetangsu yvonnetangsu changed the title Add Identity Bar, Logo, Global Footer and Button Add Identity Bar, Logo, Global Footer, SR only Text, Button Feb 17, 2021
@sherakama
Copy link
Member

@sherakama I think this is ready for you to take a look - all the test passed and it build locally. I looked at the build error on Netlify but I'm not sure how to fix it and get it to build 🤔

jestjs/jest#6880

Seems to be a bug. Let me see if we can work around this.

sherakama
sherakama reviewed Feb 17, 2021
View reviewed changes
src/Button/Button.js Outdated Show resolved Hide resolved
sherakama
sherakama reviewed Feb 17, 2021
View reviewed changes
src/Button/Button.stories.js
}
},
onClick: {
action: 'clicked'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice

sherakama
sherakama reviewed Feb 17, 2021
View reviewed changes
src/Logo/Logo.stories.js Outdated Show resolved Hide resolved
yvonnetangsu and others added 3 commits February 17, 2021 11:40
@yvonnetangsu @sherakama
Update src/Logo/Logo.stories.js
ecd626d 
Co-authored-by: Sherakama <[email protected]>
@yvonnetangsu
Merge branch 'variants-yt' of github.com:SU-SWS/decanter-react into v…
9c8cf4d 
…ariants-yt

* 'variants-yt' of github.com:SU-SWS/decanter-react:
  Update src/Logo/Logo.stories.js
  Update src/IdentityBar/IdentityBar.stories.js
  Update src/GlobalFooter/GlobalFooter.js
@yvonnetangsu
Merge branch 'moar-suggestions' into variants-yt
1faab2c 
* moar-suggestions:
  setup testing.
  fixup! tests.
  Use dedupe
  fixup! stuff.

# Conflicts:
#	src/Button/Button.js
@yvonnetangsu
Copy link
Member Author

@sherakama Is this ready to merge you think?

sherakama
sherakama approved these changes Feb 17, 2021
View reviewed changes
Copy link
Member

@sherakama sherakama left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GTG. Nice work. Thanks for all the feedback/revisions.

@sherakama sherakama changed the title Add Identity Bar, Logo, Global Footer, SR only Text, Button ADAPT-000: Add Identity Bar, Logo, Global Footer, SR only Text, Button Feb 17, 2021
@yvonnetangsu
Copy link
Member Author

GTG. Nice work. Thanks for all the feedback/revisions.

Yay! Thank YOU for the very helpful feedback/suggestions.

@sherakama sherakama merged commit c3e3c7d into main Feb 17, 2021
@sherakama sherakama deleted the variants-yt branch February 17, 2021 20:13
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@sherakama sherakama sherakama approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@yvonnetangsu @sherakama