Osmwithspace/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Don't use a white background icon logo if a png is the logo, detect public URL automatically

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-02-06 12:51:23 +01:00
parent 049736de89
commit 1bc1ef2578
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scripts/build.sh
View file

@ -35,9 +35,16 @@ then
echo "Source maps are enabled" echo "Source maps are enabled"
fi fi
if [ $BRANCH = "master" ]
then
PUBLIC_URL="./"
else
PUBLIC_URL="./mc/$BRANCH"
fi
echo -e "\n\n Building non-theme pages" echo -e "\n\n Building non-theme pages"
echo -e " ==========================\n\n" echo -e " ==========================\n\n"
parcel build --public-url "./" $SRC_MAPS "index.html" "404.html" "professional.html" "automaton.html" "import_helper.html" "import_viewer.html" "land.html" "customGenerator.html" "theme.html" vendor parcel build --public-url "$PUBLIC_URL" $SRC_MAPS "index.html" "404.html" "professional.html" "automaton.html" "import_helper.html" "import_viewer.html" "land.html" "customGenerator.html" "theme.html" vendor
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "ERROR - stopping the build" echo "ERROR - stopping the build"
exit 1 exit 1

6
scripts/generateLayouts.ts
View file

@ -179,7 +179,11 @@ async function createLandingPage(layout: LayoutConfig, manifest) {
if (icon.type !== "image/png") { if (icon.type !== "image/png") {
continue; continue;
} }
apple_icons.push(`<link rel="apple-touch-icon" sizes="${icon.sizes}" href="./assets/generated/generated_theme_${layout.id}_white_background${icon.sizes.substr(icon.sizes.indexOf("x")+ 1)}.png">`) const whiteBgPath = `./assets/generated/generated_theme_${layout.id}_white_background${icon.sizes.substr(icon.sizes.indexOf("x")+ 1)}.png`
if(!existsSync(whiteBgPath)){
continue
}
apple_icons.push(`<link rel="apple-touch-icon" sizes="${icon.sizes}" href="${whiteBgPath}">`)
} }
let themeSpecific = [ let themeSpecific = [