Skip to content

Commit

Permalink
Merge branch 'lyne-0.48'
Browse files Browse the repository at this point in the history
  • Loading branch information
mcilurzo committed Mar 20, 2024
2 parents f77b094 + 38d8d3f commit 671370b
Show file tree
Hide file tree
Showing 1,809 changed files with 16,303 additions and 6,684 deletions.
6 changes: 4 additions & 2 deletions .eleventy.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,13 @@ module.exports = function (config) {
const buttonGroup = `{% from "src/_includes/macros/macros.njk" import buttonGroup %}`;
const specificationLinks = `{% from "src/_includes/macros/macros.njk" import specificationLinks %}`;
const imageSpec = `{% from "src/_includes/macros/macros.njk" import imageSpec %}`;
const lynedemo = `{% from "src/_includes/macros/macros.njk" import lynedemo %}`;
const lynePlayground = `{% from "src/_includes/macros/macros.njk" import lynePlayground %}`;
const lyneExamples = `{% from "src/_includes/macros/macros.njk" import lyneExamples %}`;


let collection = collectionApi.getFilteredByGlob(["src/**/*.md", "src/**/*.njk"]);
collection.forEach((item) => {
item.template.frontMatter.content = `${svgImage}\n${webpImage}\n${imageWithMode}\n${imageOnGreyBackground}\n${principleImage}\n${buttonGroup}\n${specificationLinks}\n${imageSpec}\n${lynedemo}\n${item.template.frontMatter.content}`
item.template.frontMatter.content = `${svgImage}\n${webpImage}\n${imageWithMode}\n${imageOnGreyBackground}\n${principleImage}\n${buttonGroup}\n${specificationLinks}\n${imageSpec}\n${lynePlayground}\n${lyneExamples}\n${item.template.frontMatter.content}`
})
return collection;
});
Expand Down
94 changes: 50 additions & 44 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
Expand Up @@ -16,15 +16,15 @@
"@11ty/eleventy": "2.0.1",
"@11ty/eleventy-navigation": "^0.3.5",
"@11ty/eleventy-plugin-syntaxhighlight": "^4.2.0",
"@sbb-esta/lyne-design-tokens": "^0.3.9",
"@sbb-esta/lyne-design-tokens": "^0.4.0",
"eleventy-plugin-compress": "^1.0.5",
"esbuild": "^0.19.11",
"html-minifier": "^4.0.0"
},
"dependencies": {
"@11ty/eleventy-fetch": "^4.0.0",
"@kevingimbel/eleventy-plugin-mermaid": "^2.1.0",
"@sbb-esta/lyne-components": "0.47.2",
"@sbb-esta/lyne-components": "0.48.2",
"copyfiles": "^2.4.1",
"eleventy-plugin-i18n": "^0.1.3",
"eleventy-sass": "^2.2.1",
Expand Down
2 changes: 1 addition & 1 deletion src/_data/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = {
getLinkActiveState(itemUrl, pageUrl) {
let response = '';
if (itemUrl.length > 1 && pageUrl.indexOf(itemUrl) === 0) {
response += ' class="is-active" active ';
response += ' class="sbb-active" ';
}
return response;
}
Expand Down
2 changes: 1 addition & 1 deletion src/_data/lyne/lyneversion.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
url: 'https://raw.githubusercontent.com/lyne-design-system/lyne-components/',
branch: "v0.47.2",
branch: "v0.48.2",
master: "master",
path: "/src/components/",
dok: '/readme.md'
Expand Down
8 changes: 0 additions & 8 deletions src/_data/lyne/patterns/alertgroup.json

This file was deleted.

9 changes: 0 additions & 9 deletions src/_data/lyne/patterns/breadcrumbgroup.json

This file was deleted.

90 changes: 0 additions & 90 deletions src/_data/lyne/patterns/button.json

This file was deleted.

Loading

0 comments on commit 671370b

Please sign in to comment.