Merge pull request #62 from ConductionNL/development

Development to main, week 45

README.md

@@ -6,6 +6,10 @@ Conduction's design tokens theme
 
 - **Version 1**
 
+  - 1.0.55: Added CommongGround theme.
+  - 1.0.54:
+    - Added ToolTip tokens to all themes.
+    - Added OpenCatalogi Rating tokens to all themes.
   - 1.0.53: Added Conduction Logo tokens.
   - 1.0.52:
     - Updated table tokens for Noordwijk theme.

conduction-design-tokens/src/component/conduction/card-wrapper.tokens.json

@@ -9,6 +9,7 @@
       "border-bottom-style": {},
       "border-bottom-width": {},
       "border-radius": { "value": "{conduction.size.md}" },
+      "box-shadow": {},
       "color": { "value": "{conduction.color.black.0}" },
       "hover": {
         "background-color": {},

conduction-design-tokens/src/component/conduction/logo.tokens.json

@@ -8,12 +8,11 @@
           "value": "url('https://conduction.nl/wp-content/uploads/2021/07/cropped-conductionlogo-1.png')"
         }
       },
-
       "footer": {
         "inline-size": { "value": "220px" },
         "block-size": { "value": "40px" },
         "background-image": {
-          "value": "url('https://conduction.nl/wp-content/uploads/2021/07/cropped-conductionlogo-1.png')"
+          "value": "url('https://raw.githubusercontent.com/OpenCatalogi/web-app/df1e0533081d780c05b1d0b57ab327d97adcbdc6/pwa/src/assets/svgs/LogoConduction.svg')"
         }
       }
     }

conduction-design-tokens/src/component/conduction/navigation.tokens.json

@@ -30,7 +30,8 @@
           }
         },
         "item": {
-          "padding": { "value": "18px" }
+          "padding": { "value": "18px" },
+          "border-radius": {}
         },
         "padding-inline-end": { "value": "16px" },
         "padding-inline-start": { "value": "16px" },

conduction-design-tokens/src/component/conduction/tooltip.tokens.json

@@ -0,0 +1,18 @@
+{
+  "conduction": {
+    "tooltip": {
+      "background-color": { "value": "{conduction.color.black.0}" },
+      "color": { "value": "{conduction.color.white.100}" },
+      "padding-block-start": { "value": "{conduction.size.xs}" },
+      "padding-block-end": { "value": "{conduction.size.xs}" },
+      "padding-inline-start": { "value": "{conduction.size.sm}" },
+      "padding-inline-end": { "value": "{conduction.size.sm}" },
+      "border-width": { "value": "0px" },
+      "border-style": { "value": "unset" },
+      "border-color": { "value": "unset" },
+      "border-radius": { "value": "0px" },
+      "opacity": { "value": "1" },
+      "z-index": { "value": "9999" }
+    }
+  }
+}

conduction-design-tokens/src/component/open-catalogi/rating.tokens.json

@@ -0,0 +1,12 @@
+{
+  "open-catalogi": {
+    "rating": {
+      "rating-bar": {
+        "color": { "value": "{conduction.color.primary}" },
+        "background-color": {}
+      },
+      "font-size": { "value": "{utrecht.document.font-size}" },
+      "font-family": { "value": "{utrecht.document.font-family}" }
+    }
+  }
+}

municipalities/commonground-design-tokens/LICENSE.md

@@ -0,0 +1,17 @@
+# Auteursrecht CommonGround
+
+Copyright (c) 2023 CommonGround
+
+## Logo en huisstijl
+
+Op het huisstijl en logo zijn auteursrechten van toepassing. Het gebruik van logo en huisstijl is alleen toegestaan voor gebruik door CommonGround.
+
+Wanneer je een bewerking van de software wilt gebruiken voor andere doeleinden, mag je niet het logo van CommonGround gebruiken en je ontwerpt een eigen huisstijl.
+
+## Lettertype
+
+Lettertypes die worden gebruikt voor de huisstijl zijn niet allemaal gratis en open source. Let op dat bij gebruik van die bijgeleverde lettertypes je een (betaalde) licentie regelt. Pas anders de configuratie aan om minder of andere lettertypes te gebruiken.
+
+## Toestemming
+
+Wanneer je het logo of de huisstijl wilt gebruiken kun je voor toestemming contact opnemen met CommonGround.

municipalities/commonground-design-tokens/README.md

@@ -0,0 +1,3 @@
+# NL Design System design tokens CommonGround
+
+These tokens have been obtained by analysing the [website of CommonGround](https://commonground.nl/).

municipalities/commonground-design-tokens/documentation/color.stories.mdx

@@ -0,0 +1,17 @@
+import { Meta, ColorPalette, ColorItem } from "@storybook/addon-docs";
+import tokens from "../dist/tokens.json";
+import { ColorSearch } from "@nl-design-system-unstable/theme-toolkit/src/ColorSearch";
+import { ColorTable } from "@nl-design-system-unstable/theme-toolkit/src/ColorTable";
+import config from "../src/config.json";
+
+<Meta title={`${config.name}/Color`} />
+
+# Color
+
+## Find a color
+
+<ColorSearch tokens={tokens[config.prefix]["color"]}></ColorSearch>
+
+## Color palette
+
+<ColorTable tokens={tokens[config.prefix]["color"]}></ColorTable>

municipalities/commonground-design-tokens/documentation/components.stories.mdx

@@ -0,0 +1,11 @@
+import { Meta, Story } from "@storybook/addon-docs";
+import { ComponentStories } from "@nl-design-system-unstable/theme-toolkit/src/ComponentStories";
+import config from "../src/config.json";
+
+<Meta title={`${config.name}`} />
+
+# Components
+
+<Story name="Components">
+  <ComponentStories config={config} />
+</Story>

municipalities/commonground-design-tokens/documentation/design-tokens.stories.mdx

@@ -0,0 +1,14 @@
+import { Meta, ColorPalette, ColorItem } from "@storybook/addon-docs";
+import { DesignTokensTable } from "@nl-design-system-unstable/theme-toolkit/src/DesignTokensTable";
+import tokens from "../dist/index.json";
+import config from "../src/config.json";
+
+<Meta title={`${config.name}/Design Tokens`} />
+
+# Design Tokens
+
+<DesignTokensTable tokens={tokens.filter((token) => token.path[0] !== config.prefix)}></DesignTokensTable>
+
+## Proprietary Design Tokens
+
+<DesignTokensTable tokens={tokens.filter((token) => token.path[0] === config.prefix)}></DesignTokensTable>

municipalities/commonground-design-tokens/documentation/readme.stories.mdx

@@ -0,0 +1,7 @@
+import { Meta, Description } from "@storybook/addon-docs";
+import markdown from "../README.md";
+import config from "../src/config.json";
+
+<Meta title={`${config.name}/README`} />
+
+<Description>{markdown}</Description>

municipalities/commonground-design-tokens/package.json

@@ -0,0 +1,37 @@
+{
+  "version": "1.0.0-alpha.1",
+  "author": "Community for NL Design System",
+  "description": "NL Design System design tokens for CommonGround",
+  "website": "https://commonground.nl/",
+  "keywords": ["nl-design-system", "conduction"],
+  "license": "SEE LICENSE IN LICENSE.md",
+  "name": "@nl-design-system-unstable/commonground-design-tokens",
+  "private": false,
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git+ssh",
+    "url": "[email protected]:nl-design-system/themes.git"
+  },
+  "scripts": {
+    "clean": "rimraf -rf dist/",
+    "prebuild": "npm run clean",
+    "watch": "npm-run-all watch:**",
+    "watch:style-dictionary": "chokidar --follow-symlinks --command 'npm run --ignore-scripts build' 'src/**/*.tokens.json'",
+    "build": "npm-run-all build:**",
+    "build:scss": "sass --no-source-map src/:dist/",
+    "build:style-dictionary": "style-dictionary build --config ./style-dictionary.config.js"
+  },
+  "devDependencies": {
+    "@nl-design-system-unstable/theme-toolkit": "workspace:*",
+    "chokidar-cli": "3.0.0",
+    "npm-run-all": "4.1.5",
+    "rimraf": "3.0.2",
+    "style-dictionary": "3.8.0"
+  },
+  "bugs": {
+    "url": "https://github.com/ConductionNL/conduction-theme/issues"
+  },
+  "homepage": "https://github.com/ConductionNL/conduction-theme#readme"
+}

municipalities/commonground-design-tokens/src/brand/commonground/color.tokens.json

@@ -0,0 +1,92 @@
+{
+  "commonground": {
+    "color": {
+      "primary": { "value": "{commonground.color.yellow.59}" },
+      "primary-hover": { "value": "#ffae00" },
+      "error": { "value": "#dc3545" },
+      "alert-error": { "value": "#721c24" },
+      "alert-error-background": { "value": "#f8d7da" },
+      "warning": { "value": "#ffc107" },
+      "alert-warning": { "value": "#856404" },
+      "alert-warning-background": { "value": "#fff3cd" },
+      "succes": { "value": "#28a745" },
+      "alert-succes": { "value": "#155724" },
+      "alert-succes-background": { "value": "#d4edda" },
+      "info": {},
+      "alert-info": { "value": "#004085" },
+      "alert-info-background": { "value": "#cce5ff" },
+      "white": {
+        "100": {
+          "value": "#ffffff",
+          "comment": "Base/White"
+        }
+      },
+      "black": {
+        "0": {
+          "value": "#000000",
+          "comment": "Base/Black"
+        },
+        "0-6t": {
+          "value": "#0000000f",
+          "comment": "Black with 6% transparency"
+        },
+        "0-11t": {
+          "value": "#0000001c",
+          "comment": "Black with 11% transparency"
+        },
+        "0-55t": {
+          "value": "#0000008c",
+          "comment": "Black with 55% transparency"
+        }
+      },
+      "yellow": {
+        "59": {
+          "value": "#ffbc2c",
+          "comment": "Base/Yellow"
+        },
+        "64": {
+          "value": "#ffc446"
+        }
+      },
+      "grey": {
+        "29": {
+          "value": "#4a4a4a",
+          "comment": "Base/Grey"
+        },
+        "58": {
+          "value": "#949494"
+        },
+        "65": {
+          "value": "#a5a5a5"
+        },
+        "82": {
+          "value": "#d1d1d1"
+        },
+        "97": {
+          "value": "#f7f7f7"
+        }
+      },
+      "lightgrey": {
+        "96": {
+          "value": "#f5f5f5",
+          "comment": "Base/LightGrey"
+        },
+        "98": {
+          "value": "#fafafa"
+        },
+        "89": {
+          "value": "#e4e4e4"
+        }
+      },
+      "blue": {
+        "26": {
+          "value": "#2e4057",
+          "comment": "Base/Blue"
+        },
+        "29": {
+          "value": "#334761"
+        }
+      }
+    }
+  }
+}

municipalities/commonground-design-tokens/src/brand/commonground/font-size.tokens.json

@@ -0,0 +1,17 @@
+{
+  "commonground": {
+    "font-size": {
+      "4xs": { "value": "5px" },
+      "3xs": { "value": "8px" },
+      "2xs": { "value": "10px" },
+      "xs": { "value": "12px" },
+      "sm": { "value": "14px" },
+      "md": { "value": "16px" },
+      "lg": { "value": "20px" },
+      "xl": { "value": "24px" },
+      "2xl": { "value": "30px" },
+      "3xl": { "value": "48px" },
+      "4xl": { "value": "58px" }
+    }
+  }
+}

municipalities/commonground-design-tokens/src/brand/commonground/size.tokens.json

@@ -0,0 +1,17 @@
+{
+  "commonground": {
+    "size": {
+      "4xs": { "value": "1px" },
+      "3xs": { "value": "2px" },
+      "2xs": { "value": "4px" },
+      "xs": { "value": "8px" },
+      "sm": { "value": "14px" },
+      "md": { "value": "18px" },
+      "lg": { "value": "24px" },
+      "xl": { "value": "32px" },
+      "2xl": { "value": "48px" },
+      "3xl": { "value": "72px" },
+      "4xl": { "value": "96px" }
+    }
+  }
+}

municipalities/commonground-design-tokens/src/brand/commonground/typography.tokens.json

@@ -0,0 +1,45 @@
+{
+  "commonground": {
+    "typography": {
+      "rijksoverheid-sans": {
+        "font-family": {
+          "value": "\"Rijksoverheid Sans\", Monospace, \"Noto Sans\", Arial, sans-serif"
+        }
+      },
+      "sans-serif": {
+        "font-family": {
+          "value": "\"Rijksoverheid Sans\", Monospace, Arial, sans-serif"
+        }
+      },
+      "monospace": {
+        "font-family": {
+          "value": "Monospace, \"Lucida Console\""
+        }
+      },
+      "font-weight": {
+        "bold": {
+          "value": "700"
+        },
+        "normal": {
+          "value": "400"
+        },
+        "light": {
+          "value": "100"
+        }
+      },
+      "scale": {
+        "4xs": { "value": "{commonground.font-size.4xs}" },
+        "3xs": { "value": "{commonground.font-size.3xs}" },
+        "2xs": { "value": "{commonground.font-size.2xs}" },
+        "xs": { "value": "{commonground.font-size.xs}" },
+        "sm": { "value": "{commonground.font-size.sm}" },
+        "md": { "value": "{commonground.font-size.md}" },
+        "lg": { "value": "{commonground.font-size.lg}" },
+        "xl": { "value": "{commonground.font-size.xl}" },
+        "2xl": { "value": "{commonground.font-size.2xl}" },
+        "3xl": { "value": "{commonground.font-size.3xl}" },
+        "4xl": { "value": "{commonground.font-size.4xl}" }
+      }
+    }
+  }
+}

municipalities/commonground-design-tokens/src/common/utrecht/action.tokens.json

@@ -0,0 +1,9 @@
+{
+  "utrecht": {
+    "action": {
+      "busy": { "cursor": { "value": "wait" } },
+      "disabled": { "cursor": { "value": "not-allowed" } },
+      "submit": { "cursor": { "value": "pointer" } }
+    }
+  }
+}