]> git.nbdom.net Git - nb.git/commitdiff
css, minify
authorNicolas Boisselier <nicolas.boisselier@gmail.com>
Fri, 13 Jan 2017 14:59:09 +0000 (14:59 +0000)
committerNicolas Boisselier <nicolas.boisselier@gmail.com>
Fri, 13 Jan 2017 14:59:09 +0000 (14:59 +0000)
bin/nb-commit
www/dbq/html/default.css
www/dbq/html/default.min.css
www/dbq/html/default.min.js
www/dbq/update.sh

index 2b46f74a1f2211b6ad2727f48957ddc07e4026ce..82f021941a5684866b98c698595ce038d5d04752 100755 (executable)
@@ -14,5 +14,7 @@ for f in www/*/update.sh; do
   [ -x "$f" ] || continue
   $f
 done
-#share/db/update.sh
+
+[ -z "$*" ] && exit 0
+share/db/update.sh
 which docker 1> /dev/null && docker run --rm -v $NB_ROOT:$NB_ROOT alpine sh -c "(. $NB_ROOT/etc/profile && nb_repos) >/dev/null && echo Docker: OK"
index c005bd3a87ec25ed83982ef89f94ed96f1198167..854e7d07400924058f371172c90eb05045cf0af9 100644 (file)
@@ -1,6 +1,6 @@
 html {
   font: 90% 'Trebuchet MS', sans-serif;
-  background-color: #F5F5F5;
+  background-color: #EEEEEE;
 }
 
 body {
@@ -82,28 +82,32 @@ form.edit,
 object, iframe, pre
 {
   border-radius: 4px;
-  border-collapse: separate;
+  border-collapse: collapse;
   border-spacing: 0;
 
   padding: 0.5em 0.2em;
   margin-bottom: 0.5em;
-  border: solid 1px #E5E5E5;
+  border: solid 1px #DDDDDD;
   background-color: #FAFAFA;
 
 }
+table.rows tr:nth-child(odd) td {
+  background: #EEEEEE;
+}
 
 .rows { padding: 0; }
+
 ul.row li, div.row div, table.rows th, table.rows td {
-  border-bottom: solid 1px #E5E5E5;
+  border-bottom: solid 1px #DDDDDD;
 }
 
 ul.row li, div.row div, table.rows tr:last-child td { border-bottom: none; }
-table.rows td
-{ padding: 0.3em 0.1em; }
+table.rows td { padding: 0.3em 0.3em; }
 
-/* To counter balance border corner */
+/* To counter balance border corner when no border collapse
 table.rows th { padding-top: 0; }
 table.rows tr:last-child td { padding-bottom: 0; }
+*/
 
 div.row div { margin: 0; }
 
@@ -131,7 +135,7 @@ ul.row li label, div.row div label {
        margin: 0;
   padding: 0 0.1em;
        cursor: pointer;
-  color: #F5F5F5;
+  color: #EEEEEE;
   background-color: #666;
   padding: 0.1em 0.3em;
   border: none;
@@ -153,7 +157,7 @@ form.menu .button.add {
 }
 
 form.menu .criterias {
-  border-top: dashed 1px #E5E5E5;
+  border-top: dashed 1px #DDDDDD;
   margin-top: 0.3em;
   padding-top: 0.3em;
 }
index 45c8c7c88985d75cbef9c3e11b20640456a12d5a..7ae1d03cdfa5701a24f6f2cec07ed675431d03b3 100644 (file)
@@ -1 +1 @@
-html{font:90% 'Trebuchet MS',sans-serif;background-color:#F5F5F5}body{display:table;margin-left:auto;margin-right:auto;padding-left:1em;padding-right:1em;color:#444}h1{margin:0 0 0.2em 0}a{color:inherit}p a,div > a,li a,td a{color:#E59B24}a,a:visited{text-decoration:none}ul{padding:0;margin:0}li{list-style:none;padding:0 0 0 0.3em}table{border-collapse:collapse}td,th{padding:0.2em 0.7em}th a.sort{padding:0 0.3em}textarea,select,input:not([type]),input[type='text'],input[type='password'],input[type='date'],input[type='email'],input[type='url'],input[type='']{border-radius:3px;border:solid 1px #ddd;padding:0.3em 0.4em}input[size]{max-width:70%}div.row div label:after,form label:after{content:':'}form label,form input,form select{vertical-align:middle;margin:0.2em 0.4em 0.2em 0}table.rows,div.row,ul.row,form.edit,.menu,.block,object,iframe,pre{border-radius:4px;border-collapse:separate;border-spacing:0;padding:0.5em 0.2em;margin-bottom:0.5em;border:solid 1px #E5E5E5;background-color:#FAFAFA}.rows{padding:0}ul.row li,div.row div,table.rows th,table.rows td{border-bottom:solid 1px #E5E5E5}ul.row li,div.row div,table.rows tr:last-child td{border-bottom:none}table.rows td{padding:0.3em 0.1em}table.rows th{padding-top:0}table.rows tr:last-child td{padding-bottom:0}div.row div{margin:0}ul.row li label,div.row div label{padding:0.1em 0.5em 0.1em 0;min-width:20%;display:inline-block}.menu,.nav,.rows,.buttons,.center{margin-left:auto;margin-right:auto;display:table}.button{font:inherit;display:inline-block;text-decoration:none;line-height:1.5em;cursor:pointer;border-radius:4px;white-space:nowrap;box-sizing:border-box;margin:0;padding:0 0.1em;cursor:pointer;color:#F5F5F5;background-color:#666;padding:0.1em 0.3em;border:none}a:hover,.button:hover{opacity:0.8}form.menu{padding:0.5em;background-color:#FAFAFA}form.menu .button.add{float:right;margin-top:0.1em}form.menu .criterias{border-top:dashed 1px #E5E5E5;margin-top:0.3em;padding-top:0.3em}form.menu .criterias span.label{border-right:solid 1px #fff;padding:0.2em 0.1em;margin:0.2em 0.2em 0 0;border-radius:3px}form.menu .criterias span.label:last-child{border-right:none}form.menu select:focus{max-width:auto}form.menu select{max-width:20%}form.menu .criterias input[type=text]:focus{width:auto}form.menu .criterias input[type=text]{width:4em}form.edit .fields label{width:25%;text-align:right;display:inline-block;margin-right:1em;vertical-align:top}form.edit .fields .label span{width:54%;display:inline-block;text-align:left}form.edit .fields input,form.edit .fields textarea,form.edit .fields select{width:65%}form.edit .fields label{width:25%;text-align:right;display:inline-block;margin-right:1em;vertical-align:top}form.edit .fields .label span{width:54%;display:inline-block;text-align:left}
\ No newline at end of file
+.button,a,a:visited{text-decoration:none}html{font:90% 'Trebuchet MS',sans-serif;background-color:#EEE}body{display:table;margin-left:auto;margin-right:auto;padding-left:1em;padding-right:1em;color:#444}h1{margin:0 0 .2em}a{color:inherit}div>a,li a,p a,td a{color:#E59B24}ul{padding:0;margin:0}li{list-style:none;padding:0 0 0 .3em}table{border-collapse:collapse}td,th{padding:.2em .7em}th a.sort{padding:0 .3em}input:not([type]),input[type=text],input[type=password],input[type=date],input[type=email],input[type=url],input[type=''],select,textarea{border-radius:3px;border:1px solid #ddd;padding:.3em .4em}input[size]{max-width:70%}div.row div label:after,form label:after{content:':'}form input,form label,form select{vertical-align:middle;margin:.2em .4em .2em 0}.block,.menu,div.row,form.edit,iframe,object,pre,table.rows,ul.row{border-radius:4px;border-collapse:collapse;border-spacing:0;padding:.5em .2em;margin-bottom:.5em;border:1px solid #DDD;background-color:#FAFAFA}table.rows tr:nth-child(odd) td{background:#EEE}.rows{padding:0}div.row div,table.rows td,table.rows th,ul.row li{border-bottom:solid 1px #DDD}div.row div,table.rows tr:last-child td,ul.row li{border-bottom:none}table.rows td{padding:.3em}div.row div{margin:0}div.row div label,ul.row li label{padding:.1em .5em .1em 0;min-width:20%;display:inline-block}.buttons,.center,.menu,.nav,.rows{margin-left:auto;margin-right:auto;display:table}.button{font:inherit;display:inline-block;line-height:1.5em;border-radius:4px;white-space:nowrap;box-sizing:border-box;margin:0;cursor:pointer;color:#EEE;background-color:#666;padding:.1em .3em;border:none}.button:hover,a:hover{opacity:.8}form.menu{padding:.5em;background-color:#FAFAFA}form.menu .button.add{float:right;margin-top:.1em}form.menu .criterias{border-top:dashed 1px #DDD;margin-top:.3em;padding-top:.3em}form.menu .criterias span.label{border-right:solid 1px #fff;padding:.2em .1em;margin:.2em .2em 0 0;border-radius:3px}form.menu .criterias span.label:last-child{border-right:none}form.menu select:focus{max-width:auto}form.menu select{max-width:20%}form.menu .criterias input[type=text]:focus{width:auto}form.menu .criterias input[type=text]{width:4em}form.edit .fields input,form.edit .fields select,form.edit .fields textarea{width:65%}form.edit .fields label{width:25%;text-align:right;display:inline-block;margin-right:1em;vertical-align:top}form.edit .fields .label span{width:54%;display:inline-block;text-align:left}
index fd7c5029ecfb278f69e62d2f575c4ccdaae8b7bc..9f9d79b38e4442d377074c9e653d3276da2b3862 100644 (file)
@@ -1,6 +1 @@
-function form_clean(e){var t
-for(i=0;i<e.length;i++)t=e.elements[i],"none"!=t.style.display&&("text"==t.type?t.value="":!t.type.match(/^select/)||"limit"!=t.name&&"format"!=t.name||(t.selectedIndex=0))}function form_submit_clean(e){var t=0,n="",o=e.getAttribute("action"),r=e.getAttribute("method")
-if("get"!=r)return!0
-for(t=0;t<e.length;t++){var i=e[t]
-i.name&&""!=i.value&&"undefined"!=i.value&&(n+=(n?"&":"?")+encodeURI(i.name)+"="+encodeURI(i.value))}return n=("?"==o?"":o)+n,e.reset(),window.location=n,!1}document.addEventListener("DOMContentLoaded",function(){NodeList.prototype.forEach=Array.prototype.forEach,document.querySelectorAll("form").forEach(function(e){e.onsubmit=function(){var e=this.elements.limit
-return e.value==window._dbq.default_limit&&e.removeAttribute("value"),form_submit_clean(this)}}),document.querySelectorAll("form.menu").forEach(function(e){e.setAttribute("action",window.location.toString().replace(/\?.*$/,"")),e.querySelectorAll("form.menu select.format").forEach(function(e){e.removeAttribute("name"),e.onchange=function(){return this.form.setAttribute("action",window._dbq["table.base"]+"."+this.value),this.form.onsubmit()}}),e.querySelectorAll("form.menu select.tables").forEach(function(e){e.removeAttribute("name"),e.onchange=function(){return this.form.setAttribute("action",window._dbq["db.base"]+"/"+this.value+".html"),this.form.onsubmit()}}),e.querySelectorAll("form.menu select.limit").forEach(function(e){e.onchange=function(){return this.form.onsubmit()}})}),document.querySelector(".nav.bottom")&&document.querySelector("table.rows")&&document.querySelector("table.rows").insertAdjacentHTML("beforebegin",'<div class="nav top">'+document.querySelector(".nav.bottom").innerHTML+"</div>"),document.querySelectorAll("form.menu input[type=submit]").forEach(function(e){e.insertAdjacentHTML("afterend",'&nbsp;<input type="button" class="clear '+e.className+'" onclick="form_clean(this.form)" value="Clear"/>'+(window._dbq["table.base"]?'&nbsp;<input type="button" class="add '+e.className+'" onclick="window.location=\''+window._dbq["table.base"]+'add/\'" value="Add"/>':""))})})
+function form_clean(e){var t;for(i=0;i<e.length;i++)t=e.elements[i],"none"!=t.style.display&&("text"==t.type?t.value="":!t.type.match(/^select/)||"limit"!=t.name&&"format"!=t.name||(t.selectedIndex=0))}function form_submit_clean(e){var t=0,n="",o=e.getAttribute("action"),r=e.getAttribute("method");if("get"!=r)return!0;for(t=0;t<e.length;t++){var i=e[t];i.name&&""!=i.value&&"undefined"!=i.value&&(n+=(n?"&":"?")+encodeURI(i.name)+"="+encodeURI(i.value))}return n=("?"==o?"":o)+n,e.reset(),window.location=n,!1}document.addEventListener("DOMContentLoaded",function(){NodeList.prototype.forEach=Array.prototype.forEach,document.querySelectorAll("form").forEach(function(e){e.onsubmit=function(){var e=this.elements.limit;return e.value==window._dbq.default_limit&&e.removeAttribute("value"),form_submit_clean(this)}}),document.querySelectorAll("form.menu").forEach(function(e){e.setAttribute("action",window.location.toString().replace(/\?.*$/,"")),e.querySelectorAll("form.menu select.format").forEach(function(e){e.removeAttribute("name"),e.onchange=function(){return this.form.setAttribute("action",window._dbq["table.base"]+"."+this.value),this.form.onsubmit()}}),e.querySelectorAll("form.menu select.tables").forEach(function(e){e.removeAttribute("name"),e.onchange=function(){return this.form.setAttribute("action",window._dbq["db.base"]+"/"+this.value+".html"),this.form.onsubmit()}}),e.querySelectorAll("form.menu select.limit").forEach(function(e){e.onchange=function(){return this.form.onsubmit()}})}),document.querySelector(".nav.bottom")&&document.querySelector("table.rows")&&document.querySelector("table.rows").insertAdjacentHTML("beforebegin",'<div class="nav top">'+document.querySelector(".nav.bottom").innerHTML+"</div>"),document.querySelectorAll("form.menu input[type=submit]").forEach(function(e){e.insertAdjacentHTML("afterend",'&nbsp;<input type="button" class="clear '+e.className+'" onclick="form_clean(this.form)" value="Clear"/>'+(window._dbq["table.base"]?'&nbsp;<input type="button" class="add '+e.className+'" onclick="window.location=\''+window._dbq["table.base"]+'add/\'" value="Add"/>':""))})});
index 5e4b551d14bb891252c627fbea6faafd0b9ae95a..7ac7a6816f04c46f604c891bbf3a1b8b8f86c68b 100755 (executable)
@@ -2,15 +2,10 @@
 set -e
 cd "$(dirname $0)" 
 
-minify -s '.min.' --no-comments html/
-exit
-
-# NB 27.12.16 alias minify='minify --no-comments'
-# NB 27.12.16 
-# NB 27.12.16 echo Create html/default.min.css
-# NB 27.12.16 minify -o html/default.min.css html/default.css
-# NB 27.12.16 echo
-# NB 27.12.16 
-# NB 27.12.16 echo Create html/default.min.js
-# NB 27.12.16 minify -o html/default.min.js html/default.js
-# NB 27.12.16 echo
+for f in $(find html -type f \( -name '*.css' -o -name '*.js' \) -a -not -name '*.min.*'); do
+  min=$(echo "$f" | sed 's/\./.min./')
+  ext="${f##*.}"
+  #echo minify --$ext " < $f > $min"
+  echo "$f"
+  eval minify --$ext < "$f" > "$min"
+done