Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: complete UIO implementation (resolves #149) #150

Merged
merged 7 commits into from
Jan 29, 2025
Merged

fix: complete UIO implementation (resolves #149) #150

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2afe279
fix: remove text-size preference
jobara Jan 28, 2025
d28f03f
fix: contrast theming for text selection
jobara Jan 28, 2025
1578bda
fix: allow line height to be adjustable
jobara Jan 28, 2025
fc5e713
fix: allow font-family to be adjustable
jobara Jan 28, 2025
d176bad
fix: handle enhance input preference
jobara Jan 28, 2025
c864aa7
fix: remove ToC preference as most pages already include one
jobara Jan 28, 2025
5069192
fix: link underline missing when input enhancement off
jobara Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions eleventy.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,29 @@ export default function eleventy(eleventyConfig) {
</inclusive-disclosure>`;
});

/*
Provide a custom duplicate of eleventy-plugin-fluid's uioInit shortcode in
order to run it without the text-size preference.
*/
eleventyConfig.addShortcode("uioCustomInit", (locale, direction) => {
let options = {
preferences: ["fluid.prefs.lineSpace", "fluid.prefs.textFont", "fluid.prefs.contrast", "fluid.prefs.enhanceInputs"],
auxiliarySchema: {
terms: {
templatePrefix: "/lib/infusion/src/framework/preferences/html",
messagePrefix: "/lib/infusion/src/framework/preferences/messages"
}
},
prefsEditorLoader: {
lazyLoad: true
},
locale: locale,
direction: direction
};

return `<script>fluid.uiOptions.multilingual(".flc-prefsEditor-separatedPanel", ${JSON.stringify(options)});</script>`;
});

eleventyConfig.addTransform("parse", parse);

eleventyConfig.addPassthroughCopy({
Expand Down
2 changes: 1 addition & 1 deletion src/_includes/layouts/base.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@
{% endblock %}
</main>
{% include "partials/global/footer.njk" %}
{% uioInit lang %}
{% uioCustomInit lang, supportedLanguages[lang].dir %}
</body>
</html>
9 changes: 7 additions & 2 deletions src/assets/styles/abstracts/_variables.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
:root {
/** Typography **/
--family-sans-serif: "Source Sans 3", sans-serif;
--family-display: "Raleway", sans-serif;
--font-weight-normal: 400;
--font-weight-medium: 500;
--font-weight-semibold: 600;
Expand Down Expand Up @@ -41,3 +39,10 @@
--common-inline-padding: clamp(1.875rem, 0.0536rem + 9.1071vw, 8.25rem);
--common-block-padding: clamp(3.75rem, 3.3929rem + 1.7857vw, 5rem);
}

/* Font-family set on the body so that it will work with UIO */
:where(body) {
/** Typography **/
--family-sans-serif: var(--fl-font-family, "Source Sans 3", sans-serif);
--family-display: var(--fl-font-family, "Raleway", sans-serif);
}
15 changes: 12 additions & 3 deletions src/assets/styles/base/_base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ body {
color: var(--fl-fgColor, var(--color-black));
font-family: var(--family-sans-serif);
font-size: var(--step-0);
line-height: var(--fl-lineSpace);
}

.wrapper {
Expand Down Expand Up @@ -79,6 +80,12 @@ main section:last-of-type:not(:first-of-type) {
color: var(--fl-fgColor, white);
}

/* Selection */
::selection {
background-color: var(--fl-selectedBgColor, highlight);
color: var(--fl-selectedFgColor, highlighttext);
}

/* Image Theming */
.fl-theme-bw,
.fl-theme-wb,
Expand Down Expand Up @@ -170,7 +177,9 @@ main section:last-of-type:not(:first-of-type) {

a:not([class]) {
color: var(--fl-linkFgColor, currentColor);
font-weight: var(--font-weight-semibold);
font-size: var(--fl-enhance-font-size);
font-weight: var(--fl-enhance-font-weight, var(--font-weight-semibold));
text-decoration: var(--fl-enhance-text-decoration);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This causes link underlines to not appear when enhanced-input is turned off.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for catching this. I've pushed up a fix.


&:hover {
background-color: var(--fl-linkFgColor, var(--color-yellow));
Expand Down Expand Up @@ -232,8 +241,8 @@ button.borderless {
border: 0;
border-radius: 0.3125rem;
font-family: var(--family-sans-serif);
font-size: var(--step--1);
font-weight: var(--font-weight-medium);
font-size: calc(var(--step--1) * var(--fl-enhance-font-size-factor, 1));
font-weight: var(--fl-enhance-font-weight, var(--font-weight-medium));
padding-inline: 0.875rem;
padding-block: 0;

Expand Down
4 changes: 2 additions & 2 deletions src/assets/styles/base/_reset.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ h3,
button,
input,
label {
line-height: 1.4;
line-height: calc(1.4 * var(--fl-lineSpace-factor, 1));
}

h1,
Expand All @@ -64,4 +64,4 @@ picture {
input {
font-family: inherit;
font-size: inherit;
}
}
4 changes: 4 additions & 0 deletions src/assets/styles/base/_typography.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ h3,
font-size: var(--step-3);
}

.project nav inclusive-disclosure h2 {
font-size: calc(var(--step-3) * var(--fl-enhance-font-size-factor, 1));
}

h4,
.card h3,
footer h2 {
Expand Down
4 changes: 2 additions & 2 deletions src/assets/styles/components/_disclosure.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ inclusive-disclosure [aria-expanded] {
color: var(--fl-linkFgColor, var(--color-indigo-700));
display: flex;
font-family: var(--family-display);
font-size: var(--step-2);
font-weight: var(--font-weight-semibold);
font-size: calc(var(--step-2) * var(--fl-enhance-font-size-factor, 1));
font-weight: var(--fl-enhance-font-weight, var(--font-weight-semibold));
height: 5rem;
padding-inline-end: 0.625;
position: relative;
Expand Down
23 changes: 14 additions & 9 deletions src/assets/styles/components/_navigation.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ a.skip {
justify-content: center;
background: var(--fl-linkBgColor, var(--color-yellow));
color: var(--fl-linkFgColor, var(--color-black));
text-decoration: none;
font-weight: var(--font-weight-semibold);
text-decoration: var(--fl-enhance-text-decoration, none);
font-size: var(--fl-enhance-font-size);
font-weight: var(--fl-enhance-font-weight, var(--font-weight-semibold));
display: flex;
padding-block: 0.625rem;
padding-inline: 1.875rem;
Expand Down Expand Up @@ -47,8 +48,9 @@ a[rel="home"] {
text-decoration: none;
text-transform: lowercase;
font-family: var(--family-display);
font-size: clamp(1.125rem, 1.0179rem + 0.5357vw, 1.5rem);
font-weight: var(--font-weight-medium);
font-size: calc(var(--fl-enhance-font-size-factor, 1) * clamp(1.125rem, 1.0179rem + 0.5357vw, 1.5rem));
font-weight: var(--fl-enhance-font-weight, var(--font-weight-medium));
text-decoration: var(--fl-enhance-text-decoration);

strong {
font-weight: var(--font-weight-extrabold);
Expand All @@ -60,8 +62,8 @@ a[rel="home"] {
gap: 0.625rem;
align-items: center;
font-family: var(--family-sans-serif);
font-weight: var(--font-weight-semibold);
font-size: var(--step-0);
font-size: calc(var(--fl-enhance-font-size-factor, 1) * var(--step-0));
font-weight: var(--fl-enhance-font-weight, var(--font-weight-semibold));
}

.navigation [aria-expanded="false"] > .menu__expanded,
Expand Down Expand Up @@ -100,11 +102,11 @@ a[rel="home"] {
block-size: 3.75rem;
color: var(--fl-linkFgColor, var(--color-white));
display: flex;
font-size: var(--step-0);
font-weight: var(--font-weight-semibold);
font-size: calc(var(--fl-enhance-font-size-factor, 1) * var(--step-0));
font-weight: var(--fl-enhance-font-weight, var(--font-weight-semibold));
padding-block: 0.625rem;
padding-inline: var(--common-inline-padding);
text-decoration: none;
text-decoration: var(--fl-enhance-text-decoration, none);

&[aria-current="page"] {
background-color: var(--fl-bgColor, var(--color-indigo-800));
Expand Down Expand Up @@ -152,6 +154,9 @@ a[rel="home"] {
max-width: 31.25em;
top: -5.625rem;
position: absolute;
font-size: var(--fl-enhance-font-size);
font-weight: var(--fl-enhance-font-weight);
text-decoration: var(--fl-enhance-text-decoration);

&:focus {
top: 0;
Expand Down
2 changes: 2 additions & 0 deletions src/assets/styles/components/_tag.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ button.tag {
background-color: var(--fl-linkBgColor, var(--color-light-grey));
box-shadow: inset 0 0 0 0.125rem var(--fl-linkFgColor, var(--color-indigo-700));
color: var(--fl-linkFgColor, var(--color-indigo-700));
font-size: var(--fl-enhance-font-size);
font-weight: var(--fl-enhance-font-weight, var(--font-weight-medium));
padding-block: 0;

svg.remove {
Expand Down