.githooks/pre-commit

diff --git a/.githooks/pre-commit b/.githooks/pre-commit
index a6f7476041b1db37787149994241a56cb340c49e..15546923ec91b27b13ea1852366187445503f64f 100755 (executable)
--- a/.githooks/pre-commit
+++ b/.githooks/pre-commit
@@ -8,39 +8,40 @@
 
 echo "Run $0"
 
-if which minify > /dev/null; then
-       MINIFY=""
-       [ -z "$MINIFY" ] && minify --help | grep -q '\-\-css' && MINIFY="ext"
-       [ -z "$MINIFY" ] && minify --help | grep -q '\-\-output' && MINIFY="out"
-       [ -z "$MINIFY" ] || git status --porcelain | sed 's/^ . //' | while read file; do
-               ext=""
-               case "$file" in
-                       *.min.*) continue ;;
-                       *.css) ext=css ;;
-                       *.js) ext=js ;;
-                       *) continue;
-               esac
-               min="$(echo "$file" | sed -E 's/\.([^\.]+)$/.min.\1/')"
-               [ -w "$min" ] || continue
-
-               echo "  Minify $file"
-
-               if [ "$MINIFY" = "ext" ]; then
-                       #echo "minify --$ext < "$file" > "$min.tmp""
-                       minify --$ext < "$file" > "$min.tmp"
-               elif [ "$MINIFY" = "out" ]; then
-                       #echo "minify "$file" --output "$min.tmp""
-                       minify "$file" --output "$min.tmp" > /dev/null
-               fi
-
-               if [ "$?" = "0" ]; then
-                       #echo "cat "$min.tmp" > "$min""
-                       cat "$min.tmp" > "$min"
-               fi
-
-               rm "$min.tmp"
-
-       done
-fi
+which minify > /dev/null || exit
+MINIFY=""
+[ -z "$MINIFY" ] && minify --help 2>&1| grep -q '\-\-css' && MINIFY="ext"
+[ -z "$MINIFY" ] && minify --help 2>&1| grep -q '\-\-output' && MINIFY="out"
+[ -n "$MINIFY" ] || exit
+
+git status --porcelain | sed 's/^ . //' | while read file; do
+       ext=""
+       case "$file" in
+               *.min.*) continue ;;
+               *.css) ext=css ;;
+               *.js) ext=js ;;
+               *) continue;
+       esac
+       min="$(echo "$file" | sed -E 's/\.([^\.]+)$/.min.\1/')"
+       [ -w "$min" ] || continue
+
+       echo "  Minify $file"
+
+       if [ "$MINIFY" = "ext" ]; then
+               #echo "minify --$ext < "$file" > "$min.tmp""
+               minify --$ext < "$file" > "$min.tmp"
+       elif [ "$MINIFY" = "out" ]; then
+               #echo "minify "$file" --output "$min.tmp""
+               minify "$file" --output "$min.tmp" > /dev/null
+       fi
+
+       if [ "$?" = "0" ]; then
+               #echo "cat "$min.tmp" > "$min""
+               cat "$min.tmp" > "$min"
+       fi
+
+       rm "$min.tmp"
+
+done
 
 true

diff --git a/www/dbq/html/default.css b/www/dbq/html/default.css
index 8ca0740a9f88fe6742ad2afc6cc24bbb3a8526cc..3317fae52aa66e7eddcb99c2b3560d1cc44fb380 100644 (file)
--- a/www/dbq/html/default.css
+++ b/www/dbq/html/default.css
@@ -121,6 +121,7 @@ a.active, .active a {
        display: list-item;
 }
 
+.todel-test3,
 .db-rows div.list .list.item.capitalize {
        text-transform: capitalize;
        list-style: circle inside none;