Mercurial > kallithea
view scripts/whitespacecleanup.sh @ 7169:7d02958345ff
diff: fix 2-way diff panes not being shown side by side
eee7674cef41 had the side effect of setting overflow styling on the DOM
elements used by mergely. That confused it's computation of sizes on some
browsers, scroll bars got added, and the panes were re-flowed to not be
side-by-side.
To fix that, add an exception that allow overflow-x to be set to visible.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Thu, 15 Feb 2018 00:23:52 +0100 |
parents | 322ce5147fe0 |
children | a5a9ded8c673 |
line wrap: on
line source
#!/bin/bash -x # Enforce some consistency in whitespace - just to avoid spurious whitespaces changes files=`hg mani | egrep -v '/codemirror/|/fontello/|/email_templates/|(/lockfiles.py|^LICENSE-MERGELY.html|^docs/Makefile|^scripts/whitespacecleanup.sh|/(graph|mergely|native.history|select2/select2|yui.flot|jquery.flot.*|yui.2.9|jquery.dataTables)\.js|/test_dump_html_mails.ref.html|\.png|\.gif|\.ico|\.pot|\.po|\.mo|\.tar\.gz|\.diff)$'` sed -i "s/`printf '\r'`//g" $files sed -i -e "s,`printf '\t'`, ,g" $files sed -i -e "s, *$,,g" $files sed -i -e 's,\([^ ]\)\\$,\1 \\,g' -e 's,\(["'"'"']["'"'"']["'"'"']\) \\$,\1\\,g' $files # ensure one trailing newline - remove empty last line and make last line include trailing newline: sed -i -e '$,${/^$/d}' -e '$a\' $files sed -i -e 's,\([^ /]\){,\1 {,g' `hg loc '*.css'` sed -i -e 's|^\([^ /].*,\)\([^ ]\)|\1 \2|g' `hg loc '*.css'` sed -i -e 's/^\( [^: ]*\) *: *\([^/]\)/\1: \2/g' kallithea/public/css/{style,contextbar}.css sed -i -e '1s|, |,|g' kallithea/public/css/{style,contextbar}.css sed -i -e 's/^\([^ ,/]\+ [^,]*[^ ,]\) *, *\(.\)/\1,\n\2/g' kallithea/public/css/{style,contextbar}.css sed -i -e 's/^\([^ ,/].*\) */\1 /g' kallithea/public/css/{style,contextbar}.css sed -i -e 's,[ ][ ]*$,,g' -e 's, , ,g' kallithea/public/js/graph.js hg mani | xargs chmod -x hg loc 'set:!binary()&grep("^#!")&!(**_tmpl.py)&!(**/template**)' | xargs chmod +x hg diff