diff options
| -rwxr-xr-x | assets/css/compile.sh | 2 | ||||
| -rwxr-xr-x | assets/images/polyguin.sh | 4 | ||||
| -rwxr-xr-x | publish | 6 | ||||
| -rw-r--r-- | src/contact/index.html | 4 | ||||
| -rw-r--r-- | src/contact/social.html | 6 | ||||
| -rw-r--r-- | src/download/index.html | 4 | ||||
| -rw-r--r-- | src/standards/index.html | 6 |
7 files changed, 21 insertions, 11 deletions
diff --git a/assets/css/compile.sh b/assets/css/compile.sh index 66d79de..34b63f3 100755 --- a/assets/css/compile.sh +++ b/assets/css/compile.sh @@ -1,7 +1,7 @@ #!/bin/sh -e HERE=$(dirname $(readlink -f ${0})); -NODE=23.0.0-alpine3.19; # https://hub.docker.com/_/node +NODE=23.9.0-alpine3.21; # https://hub.docker.com/_/node cd ${HERE}; diff --git a/assets/images/polyguin.sh b/assets/images/polyguin.sh index dc974f5..7b4a7fa 100755 --- a/assets/images/polyguin.sh +++ b/assets/images/polyguin.sh @@ -88,8 +88,8 @@ grep fill: polyguin.svg \ #=============================================================== -docker run -v$(pwd):/x -w/x --rm -i alpine:3.17 <<'EOF' -apk add graphicsmagick imagemagick; +docker run -v$(pwd):/x -w/x --rm -i alpine:3.21 <<'EOF' +apk add graphicsmagick imagemagick imagemagick-svg; #=============================================================== #--------------------------------------------------------------- @@ -37,7 +37,9 @@ fi # LOGO if test ${HTML} -eq 1; then #=============================================================== -docker run -v ${HERE}:${HERE} -e HERE=${HERE} -v ${TEMP}:${TEMP} -e TEMP=${TEMP} --rm -i alpine:3.17 <<'EOF' +# FIXME: cannot update to 3.19 (or newer) else PSD images break; +# missing PSD coder support? Alpine needs subpackge maybe?? +docker run -v ${HERE}:${HERE} -e HERE=${HERE} -v ${TEMP}:${TEMP} -e TEMP=${TEMP} --rm -i alpine:3.18 <<'EOF' apk add findutils imagemagick; #=============================================================== @@ -47,7 +49,7 @@ apk add findutils imagemagick; find ${HERE} -type f -name "*.psd" | while read k; do f="${k#*${HERE}}"; mkdir -p "${TEMP}${f%/*}"; - convert "${k}[0]" -strip "${TEMP}${f%*.psd}.jpg"; + magick "${k}[0]" -strip "${TEMP}${f%*.psd}.jpg"; done ## diff --git a/src/contact/index.html b/src/contact/index.html index 115429d..9f052aa 100644 --- a/src/contact/index.html +++ b/src/contact/index.html @@ -91,8 +91,8 @@ __HEADER__ <div class="container"> <div class="row text-left"> <div class="col-12 col-sm-10 offset-sm-1 col-md-8 offset-md-2 col-lg-6 offset-lg-3"> - <h4 class="font-weight-normal">Enterprise Support</h4> - <p>Please email <code>consulting@adelielinux.org</code> for more information.</p> + <h4 class="font-weight-normal">Enterprise Support and Security Matters</h4> + <p>Please email <code>consulting@</code> or <code>security@</code>, respectively.</p> </div> </div><!-- end row --> </div><!-- end container --> diff --git a/src/contact/social.html b/src/contact/social.html index 70e4de6..73c3e26 100644 --- a/src/contact/social.html +++ b/src/contact/social.html @@ -43,6 +43,12 @@ __HEADER__ <div class="section padding-top-0"> <div class="container"> <div class="row icon-5xl text-center"> + <a class="col-12 col-md-6 col-lg-4 margin-top-30" href="https://discord.gg/bvQj6249wu"> + <div class="border-all border-radius padding-40 hover-shadow"> + <i class="ti-thought text-dark"></i> + <h5 class="font-weight-normal margin-top-20">Discord</h5> + </div> + </a> <a class="col-12 col-md-6 col-lg-4 margin-top-30" href="https://old.reddit.com/r/AdelieLinux/"> <div class="border-all border-radius padding-40 hover-shadow"> <i class="ti-reddit text-dark"></i> diff --git a/src/download/index.html b/src/download/index.html index bb183b4..2867050 100644 --- a/src/download/index.html +++ b/src/download/index.html @@ -398,8 +398,8 @@ __FOOTER__ */ version = "1.0"; - release = "beta5"; - gendate = "20240426"; + release = "beta6"; + gendate = "20241223"; disturl = "//distfiles.adelielinux.org/adelie"; inittext = "Adélie" + " " + version + "-" + release + " (" + gendate + ")"; diff --git a/src/standards/index.html b/src/standards/index.html index 3ef2b4c..aa9b094 100644 --- a/src/standards/index.html +++ b/src/standards/index.html @@ -32,12 +32,14 @@ __HEADER__ <div class="section-lg"> <div class="container"> <div class="margin-bottom-0"> - <div class="row text-center"> + <div class="row text-left"> <div class="col-12 col-md-10 offset-md-1 col-lg-8 offset-lg-2"> <h2>Community Standards</h2> <p>We are committed to providing a welcoming and inspiring community for all.</p> <br /> - <p>This page outlines expectations for participation in the Adélie communities and procedures for reporting unacceptable behavior. Moderation and disciplinary action may occur at our discretion.</p> + <p>This page outlines expectations for participation in the Adélie communities and procedures for reporting unacceptable behavior.</p> + <br /> + <p>This code of conduct is based on the template established by the TODO Group and used by other large communities. Moderation and disciplinary action may occur at our discretion.</p> </div> </div> </div> |