Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #298

Merged
merged 79 commits into from
Nov 17, 2023
Merged

Develop #298

merged 79 commits into from
Nov 17, 2023

Conversation

tomjackking
Copy link
Collaborator

No description provided.

samithaf and others added 30 commits November 6, 2023 19:57
@samithaf
Update src/content/articles/code-with-gel
517bd08
@samithaf
Update src/content/articles/code-with-gel
2a22f97
@samithaf
Update src/content/design-system/components/accordion
2b14ca1
@samithaf
Update src/content/design-system/components/accordion
6c6dbb4
@samithaf
Update src/content/design-system/components/alert
be92240
@samithaf
Update src/content/design-system/components/alert
cbc601a
@samithaf
Merge remote-tracking branch 'origin/develop'
3137b58 
# Conflicts:
#	apps/site/src/content/articles/code-with-gel/content.mdoc
@kenjishiromajp
feat(design-system): importing content
9ef0f7b
@kenjishiromajp
fix(layout): layout with grid and gap
33e5558
@kenjishiromajp
feat(design-system): sections without titles, titles with special cha…
9fa3d67 
…racters
@kenjishiromajp
markdown fix
21decce
@kenjishiromajp
fix
cd6b47d
@kenjishiromajp
fix
a8bbe17
@kenjishiromajp
removing the .mdoc on the check
940c5a5
@kenjishiromajp
closes #272 changing color
9c8a166
@samithaf
Merge pull request #274 from WestpacGEL/feature/components-accessibil…
ad58a77 
…ity-tab-content

Feature: adjusting design of design-system content
@kenjishiromajp
fixes #270 menu styles
0a5e9ce
@kenjishiromajp
fixes #270 site drop down
25d0e1a
@kenjishiromajp
merge
b45b226
@kenjishiromajp
closes #269 focus ring bug
4abf0d5
@kenjishiromajp
merge
85fc6a2
@kenjishiromajp
merge
d8a35d9
@kenjishiromajp
closes #264 fixing line height
179982e
@samithaf
Merge remote-tracking branch 'origin/develop'
c667d87 
# Conflicts:
#	apps/site/src/content/articles/code-with-gel/content.mdoc
@kenjishiromajp
Merge pull request #278 from WestpacGEL/264-gel-home-page-hero-line-h…
00720ed 
…eight

closes #264 gel home page hero line height
@kenjishiromajp
Merge pull request #277 from WestpacGEL/269-gel-site-action-bar-4
8d89559 
269 gel site action bar 4
@kenjishiromajp
Merge pull request #275 from WestpacGEL/272-gel-site-action-bar-hover…
f59f73c 
…-state

272 gel site action bar hover state
@kenjishiromajp
merge
0ccc4b3
@samithaf
Merge pull request #276 from WestpacGEL/270-gel-site-dropdown
18d3bc2 
270 gel site dropdown
@kenjishiromajp
closes #263 home page leading size
896b3de
samithaf and others added 27 commits November 15, 2023 12:07
@samithaf
Merge pull request #285 from WestpacGEL/280-article-page-article-lead…
0641c10 
…ing-text-on-top-as-a-component

280 article page article leading text on top as a component
@kenjishiromajp
fixes #280 line-height container size
7395bc0
@kenjishiromajp
fixes list margin
0537f14
@kenjishiromajp
feat(compacta): compacta error state
0349da6
@kenjishiromajp
fix #287 adding fadeIn animation
8209ed5
@samithaf
Merge pull request #290 from WestpacGEL/feature/compact-error-state-e…
bf4ec5f 
…xample

feat(compacta): compacta error state
@samithaf
Merge pull request #289 from WestpacGEL/280-article-page-article-lead…
a07b453 
…ing-text-on-top-as-a-component

fixes #280 line-height container size
@samithaf
Update src/content/articles/accessible-by-design
35d61bc
@samithaf
Revert "Update src/content/articles/accessible-by-design"
a90f102 
This reverts commit 35d61bc.
@samithaf
Merge pull request #291 from WestpacGEL/287-tabs-transition
afba4c7 
fix #287 adding fadeIn animation
@kenjishiromajp
fix article
f1fdee9
@samithaf
Update src/content/articles/accessible-by-design
a533b5d
@kenjishiromajp
Merge branch 'develop' into fix/article-content
5bbf184
@kenjishiromajp
fix
acfccb9
@kenjishiromajp
fix yaml file
06aa77d
@samithaf
Merge pull request #292 from WestpacGEL/fix/article-content
6af36a2 
fix article
@kenjishiromajp
fixes #151 autocomplete no option option
22fb720
@kenjishiromajp
closes #273 action bar with animation
80c03b9
@samithaf
Merge pull request #294 from WestpacGEL/273-gel-site-action-bar-corre…
bf5547c 
…ct-logo-hover-state

closes #273 action bar with animation
@samithaf
Merge pull request #293 from WestpacGEL/151-autocomplete-no-options-d…
ca1180d 
…isplay-and-icon-rendering

fixes #151 autocomplete no option option
@kenjishiromajp
fixes the popover position
a08c7a6
@kenjishiromajp
closes #271 dropdown animation
33abce3
@kenjishiromajp
fixes breakpoint
5ae7450
@samithaf
Merge pull request #295 from WestpacGEL/271-gel-site-dropdown-interac…
3f8f070 
…tions

fixes #271 gel site dropdown interactions
@kenjishiromajp
caption for image on markdown or article body image
6e1f4c9
@kenjishiromajp
Merge branch 'develop' into feature/article-figcaption
290ac46
@samithaf
Merge pull request #296 from WestpacGEL/feature/article-figcaption
70449b3 
Feature/article figcaption
@changeset-bot changeset-bot
Copy link

changeset-bot bot commented Nov 17, 2023

⚠️ No Changeset found

Latest commit: 70449b3

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@vercel Vercel
Copy link

vercel bot commented Nov 17, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated (UTC)
gel-next-site ✅ Ready (Inspect) Visit Preview Nov 17, 2023 6:09am
gel-next-storybook ✅ Ready (Inspect) Visit Preview Nov 17, 2023 6:09am

@tomjackking tomjackking merged commit 6a8d4f2 into fixes/flexicell-style Nov 17, 2023
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tomjackking @samithaf @kenjishiromajp