diff --git a/dev-scripts/setup-storybook.sh b/dev-scripts/setup-storybook.sh index 30db9d5..1da7d38 100755 --- a/dev-scripts/setup-storybook.sh +++ b/dev-scripts/setup-storybook.sh @@ -5,7 +5,10 @@ IFS=$'\n\t' mkdir -p .storybook/resolve-less-imports/mediawiki.ui mkdir -p docs/ui/assets/ +ln -s ../../resources/mediawiki.less/mediawiki.skin.variables.less .storybook/resolve-less-imports/mediawiki.skin.variables.less + curl -sS "https://en.wikipedia.org/w/load.php?only=styles&skin=vector&debug=true&modules=ext.echo.styles.badge|ext.uls.pt|wikibase.client.init|mediawiki.skinning.interface" -o .storybook/integration.less +curl -sSL "https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/core/+/master/resources/src/mediawiki.less/mediawiki.skin.defaults.less?format=TEXT" | base64 --decode > .storybook/resolve-less-imports/mediawiki.skin.defaults.less curl -sSL "https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/core/+/master/resources/src/mediawiki.less/mediawiki.mixins.less?format=TEXT" | base64 --decode > .storybook/resolve-less-imports/mediawiki.mixins.less curl -sSL "https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/core/+/master/resources/src/mediawiki.less/mediawiki.ui/variables.less?format=TEXT" | base64 --decode > .storybook/resolve-less-imports/mediawiki.ui/variables.less curl -sSL "https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/core/+/master/resources/src/mediawiki.less/mediawiki.mixins.rotation.less?format=TEXT" | base64 --decode > .storybook/resolve-less-imports/mediawiki.mixins.rotation.less diff --git a/resources/mediawiki.less/mediawiki.skin.variables.less b/resources/mediawiki.less/mediawiki.skin.variables.less new file mode 100644 index 0000000..af4a4c9 --- /dev/null +++ b/resources/mediawiki.less/mediawiki.skin.variables.less @@ -0,0 +1,14 @@ +/** + * This file is a LESS import match for "mediawiki.skin.variables.less" + * when Vector is the active skin. + */ + +@import 'mediawiki.skin.defaults.less'; + +// Body content uses the user setting in browser / the system default sans-serif font: +// Arial on Windows, Roboto on Android. +// FIXME: Use WikimediaUI Base's OS specific default sans-serif fonts. +@font-family-sans: sans-serif; + +// Matches wikimedia-ui-base and OOUI/wikimedia +@border-radius-base: 2px; diff --git a/skin.json b/skin.json index 0e21a08..d3149d8 100644 --- a/skin.json +++ b/skin.json @@ -44,6 +44,9 @@ ] } }, + "SkinLessImportPaths": { + "vector": "resources/mediawiki.less" + }, "MessagesDirs": { "Vector": [ "i18n" diff --git a/variables.less b/variables.less index a1ae3e5..98990b2 100644 --- a/variables.less +++ b/variables.less @@ -1,4 +1,5 @@ @import 'mediawiki.ui/variables.less'; +@import 'mediawiki.skin.variables.less'; // Sizing calculation primitives. @font-size-root: 100%; @@ -33,7 +34,7 @@ // Body content uses the user setting in browser / operating system default sans-serif font: // For example, Arial on Windows, Roboto on Android. // FIXME: Use WikimediaUI Base's OS specific default sans-serif fonts. -@font-family-sans: sans-serif; +// @font-family-sans is set in mediawiki.variables/variables.less // Fallback for headings, language: ja,he,ko. See T73240, T65817, T65843, T65844, T65827. @font-family-sans--fallback: sans-serif;