Skip to content

Commit

Permalink
Merge pull request #13 from remko48/feature/multiple-theme-updates
Browse files Browse the repository at this point in the history
refactor: Updated multiple packages
  • Loading branch information
remko48 authored Dec 13, 2023
2 parents cbd56eb + 77599ea commit 4368ac6
Show file tree
Hide file tree
Showing 159 changed files with 3,872 additions and 340 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@
}
},
"grey": {
"31": {
"value": "#4f4f4f"
},
"38": {
"value": "#5c6066"
},
Expand All @@ -90,8 +93,14 @@
"72": {
"value": "#AEB6C2"
},
"82": {
"value": "#d1d1d1"
},
"94": {
"value": "#edeff2"
},
"97": {
"value": "#f7f7f7"
}
},
"lightgrey": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"border-bottom-style": {},
"border-bottom-width": {},
"border-radius": { "value": "0px" },
"box-shadow": {},
"color": { "value": "{utrecht.document.color}" },
"hover": {
"background-color": {},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{
"conduction": {
"input-checkbox": {
"color": { "value": "{dinkelland.color.white.100}" },
"border-width": { "value": "{dinkelland.size.4xs}" },
"border-style": { "value": "solid" },
"border-color": { "value": "{dinkelland.color.grey.46}" },
"border-radius": { "value": "3px" },
"box-shadow": {},
"hover": {
"color": { "value": "{dinkelland.color.white.100}" },
"border-width": { "value": "{dinkelland.size.4xs}" },
"border-style": { "value": "solid" },
"border-color": { "value": "{dinkelland.color.grey.31}" },
"border-radius": { "value": "3px" },
"box-shadow": {}
},
"checked": {
"color": { "value": "{dinkelland.color.primary}" },
"border-width": { "value": "{dinkelland.size.4xs}" },
"border-style": { "value": "solid" },
"border-color": { "value": "{dinkelland.color.primary}" },
"border-radius": { "value": "3px" },
"box-shadow": {},
"checkmark-url": {},
"hover": {
"color": { "value": "{dinkelland.color.primary-hover}" },
"border-width": { "value": "{dinkelland.size.4xs}" },
"border-style": { "value": "solid" },
"border-color": { "value": "{dinkelland.color.primary-hover}" },
"border-radius": { "value": "3px" },
"box-shadow": {}
}
},
"disabled": {
"color": { "value": "{dinkelland.color.grey.82}" },
"border-width": { "value": "{dinkelland.size.4xs}" },
"border-style": { "value": "solid" },
"border-color": { "value": "{dinkelland.color.grey.82}" },
"border-radius": { "value": "3px" },
"box-shadow": {},
"hover": {
"color": { "value": "{dinkelland.color.grey.82}" },
"border-width": { "value": "{dinkelland.size.4xs}" },
"border-style": { "value": "solid" },
"border-color": { "value": "{dinkelland.color.grey.82}" },
"border-radius": { "value": "3px" },
"box-shadow": {}
}
},
"focus": {
"outline-width": { "value": "2px" },
"outline-style": { "value": "solid" },
"outline-color": { "value": "{dinkelland.color.black.0}" },
"outline-offset": { "value": "2px" }
},
"label": {
"color": { "value": "{utrecht.document.color}" },
"font-size": { "value": "{utrecht.document.font-size}" },
"font-weight": {},
"font-family": { "value": "{utrecht.document.font-family}" },
"container": {
"padding": { "value": "3px" },
"margin": { "value": "3px" }
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"conduction": {
"download-card": {
"background-color": {},
"title": {
"color": { "value": "{dinkelland.color.black.13}" },
"font-size": { "value": "{dinkelland.font-size.lg}" },
"font-weight": { "value": "{dinkelland.typography.font-weight.bold}" },
"font-family": { "value": "{dinkelland.typography.montserrat.font-family}" },
"margin-inline-end": { "value": "{dinkelland.size.sm}" }
},
"border-width": { "value": "{dinkelland.size.4xs}" },
"border-style": { "value": "solid" },
"border-color": { "value": "{dinkelland.color.grey.72}" },
"border-radius": { "value": "0px" },
"icon-gap": { "value": "{dinkelland.size.xs}" },
"padding-inline-end": { "value": "{dinkelland.size.md}" },
"padding-inline-start": { "value": "{dinkelland.size.md}" },
"padding-block-end": { "value": "{dinkelland.size.md}" },
"padding-block-start": { "value": "{dinkelland.size.md}" }
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"conduction": {
"logo": {
"header": {
"inline-size": { "value": "150px" },
"block-size": { "value": "30px" },
"background-image": { "value": "url('https://www.dinkelland.nl/sites/all/themes/dinkelland/logo.svg')" }
},
"footer": {
"inline-size": { "value": "" },
"block-size": { "value": "" },
"background-image": { "value": "" }
},
"navbar": {
"inline-size": { "value": "150px" },
"block-size": { "value": "40px" },
"background-image": {
"value": "url('https://www.dinkelland.nl/sites/all/themes/dinkelland/logo.svg')"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
{
"conduction": {
"primary": {
"top-nav": {
"color": { "value": "{dinkelland.color.black.20}" },
"background-color": { "value": "{dinkelland.color.white.100}" },
"hover": {
"color": { "value": "{dinkelland.color.primary}" },
"background-color": { "value": "{dinkelland.color.white.100}" },
"box-shadow": {}
},
"current": {
"color": { "value": "{dinkelland.color.primary}" },
"background-color": { "value": "unset" },
"box-shadow": { "value": "inset 0 -4px {dinkelland.color.primary}" },
"mobile": {
"box-shadow": { "value": "inset 4px 0 {dinkelland.color.primary}" }
}
},
"dropdown": {
"color": {},
"background-color": {},
"border-width": {},
"border-style": {},
"border-color": {},
"hover": {
"color": {},
"background-color": {},
"box-shadow": {}
}
},
"item": {
"padding": { "value": "18px" },
"border-radius": {}
},
"padding-inline-end": { "value": "16px" },
"padding-inline-start": { "value": "16px" },
"padding-block-end": { "value": "16px" },
"padding-block-start": { "value": "16px" }
}
},
"secondary": {
"top-nav": {
"color": { "value": "{dinkelland.color.black.20}" },
"background-color": { "value": "transparent" },
"hover": {
"color": { "value": "{dinkelland.color.primary}" },
"background-color": { "value": "{dinkelland.color.white.100}" }
},
"current": {
"color": { "value": "{dinkelland.color.primary}" },
"background-color": { "value": "unset" },
"box-shadow": { "value": "inset 0 -4px {dinkelland.color.primary}" }
},
"font-size": { "value": "{dinkelland.font-size.md}" },
"font-weight": { "value": "400" },
"item": {
"padding": { "value": "18px" }
},
"padding-inline-end": { "value": "16px" },
"padding-inline-start": { "value": "16px" },
"padding-block-end": { "value": "16px" },
"padding-block-start": { "value": "16px" }
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,45 +1,76 @@
{
"conduction": {
"pagination": {
"container-background-color": { "value": "unset" },
"container-padding-inline-start": { "value": "0px" },
"container-padding-inline-end": { "value": "0px" },
"container-padding-block-start": { "value": "0px" },
"container-padding-block-end": { "value": "0px" },
"item-gap": { "value": "{dinkelland.size.2xs}" },
"item-color": { "value": "{dinkelland.color.white.100}" },
"item-background-color": { "value": "{dinkelland.color.primary}" },
"item-border-radius": { "value": "0px" },
"item-padding-inline-start": { "value": "15px" },
"item-padding-inline-end": { "value": "15px" },
"item-padding-block-start": { "value": "7.5px" },
"item-padding-block-end": { "value": "7.5px" },
"item-font-size": { "value": "17.6px" },
"item-font-weight": { "value": "{dinkelland.typography.font-weight.normal}" },
"item-font-family": { "value": "{utrecht.document.font-family}" },
"item-border-width": {},
"item-border-style": {},
"item-border-color": {},
"navigation-button-padding-inline-start": { "value": "{dinkelland.size.xs}" },
"navigation-button-padding-inline-end": { "value": "{dinkelland.size.xs}" },
"navigation-button-padding-block-start": { "value": "0px" },
"navigation-button-padding-block-end": { "value": "0px" },
"disabled-color": { "value": "{dinkelland.color.white.100}" },
"disabled-background-color": { "value": "{dinkelland.color.lightgrey.96}" },
"current-page-color": { "value": "{dinkelland.color.primary}" },
"current-page-background-color": { "value": "{dinkelland.color.white.100}" },
"current-page-font-weight": { "value": "{dinkelland.typography.font-weight.normal}" },
"current-page-text-decoration": { "value": "unset" },
"current-page-border-width": {},
"current-page-border-style": {},
"current-page-border-color": {},
"page-hover-color": { "value": "{dinkelland.color.white.100}" },
"page-hover-background-color": { "value": "{dinkelland.color.blue.31}" },
"page-hover-text-decoration": { "value": "unset" },
"page-hover-text-decoration-thickness": { "value": "0px" },
"page-hover-border-width": {},
"page-hover-border-style": {},
"page-hover-border-color": {}
"container": {
"background-color": { "value": "unset" },
"padding-inline-start": { "value": "0px" },
"padding-inline-end": { "value": "0px" },
"padding-block-start": { "value": "0px" },
"padding-block-end": { "value": "0px" }
},
"item": {
"gap": { "value": "{dinkelland.size.2xs}" },
"color": { "value": "{dinkelland.color.white.100}" },
"background-color": { "value": "{dinkelland.color.primary}" },
"padding-inline-start": { "value": "15px" },
"padding-inline-end": { "value": "15px" },
"padding-block-start": { "value": "7.5px" },
"padding-block-end": { "value": "7.5px" },
"font-size": { "value": "17.6px" },
"font-weight": { "value": "{dinkelland.typography.font-weight.normal}" },
"font-family": { "value": "{utrecht.document.font-family}" },
"border-width": {},
"border-style": {},
"border-color": {},
"border-radius": { "value": "0px" }
},
"navigation-button": {
"color": { "value": "{dinkelland.color.white.100}" },
"background-color": { "value": "{dinkelland.color.primary}" },
"border-color": {},
"border-radius": {},
"border-width": { "value": "0px" },
"padding-inline-start": { "value": "{dinkelland.size.xs}" },
"padding-inline-end": { "value": "{dinkelland.size.xs}" },
"padding-block-start": { "value": "0px" },
"padding-block-end": { "value": "0px" },
"disabled": {
"color": { "value": "{dinkelland.color.lightgrey.96}" },
"background-color": { "value": "transparent" },
"border-width": { "value": "0px" },
"border-style": {},
"border-color": {},
"border-radius": {}
},
"hover": {
"color": { "value": "{dinkelland.color.white.100}" },
"background-color": { "value": "{dinkelland.color.primary-hover}" },
"border-width": { "value": "0px" },
"border-style": {},
"border-color": {},
"border-radius": {}
}
},
"current-page": {
"color": { "value": "{dinkelland.color.primary}" },
"background-color": { "value": "{dinkelland.color.white.100}" },
"font-weight": { "value": "{dinkelland.typography.font-weight.normal}" },
"text-decoration": { "value": "unset" },
"border-width": {},
"border-style": {},
"border-color": {}
},
"page": {
"hover": {
"color": { "value": "{dinkelland.color.white.100}" },
"background-color": { "value": "{dinkelland.color.blue.31}" },
"text-decoration": { "value": "unset" },
"text-decoration-thickness": { "value": "0px" },
"border-width": {},
"border-style": {},
"border-color": {}
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,19 @@
"list-option": {
"font-family": { "value": "{dinkelland.typography.lato.font-family}" },
"background-color": {},
"color": {},
"hover": {
"font-family": { "value": "{dinkelland.typography.lato.font-family}" },
"color": {},
"background-color": {}
"background-color": {},
"color": {}
},
"selected": {
"background-color": { "value": "var(--rotterdam-color-green-tint-01)" },
"color": { "value": "var(--rotterdam-color-base-white)" }
},
"focus": {
"background-color": {},
"color": {}
}
},
"placeholder": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"conduction": {
"table-wrapper": {
"scroll-button": {
"background-color": { "value": "{dinkelland.color.blue.96}" },
"color": { "value": "{dinkelland.color.black.20}" },
"padding-inline-start": { "value": "{dinkelland.size.sm}" },
"padding-inline-end": { "value": "{dinkelland.size.sm}" },
"padding-block-start": {},
"padding-block-end": {},
"border-width": {},
"border-style": {},
"border-color": {},
"hover": {
"background-color": { "value": "{dinkelland.color.blue.96}" },
"color": { "value": "{dinkelland.color.green.24}" }
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,17 @@
"border-color": { "value": "{dinkelland.color.grey.72}" },
"border-top": { "value": "0" }
}
},
"scroll-button": {
"background-color": { "value": "{dinkelland.color.blue.96}" },
"color": { "value": "{dinkelland.color.grey.38}" },
"border-width": { "value": "{dinkelland.size.4xs}" },
"border-style": { "value": "solid" },
"border-color": { "value": "{dinkelland.color.grey.72}" },
"hover": {
"background-color": { "value": "{dinkelland.color.blue.96}" },
"color": { "value": "{dinkelland.color.blue.36}" }
}
}
}
}
Expand Down
Loading

0 comments on commit 4368ac6

Please sign in to comment.