Skip to content

Commit 0d995d2

Browse files
authored
Merge pull request #183 from w3c/feature/update-design-system
Feature/update design system
2 parents d01c38e + f568ca7 commit 0d995d2

File tree

23 files changed

+874
-1490
lines changed

23 files changed

+874
-1490
lines changed

assets-src/styles/sass/50-core-components/_navigation.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
align-items: center;
1717
display: flex;
1818
flex-wrap: wrap;
19-
gap: em(48);
2019

2120
@include mq($max-width) {
2221
flex-wrap: nowrap;

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
}
2626
},
2727
"require-dev": {
28-
"studio24/design-system": "dev-main",
28+
"studio24/design-system": "^2.0",
2929
"studio24/deployer-recipes": "^v2.1",
3030
"rector/rector": "^1.2"
3131
}

composer.lock

Lines changed: 826 additions & 1079 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

design-system-templates/components/header-new-logo.html.twig

Lines changed: 0 additions & 271 deletions
This file was deleted.
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
<svg xmlns="http://www.w3.org/2000/svg" focusable="false" overflow="visible" viewBox="0 0 72 48" width="72" height="48" role="img" aria-label="W3C"><defs/><g image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision"><path fill="#FFF" fill-rule="evenodd" d="M0 0h72v48H0z" clip-rule="evenodd"/><path fill="#005A9C" d="M18.117 8.006l5.759 19.58 5.759-19.58h15.614v1.946L39.37 20.08c2.065.663 3.627 1.868 4.686 3.615 1.059 1.748 1.589 3.799 1.589 6.155 0 2.914-.775 5.363-2.324 7.348s-3.555 2.978-6.017 2.978c-1.854 0-3.469-.589-4.845-1.767-1.377-1.178-2.396-2.773-3.058-4.786l3.256-1.35c.477 1.218 1.106 2.178 1.887 2.879a3.993 3.993 0 002.76 1.052c1.112 0 2.052-.622 2.82-1.866.768-1.245 1.152-2.74 1.152-4.489 0-1.933-.411-3.429-1.231-4.488-.954-1.244-2.45-1.867-4.489-1.867h-1.588v-1.906l5.56-9.612h-6.712l-.382.65-8.163 27.548h-.397l-5.958-19.937-5.957 19.937h-.397L2.032 8.006h4.17l5.759 19.58 3.892-13.185-1.906-6.395h4.17z"/><path fill-rule="evenodd" d="M66.92 8.006c-.819 0-1.554.295-2.111.861-.591.6-.92 1.376-.92 2.178a3 3 0 00.887 2.128 2.979 2.979 0 002.145.912c.793 0 1.562-.321 2.161-.903.574-.557.887-1.3.887-2.136 0-.811-.321-1.57-.878-2.136a3 3 0 00-2.171-.904zm2.643 3.065c0 .701-.271 1.351-.768 1.832a2.671 2.671 0 01-1.892.777c-.675 0-1.342-.278-1.84-.785s-.777-1.157-.777-1.849.287-1.368.802-1.891a2.54 2.54 0 011.84-.751c.726 0 1.376.271 1.883.785.49.489.752 1.147.752 1.882zm-2.559-1.807h-1.3v3.445h.65V11.24h.642l.701 1.469h.726l-.769-1.57c.498-.102.785-.439.785-.929 0-.625-.472-.946-1.435-.946zm-.118.422c.608 0 .886.169.886.591 0 .405-.278.549-.87.549h-.549v-1.14h.533z" clip-rule="evenodd"/><g><path d="M61.807 7.825l.676 4.107-2.391 4.575s-.918-1.941-2.443-3.015c-1.285-.905-2.122-1.102-3.431-.832-1.681.347-3.587 2.357-4.419 4.835-.995 2.965-1.005 4.4-1.04 5.718-.056 2.113.277 3.362.277 3.362s-1.452-2.686-1.438-6.62c.009-2.808.451-5.354 1.75-7.867 1.143-2.209 2.842-3.535 4.35-3.691 1.559-.161 2.791.59 3.743 1.403 1 .854 2.01 2.721 2.01 2.721l2.356-4.696zM62.102 31.063s-1.057 1.889-1.715 2.617c-.659.728-1.837 2.01-3.292 2.651s-2.218.762-3.656.624c-1.437-.138-2.772-.97-3.24-1.317-.468-.347-1.664-1.369-2.34-2.322-.676-.953-1.733-2.859-1.733-2.859s.589 1.91.958 2.721c.212.467.864 1.894 1.789 3.136.863 1.159 2.539 3.154 5.086 3.604 2.547.451 4.297-.693 4.73-.97.433-.277 1.346-1.042 1.924-1.66.603-.645 1.174-1.468 1.49-1.962.231-.36.607-1.092.607-1.092l-.608-3.171z"/></g></g></svg>
2-
<span>Design System</span>
1+
<a class="global-logo" href="/">
2+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 360 360" width="43" height="43" focusable="false" aria-hidden="true"><path fill="#005A9C" d="M306.8 149.604c-6.578-5.221-16.182-4.111-21.404 2.467-6.468 8.155-12.342 13.063-19.039 15.92-12.35 5.255-22.82 3.034-32.941-6.994-9.918-9.824-19.582-20.53-28.957-30.906-4.586-5.078-9.18-10.164-13.834-15.19-7.952-8.588-15.945-17.14-23.93-25.703l-.704-.754c-17.37-18.59-35.323-37.815-52.641-57.126C99.617 16.001 78.4 8.414 57.987 11.482c-20.862 3.12-37.73 16.471-47.504 37.587-9.418 20.336-6.23 43.444 8.307 60.304 25.575 29.66 47.149 54.184 72.418 77.25 10.333 9.426 22.837 14.444 36.154 14.512 8.638.043 21.658-.932 34.941-9.875 5.816-3.916 11.232-7.943 13.614-14.089 2.425-6.29.161-13.52-5.518-17.598-5.51-3.967-12.74-3.687-17.996.678-.662.551-1.382 1.187-2.17 1.874-8.257 7.23-18.531 16.233-39.478 1.195-19.19-13.784-34.05-31.848-51.267-52.768-5.612-6.816-11.419-13.869-17.624-21.074-6.629-7.689-8.061-18.268-3.738-27.618 3.772-8.137 11.054-18.259 24.38-20.25 10.095-1.518 21.412 2.517 28.168 10.044 17.462 19.48 35.552 38.858 53.048 57.583a7980 7980 0 0 1 24.55 26.364c4.568 4.933 9.078 9.926 13.655 14.995 9.613 10.639 19.548 21.633 30.042 32.034 18.946 18.776 42.495 23.532 66.34 13.385 11.453-4.891 21.294-12.834 30.958-25.015 5.213-6.57 4.111-16.166-2.467-21.396"/><path fill="#005A9C" d="M330.636 64.983c9.85-4.67 17.598-13.461 18.336-24.125 1.873-18.513-13.368-36.23-35.79-38.968-13.766-1.746-26.54 2.331-35.594 9.833-4.84 4.027-6.146 11.478-1.95 16.734 4.586 5.467 9.876 6.425 18.53 1.67 3.103-1.764 7.766-3.23 12.894-2.874 9.672.67 12.444 9.384 12.173 13.342-.043.585.017 14.08-13.605 13.14l-5.138-.356c-5.721-.39-11.443 4.958-11.867 11.078-.458 6.511 4.306 12.199 10.231 12.614l6.316.433c17.378 1.203 15.563 15.953 15.199 18.31-.34 6.781-11.224 18.284-30.636 5.204-6.586-4.433-53.565-63.44-53.565-63.44-22.26-28.78-60.084-33.849-89.931-12.046a15.15 15.15 0 0 0-6.07 9.96 15.16 15.16 0 0 0 2.756 11.325 15.15 15.15 0 0 0 9.952 6.07 15.11 15.11 0 0 0 11.333-2.755c20.361-14.877 38.51-6.01 47.843 6.06 0 0 50.438 64.874 63.424 71.749 8.426 4.459 17.225 7.036 26.168 7.655 27.449 1.898 44.165-13.224 48.675-33.942 2.958-13.58-5.824-30.55-19.684-36.67M7.656 245.622h18.688q2.971.002 4.884 1.359c1.913 1.357 2.135 2.092 2.59 3.567l16.65 65.151q1.442 5.099 2.718 11.807c.451-2.208.903-4.316 1.359-6.332q.676-3.011 1.614-5.56l19.706-65.066c.452-1.305 1.328-2.448 2.633-3.444q1.952-1.482 4.672-1.482h6.54q2.971.002 4.8 1.312 1.825 1.32 2.59 3.614l19.707 65.151a63 63 0 0 1 1.572 5.398c.479 1.946.946 4 1.401 6.154q.593-3.231 1.232-6.115c.64-2.884.861-3.707 1.317-5.352l16.648-65.236c.394-1.305 1.26-2.448 2.591-3.444q1.992-1.482 4.715-1.482h17.498l-33.468 112.803h-20.216l-22.34-75.004a40 40 0 0 1-.977-3.228 86 86 0 0 1-.892-3.737c-.285 1.305-.594 2.548-.934 3.737s-.652 2.263-.934 3.228l-22.765 75.004H41.124zM212.198 244.348q7.813 0 14.058 2.293c4.162 1.529 7.687 3.614 10.575 6.24 2.888 2.64 5.108 5.721 6.668 9.266 1.556 3.537 2.336 7.313 2.336 11.336q0 5.35-1.147 9.428c-1.147 4.078-1.884 5.097-3.355 7.136a20.6 20.6 0 0 1-5.436 5.181c-2.155 1.413-4.587 2.58-7.305 3.483 12.853 4.363 19.282 13.05 19.282 26.077 0 5.722-1.035 10.75-3.1 15.073-2.07 4.34-4.842 7.977-8.325 10.92s-7.533 5.15-12.147 6.625c-4.618 1.475-9.47 2.208-14.567 2.208q-8.073-.002-14.228-1.868-6.161-1.865-10.788-5.653-4.632-3.776-7.985-9.382-3.358-5.607-5.733-12.996l9.004-3.823q3.565-1.447 6.668-.718c2.065.479 3.525 1.599 4.374 3.352a57 57 0 0 0 3.228 5.39 22.8 22.8 0 0 0 3.865 4.417q2.165 1.92 4.97 3.019c2.804 1.099 4.018 1.104 6.455 1.104q4.5 0 7.857-1.483 3.352-1.495 5.564-3.907a16.4 16.4 0 0 0 3.312-5.483c.734-2.038 1.105-4.077 1.105-6.115 0-2.603-.244-4.981-.722-7.136q-.725-3.23-3.228-5.52-2.507-2.295-7.348-3.568c-4.84-1.273-7.618-1.275-13.166-1.275v-14.525q6.963-.08 11.425-1.274c4.462-1.194 5.309-1.915 7.008-3.351 1.699-1.452 2.857-3.159 3.482-5.143q.934-2.977.935-6.626c0-5.15-1.29-9.034-3.865-11.637q-3.87-3.905-10.83-3.907c-4.135 0-7.591 1.158-10.363 3.483-2.776 2.324-4.703 5.181-5.776 8.579q-1.362 3.902-3.61 5.096-2.254 1.194-6.414.51l-10.787-1.869c.791-5.49 2.293-10.293 4.502-14.401 2.208-4.1 4.98-7.53 8.324-10.27q5.009-4.125 11.425-6.21c4.274-1.382 8.876-2.077 13.803-2.077M335.38 331.074q1.785.001 3.058 1.359l8.919 9.598c-4.077 5.722-9.19 10.078-15.332 13.082q-9.22 4.503-21.873 4.501c-7.645 0-14.525-1.428-20.64-4.293-6.117-2.857-11.314-6.85-15.588-11.97-4.278-5.127-7.56-11.212-9.853-18.27-2.294-7.042-3.44-14.764-3.44-23.142 0-8.44 1.231-16.178 3.695-23.236 2.463-7.043 5.93-13.12 10.405-18.216 4.471-5.097 9.823-9.058 16.054-11.892q9.343-4.25 20.556-4.248c7.587 0 14.298 1.344 20.132 4.04q8.746 4.03 14.61 10.656l-7.475 10.447c-.51.626-1.093 1.19-1.741 1.7q-.978.764-2.761.764c-1.783 0-2.336-.456-3.44-1.36s-2.464-1.899-4.078-2.972-3.64-2.07-6.073-2.973q-3.655-1.358-9.344-1.36-6.202 0-11.297 2.595c-3.398 1.722-6.317 4.247-8.749 7.552-2.436 3.32-4.32 7.367-5.649 12.155-1.332 4.78-1.996 10.232-1.996 16.348 0 6.17.734 11.668 2.209 16.478q2.206 7.215 5.988 12.193c2.517 3.306 5.479 5.83 8.877 7.553q5.096 2.594 10.957 2.594c2.32 0 4.417-.123 6.286-.386a21.2 21.2 0 0 0 5.224-1.359 21.5 21.5 0 0 0 4.544-2.502q2.12-1.53 4.247-3.822a11 11 0 0 1 1.742-1.15 3.9 3.9 0 0 1 1.826-.464"/></svg>
3+
<span><span class="visuallyhidden">W3C</span> Design System</span>
4+
</a>

design-system-templates/example-pages/new-logo-page.html.twig

Lines changed: 0 additions & 92 deletions
This file was deleted.

0 commit comments

Comments
 (0)