Skip to content

Commit

Permalink
Merge branch 'develop' into feature/SWED-2230-topbar_transparent
Browse files Browse the repository at this point in the history
  • Loading branch information
goldenraphti authored Nov 2, 2023
2 parents ee29c9a + e7de957 commit 8af0bd2
Show file tree
Hide file tree
Showing 190 changed files with 2,211 additions and 114 deletions.
9 changes: 2 additions & 7 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## [10.8.5] - 25.08.2023
## \[10.8.6\] - 13.09.2023

## Bug Fixes

Expand All @@ -10,13 +10,8 @@

### Non breaking UI changes

- add possibility to disable rotation of the dropdown toggle icon on active state
- add possibility to style bank-id button as secondary

## Testing

- E2E tests for dropdown component

## Design System website

- expand components preview containers to full screen
- Add the Playbook section in Identity
62 changes: 31 additions & 31 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@swedbankpay/design-guide",
"version": "10.8.5",
"version": "10.8.6",
"description": "Swedbank Pay Design Guide",
"main": "src/scripts/main/index.js",
"scripts": {
Expand Down Expand Up @@ -61,7 +61,7 @@
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/preset-env": "7.20.2",
"@babel/preset-react": "^7.18.6",
"@playwright/test": "^1.38.1",
"@playwright/test": "^1.39.0",
"@sentry/webpack-plugin": "^1.20.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^14.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ exports[`ComponentsDocumentation: index renders 1`] = `
className="dg-current-version text-uppercase"
>
Design Guide – v.
10.8.5
10.8.6
</span>
</div>
`;
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions src/App/Home/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,37 @@ import CodeTags from "@components/CodeTags";
const basename = process.env.basename;

export const changeLogs = [
{
version: "10.8.6",
title: "The one with little handy UI helpers",
text: (
<>
<p>We&apos;re back in action, armed with nifty UI helpers 🧰🚀🎁.</p>
<p>
Ever find yourself awake at night, sweating, pondering how life would
be better if there were a way to disable the icon rotation in the
dropdown toggle button when you open it? I know, right?
</p>
<p>
And what if I told you you could now style those bank-ID buttons as
secondary buttons? Isn&apos;t that something you&apos;ve been
daydreaming about for years?
</p>
<p>
But wait, there&apos;s more! How about a magical button that
transforms your component&apos;s preview container into a full-screen
extravaganza, delivering the ultimate home-cinema experience for your
components? It&apos;s like fulfilling a lifelong dream you didn&apos;t
even know you had since you were a little kid! 👶🎁
<br />
<span className="font-italic">
(for now only enabled for the Topbar component, but if YOU public
like it then we&apos;ll expand it to the rest 🎤)
</span>
</p>
</>
),
},
{
version: "10.8.5",
title: "The CSS url / Import Patch 🐛🔨",
Expand Down
101 changes: 54 additions & 47 deletions src/App/Home/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import Alert from "../components/Alert";

const basename = process.env.basename;
const brandTitle = process.env.brandTitle;
const isSwedbankPay = process.env.isSwedbankPay;

const Home = () => {
useEffect(() => {
Expand Down Expand Up @@ -39,61 +40,67 @@ const Home = () => {
</p>

<div className="row dg-cards-container mt-4">
{routes.map((route) => (
<React.Fragment key={route.title}>
<div
key={route.title}
className={
route.wideCard
? "w-100 order-5"
: "col-12 col-sm-6 col-lg-3 d-flex"
}
>
<Link
to={route.path}
className={`cards cards-primary${
route.wideCard ? " cards-wide m-3" : ""
}`}
{routes
.filter((route) =>
isSwedbankPay
? !route.title.toLowerCase().includes("patterns")
: !route.title.toLowerCase().includes("playbook")
)
.map((route) => (
<React.Fragment key={route.title}>
<div
key={route.title}
className={
route.wideCard
? "w-100 order-5"
: "col-12 col-sm-6 col-lg-3 d-flex"
}
>
{route.wideCard ? (
<div className="cards-content flex-row align-items-center m-0 w-100">
<i
className="material-icons material-icons-outlined mr-3 v-flip"
aria-hidden="true"
>
{route.icon.name}
</i>
<span className="h4 mb-0">{route.entryCardText}</span>
<i
className="material-icons material-icons-outlined ml-auto"
aria-hidden="true"
>
arrow_forward
</i>
</div>
) : (
<div>
<div className="cards-icon">
<Link
to={route.path}
className={`cards cards-primary${
route.wideCard ? " cards-wide m-3" : ""
}`}
>
{route.wideCard ? (
<div className="cards-content flex-row align-items-center m-0 w-100">
<i
className="material-icons-outlined"
className="material-icons material-icons-outlined mr-3 v-flip"
aria-hidden="true"
>
{route.icon.name}
</i>
<span className="h4 mb-0">{route.entryCardText}</span>
<i
className="material-icons material-icons-outlined ml-auto"
aria-hidden="true"
>
arrow_forward
</i>
</div>
<div className="cards-content">
<span className="h4">{route.title}</span>
<span>{route.entryCardText}</span>
) : (
<div>
<div className="cards-icon">
<i
className="material-icons-outlined"
aria-hidden="true"
>
{route.icon.name}
</i>
</div>
<div className="cards-content">
<span className="h4">{route.title}</span>
<span>{route.entryCardText}</span>
</div>
<i className="material-icons" aria-hidden="true">
arrow_forward
</i>
</div>
<i className="material-icons" aria-hidden="true">
arrow_forward
</i>
</div>
)}
</Link>
</div>
</React.Fragment>
))}
)}
</Link>
</div>
</React.Fragment>
))}
<div className="col-12 col-sm-6 col-lg-3 d-flex">
<Link to={"/utilities"} className="cards cards-primary">
<div className="cards-icon">
Expand Down
2 changes: 1 addition & 1 deletion src/App/Identity/__snapshots__/index.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ exports[`Core: index renders 1`] = `
className="dg-current-version text-uppercase"
>
Design Guide – v.
10.8.5
10.8.6
</span>
</div>
`;
Loading

0 comments on commit 8af0bd2

Please sign in to comment.