diff --git a/Makefile b/Makefile index a5f5afe301..c61fd3c319 100644 --- a/Makefile +++ b/Makefile @@ -154,19 +154,23 @@ _i18n_merge: bootstrap-upgrade: @if [ -z "$(version)" ]; then echo "You forgot the 'version=x.x.x' argument."; exit 1; fi - wget https://github.com/twbs/bootstrap-sass/archive/v$(version).tar.gz -O bootstrap-sass-$(version).tar.gz - tar -xaf bootstrap-sass-$(version).tar.gz - rm -rf www/assets/bootstrap/{fonts,js}/* - mv bootstrap-sass-$(version)/assets/javascripts/bootstrap.min.js www/assets/bootstrap/js - mv bootstrap-sass-$(version)/assets/fonts/bootstrap/* www/assets/bootstrap/fonts - rm -rf style/bootstrap - mv bootstrap-sass-$(version)/assets/stylesheets/bootstrap style + wget https://github.com/twbs/bootstrap/archive/v$(version).tar.gz -O bootstrap-$(version).tar.gz + tar -xaf bootstrap-$(version).tar.gz + rm -rf www/assets/bootstrap/js/* + mv bootstrap-$(version)/dist/js/bootstrap.min.js www/assets/bootstrap/js + rm -rf style/bootstrap/* + mv bootstrap-$(version)/scss/{_*,*/} style/bootstrap + mv style/{bootstrap/_,}functions.scss mv style/{bootstrap/_,}variables.scss - git add style/bootstrap www/assets/bootstrap + git add style/functions.scss style/bootstrap www/assets/bootstrap + echo -e "[---]\n[---] text/css via scss" | cat - bootstrap-$(version)/scss/bootstrap.scss \ + | sed -e 's|^@import "|@import "style/bootstrap/|' -e 's|"style/bootstrap/functions"|style/functions|' -e 's|"style/bootstrap/variables"|style/variables|' \ + >www/assets/bootstrap/css/bootstrap.css.spt + git add -p www/assets/bootstrap/css/bootstrap.css.spt git commit -m "upgrade Bootstrap to $(version)" git commit -p style/variables.scss -m "merge upstream changes into variables.scss" git checkout -q HEAD style/variables.scss - rm -rf bootstrap-sass-$(version){,.tar.gz} + rm -rf bootstrap-$(version){,.tar.gz} stripe-bridge: PYTHONPATH=. $(with_local_env) $(env_py) cli/stripe-bridge.py diff --git a/liberapay/wireup.py b/liberapay/wireup.py index fba0d96764..69629027cc 100644 --- a/liberapay/wireup.py +++ b/liberapay/wireup.py @@ -821,7 +821,7 @@ def load_scss_variables(project_root): # Get the names of all the variables with open(project_root + '/style/variables.scss') as f: variables = f.read() - names = [m.group(1) for m in re.finditer(r'^\$([\w-]+):', variables, re.M)] + names = [m.group(1) for m in re.finditer(r'^\$([\w-]+): +(?!(map-merge)?\()', variables, re.M)] # Compile a big rule that uses all the variables props = ''.join('-x-{0}: ${0};'.format(name) for name in names) css = sass.compile(string=('%s\nx { %s }' % (variables, props))) diff --git a/simplates/refresh.spt b/simplates/refresh.spt index 6d18908738..a678c35f2c 100644 --- a/simplates/refresh.spt +++ b/simplates/refresh.spt @@ -22,7 +22,7 @@ response.headers[b'Refresh'] = refresh_header -