Skip to content

Commit

Permalink
Merge branch 'CheckoutBlock_Subscriptions_Feature' into ASUB-8301_Ord…
Browse files Browse the repository at this point in the history
…erInformation
  • Loading branch information
LauraPinilla committed Mar 29, 2024
2 parents 4ed45d0 + 6cee0cd commit 3ccb86a
Show file tree
Hide file tree
Showing 68 changed files with 2,118 additions and 1,001 deletions.
5 changes: 1 addition & 4 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

# npx lint-staged
npm run lint:changed-feature-branch
6 changes: 1 addition & 5 deletions .husky/pre-push
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

# fetching latest changes `git fetch -a --depth 100` to ensure the base branch is up to date
# git fetch -a --depth 100 && npm run lint:changed-feature-branch && npm run test:changed-feature-branch
git fetch -a --depth 100 && npm run lint:changed-feature-branch && npm run test:changed-feature-branch
4 changes: 4 additions & 0 deletions .storybook/themes/news.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2618,6 +2618,10 @@
),
),
),
"section-title-links": (
"display": flex,
"flex-wrap": wrap
),
"share-bar": (
"background": var(--background-color),
"box-shadow": var(--global-box-shadow-1),
Expand Down
14 changes: 7 additions & 7 deletions blocks/alert-bar-content-source-block/package-lock.json

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

183 changes: 101 additions & 82 deletions blocks/algolia-assortment-content-source-block/package-lock.json

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

22 changes: 11 additions & 11 deletions blocks/article-body-block/package-lock.json

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

14 changes: 7 additions & 7 deletions blocks/author-content-source-block/package-lock.json

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

Loading

0 comments on commit 3ccb86a

Please sign in to comment.