From 7624f2ab5b2621518e74ed336e360076d8de7c87 Mon Sep 17 00:00:00 2001 From: Sergei Eremenko Date: Thu, 8 Dec 2016 01:28:33 +0200 Subject: [PATCH] Add 'stop-color'. Prevent problems with '*-color' properties --- tools/_fix_color_scheme.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/_fix_color_scheme.sh b/tools/_fix_color_scheme.sh index fade4cc01d..959213ae3d 100755 --- a/tools/_fix_color_scheme.sh +++ b/tools/_fix_color_scheme.sh @@ -15,17 +15,17 @@ set -e add_class() { # add the class if a value matches: sed -i -r \ - -e '/(fill|color):#5c616c/ s/(style="\S+")/\1 class="ColorScheme-Text"/' \ - -e '/(fill|color):#5294e2/ s/(style="\S+")/\1 class="ColorScheme-Highlight"/' \ - -e '/(fill|color):#d3dae3/ s/(style="\S+")/\1 class="ColorScheme-ButtonBackground"/' \ + -e '/([^-]color|fill|stop-color):#5c616c/ s/(style="\S+")/\1 class="ColorScheme-Text"/' \ + -e '/([^-]color|fill|stop-color):#5294e2/ s/(style="\S+")/\1 class="ColorScheme-Highlight"/' \ + -e '/([^-]color|fill|stop-color):#d3dae3/ s/(style="\S+")/\1 class="ColorScheme-ButtonBackground"/' \ "$@" } add_class_dark() { # add the class if a value matches: sed -i -r \ - -e '/(fill|color):#d3dae3/ s/(style="\S+")/\1 class="ColorScheme-Text"/' \ - -e '/(fill|color):#5294e2/ s/(style="\S+")/\1 class="ColorScheme-Highlight"/' \ + -e '/([^-]color|fill|stop-color):#d3dae3/ s/(style="\S+")/\1 class="ColorScheme-Text"/' \ + -e '/([^-]color|fill|stop-color):#5294e2/ s/(style="\S+")/\1 class="ColorScheme-Highlight"/' \ "$@" } @@ -34,8 +34,9 @@ fix_color_and_fill() { # - remove color # - replace fill=#HEXHEX to fill=currentColor sed -i -r \ - -e '/class="ColorScheme-/ s/color:#([0-9a-zA-Z]{3}|[0-9a-zA-Z]{6});?//' \ + -e '/class="ColorScheme-/ s/[^-]color:#([0-9a-zA-Z]{3}|[0-9a-zA-Z]{6});?//' \ -e '/class="ColorScheme-/ s/fill:#([0-9a-zA-Z]{3}|[0-9a-zA-Z]{6});?/fill:currentColor;/' \ + -e '/class="ColorScheme-/ s/stop-color:#([0-9a-zA-Z]{3}|[0-9a-zA-Z]{6});?/stop-color:currentColor;/' \ "$@" }