Skip to content

Commit

Permalink
Merge branch 'main' into docs/guidelines-checkbox
Browse files Browse the repository at this point in the history
  • Loading branch information
mrosvik authored Oct 5, 2023
2 parents b5fafae + b4af852 commit a7689cd
Show file tree
Hide file tree
Showing 214 changed files with 9,470 additions and 5,762 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ dist/
coverage/
storybook-static/
packages/tokens/brand/**/*
tsc-build/
2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ module.exports = {
'react/display-name': 'off',
'import/no-unresolved': 'error',
'import/namespace': ['error', { allowComputed: true }],
'import/no-named-as-default': 'off',
'@next/next/no-html-link-for-pages': ['error', '/storefront/pages/'],
'import/order': [
'warn',
{
Expand Down
38 changes: 38 additions & 0 deletions .github/workflows/check-storefront.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Runs conventional commit check on PR
name: Checks storefront
on:
workflow_dispatch:
pull_request:
branches:
- main
paths:
- 'storefront/**'
push:
branches:
- main
paths:
- 'storefront/**'
jobs:
checks:
name: Builds, lints and tests code
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Use node 20 and yarn cache
uses: actions/setup-node@v3
with:
node-version: '20'
cache: 'yarn'
- name: Install dependencies
run: yarn install --immutable
- name: Build packages
run: yarn build
- name: Build storefront
run: yarn build:storefront
- name: Lint Code
run: yarn lint ./storefront
- name: Lint CSS
run: yarn lint-style ./storefront/**/*.css
- name: Test
run: yarn test
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
# Runs conventional commit check on PR
name: Checks
name: Checks packages
on:
workflow_dispatch:
pull_request:
branches:
- main
paths:
- 'packages/**'
push:
branches:
- main
paths:
- 'packages/**'
jobs:
checks:
name: Checks, builds and tests code
name: Builds, lints and tests code
runs-on: ubuntu-latest
steps:
- name: Checkout repository
Expand Down
41 changes: 41 additions & 0 deletions .github/workflows/storybook-deploy-vercel.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Deploy Storybook Production
env:
VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID_STORYBOOK }}
on:
workflow_dispatch:
push:
branches:
- main
jobs:
deploy:
name: Build & deploy to Vercel
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- name: Use node 20 and yarn cache
uses: actions/setup-node@v3
with:
node-version: '20'
cache: 'yarn'

- name: Install dependencies
run: yarn install --frozen-lockfile

- name: Build
run: yarn build

- name: Install Vercel CLI
run: yarn add vercel@latest

- name: Pull Vercel Environment Information
run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}

- name: Build Project Artifacts
run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }}

- id: deploy
name: Deploy Project Artifacts to Vercel
run: echo "url=$(vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }})" >> $GITHUB_OUTPUT
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Built files
dist
ignore
tsc-build

# Yarn stuff; we're not using PnP/Zero installs
.pnp.*
Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @mimarz @Thuneer @TomasEng @framitdavid @Magnusrm
* @mimarz @Thuneer @Barsnes @Magnusrm
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@

---

## Quick links

- [Storefront](https://designsystemet.no)
- [Storybook](https://digdir.github.io/designsystem/)

## About the design system 📖

The Common Designsystem is a collection of important design elements and building blocks that can be used when creating different services. It's like a toolbox that everyone can use to work together and create the best foundation for public services across the country. By using this Designsystem, we aim to create consistent and user-friendly experiences in digital solutions for public services, making them more efficient and reliable.
Expand Down
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.
Binary file removed assets/img/component-placeholders/accordion.png
Binary file not shown.
Binary file removed assets/img/component-placeholders/alert.png
Binary file not shown.
Binary file removed assets/img/component-placeholders/button.png
Binary file not shown.
Binary file removed assets/img/component-placeholders/checkbox-group.png
Binary file not shown.
Binary file removed assets/img/component-placeholders/checkbox.png
Binary file not shown.
Binary file removed assets/img/component-placeholders/fieldset.png
Binary file not shown.
Binary file removed assets/img/component-placeholders/help-text.png
Binary file not shown.
Binary file removed assets/img/component-placeholders/list.png
Binary file not shown.
Binary file removed assets/img/component-placeholders/popover.png
Binary file not shown.
Binary file not shown.
Binary file removed assets/img/component-placeholders/radio-button.png
Binary file not shown.
Binary file removed assets/img/component-placeholders/select.png
Binary file not shown.
Binary file removed assets/img/component-placeholders/spinner.png
Binary file not shown.
Binary file removed assets/img/component-placeholders/table.png
Binary file not shown.
Binary file removed assets/img/component-placeholders/tabs.png
Binary file not shown.
Binary file removed assets/img/component-placeholders/text-field.png
Binary file not shown.
Binary file removed assets/img/component-placeholders/textarea.png
Binary file not shown.
Binary file removed assets/img/component-placeholders/toggle-button.png
Binary file not shown.
927 changes: 498 additions & 429 deletions design-tokens/$themes.json

Large diffs are not rendered by default.

164 changes: 14 additions & 150 deletions design-tokens/Base/Semantic.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,76 +78,6 @@
"checked": {
"value": "{colors.blue.700}",
"type": "color"
},
"primary": {
"subtle": {
"value": "{colors.blue.100}",
"type": "color"
},
"subtle-hover": {
"value": "{colors.blue.200}",
"type": "color"
},
"default": {
"value": "{colors.blue.700}",
"type": "color"
},
"hover": {
"value": "{colors.blue.800}",
"type": "color"
},
"active": {
"value": "{colors.blue.900}",
"type": "color",
"description": "Standard farge for handlinger"
},
"no_fill": {
"value": "{colors.white}",
"type": "color"
},
"no_fill-hover": {
"value": "{colors.blue.100}",
"type": "color"
},
"no_fill-active": {
"value": "{colors.blue.200}",
"type": "color"
}
},
"secondary": {
"subtle": {
"value": "{colors.grey.100}",
"type": "color"
},
"subtle-hover": {
"value": "{colors.grey.200}",
"type": "color"
},
"default": {
"value": "{colors.blue.900}",
"type": "color"
},
"hover": {
"value": "rgba({colors.blue.900}, 0.9)",
"type": "color"
},
"active": {
"value": "rgba({colors.blue.900}, 0.8)",
"type": "color",
"description": "Standard farge for handlinger"
},
"no_fill": {
"value": "{colors.white}",
"type": "color"
},
"no_fill-hover": {
"value": "rgba({colors.blue.900}, 0.1)",
"type": "color"
},
"no_fill-active": {
"value": "rgba({colors.blue.900}, 0.2)",
"type": "color"
}
}
},
"success": {
Expand Down Expand Up @@ -304,50 +234,6 @@
"dark-hover": {
"value": "{colors.blue.700}",
"type": "color"
},
"primary": {
"subtle": {
"value": "{colors.blue.200}",
"type": "color"
},
"subtle-hover": {
"value": "{colors.blue.400}",
"type": "color"
},
"default": {
"value": "{colors.blue.700}",
"type": "color"
},
"hover": {
"value": "{colors.blue.800}",
"type": "color"
},
"active": {
"value": "{colors.blue.900}",
"type": "color"
}
},
"secondary": {
"subtle": {
"value": "{colors.grey.200}",
"type": "color"
},
"subtle-hover": {
"value": "{colors.grey.300}",
"type": "color"
},
"default": {
"value": "{colors.blue.900}",
"type": "color"
},
"hover": {
"value": "{colors.blue.900}",
"type": "color"
},
"active": {
"value": "{colors.blue.900}",
"type": "color"
}
}
},
"neutral": {
Expand Down Expand Up @@ -490,42 +376,6 @@
"on_action": {
"value": "{colors.white}",
"type": "color"
},
"primary": {
"default": {
"value": "{colors.blue.700}",
"type": "color"
},
"hover": {
"value": "#004e95",
"type": "color"
},
"active": {
"value": "#00315d",
"type": "color"
},
"on_action": {
"value": "{colors.white}",
"type": "color"
}
},
"secondary": {
"default": {
"value": "{colors.blue.900}",
"type": "color"
},
"hover": {
"value": "{colors.blue.900}",
"type": "color"
},
"active": {
"value": "{colors.blue.900}",
"type": "color"
},
"on_action": {
"value": "{colors.white}",
"type": "color"
}
}
},
"warning": {
Expand Down Expand Up @@ -856,6 +706,20 @@
}
},
"error_message": {
"large": {
"value": {
"fontFamily": "{fontFamilies.inter}",
"fontWeight": "{fontWeights.regular}",
"lineHeight": "{lineHeights.300}",
"fontSize": "{font-size.f1}",
"letterSpacing": "{letterSpacing.1}",
"paragraphSpacing": "{paragraphSpacing.0}",
"paragraphIndent": "{paragraphIndent.0}",
"textCase": "{textCase.none}",
"textDecoration": "{textDecoration.none}"
},
"type": "typography"
},
"medium": {
"value": {
"fontFamily": "{fontFamilies.inter}",
Expand Down
Loading

0 comments on commit a7689cd

Please sign in to comment.