From 0aa632f866900263d36c238ffe1a0e914a65dbcf Mon Sep 17 00:00:00 2001 From: Morne Alberts Date: Wed, 30 Mar 2022 21:24:36 +0200 Subject: [PATCH 1/2] Fix abs() issue with Bootstrap 4.6.1 --- resources/styles/_functions.scss | 2 +- resources/styles/_mixins.scss | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/styles/_functions.scss b/resources/styles/_functions.scss index 037bf0f8..9d599c83 100644 --- a/resources/styles/_functions.scss +++ b/resources/styles/_functions.scss @@ -11,7 +11,7 @@ // // @param $value a value in rem or px // @return unitless px value -@function abs( $value ) { +@function rem-to-px( $value ) { @if (type-of($value) == "number") and ($value != 0) { $unit: unit($value); diff --git a/resources/styles/_mixins.scss b/resources/styles/_mixins.scss index 031ccab3..5a61f8f4 100644 --- a/resources/styles/_mixins.scss +++ b/resources/styles/_mixins.scss @@ -53,8 +53,8 @@ // top vertically (or as far down as possible given the diameter) @mixin bullet( $color: $list-bullet-color, $width: $list-bullet-size, $height: $font-size-base ) { - $width: abs($width); - $height: abs($height); + $width: rem-to-px($width); + $height: rem-to-px($height); list-style: outside disc url("data:image/svg+xml;charset=UTF-8,"); // IE hack: IE < 9 does not properly work with SVGs. Serve them some fallback PNG. list-style-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAJCAYAAAARml2dAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABUSURBVAiZdY4xDsAgFELB2J0DdnbwQI5OHvDfgC62SY0yvhAetI1dWEq5JN0kKwDYbhEx8oT9a5JdEtLb/M2QNW0FAJLttkLbLUfEkIRVztPdo+MBm8UkW9Zxc20AAAAASUVORK5CYII=")#{"\9"}; From aec9ba02d9ad969a7c2191079e40445e4fcf7180 Mon Sep 17 00:00:00 2001 From: Morne Alberts Date: Wed, 30 Mar 2022 21:27:31 +0200 Subject: [PATCH 2/2] Bump version --- docs/release-notes.md | 6 ++++++ skin.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/release-notes.md b/docs/release-notes.md index b405b1e8..bb20128e 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -1,5 +1,11 @@ ## Release Notes +### Chameleon 3.4.3 + +Released on March 30, 2022. + +* Fixed Bootstrap 4.6.1 compatibility (thanks @malberts) + ### Chameleon 3.4.2 Released on March 18, 2022. diff --git a/skin.json b/skin.json index 6221891a..b0b9a674 100644 --- a/skin.json +++ b/skin.json @@ -6,7 +6,7 @@ "[https://www.mediawiki.org/wiki/User:F.trott Stephan Gambke]", "[https://professional.wiki/ Professional.Wiki]" ], - "version": "3.4.2", + "version": "3.4.3", "url": "https://www.mediawiki.org/wiki/Skin:Chameleon", "descriptionmsg": "chameleon-desc", "license-name": "GPL-3.0-or-later",