devuan-sdk
/
webnomad
mirror of https://github.com/dyne/webnomad.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes to flowtype and theme inclusion

This commit is contained in:
Jaromil 2014-10-19 17:45:59 +02:00
parent 85f04503b9
commit c7f194f2b1
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
render
View File

@ -109,7 +109,7 @@ render_header() {
<!-- Bootstrap --> <!-- Bootstrap -->
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link href="${baseurl}/css/bootstrap.min.css" rel="stylesheet" /> <link href="${baseurl}/css/bootstrap.min.css" rel="stylesheet" />
<link href="${baseurl}/css/bootstrap-responsive.min.css" rel="stylesheet" /> <link href="${baseurl}/css/bootstrap-responsive.css" rel="stylesheet" />
EOF EOF
{ test -r "$DIR"/views/css/custom.css } && { { test -r "$DIR"/views/css/custom.css } && {
@ -276,7 +276,9 @@ render_html() {
# extra js for html pages # extra js for html pages
[[ "$FLOWTYPE" = "" ]] || { [[ "$FLOWTYPE" = "" ]] || {
includejs+=(flowtype.js) } includejs+=(jquery.min.js)
includejs+=(flowtype.js)
}
# clean up from temporary files # clean up from temporary files
rm -f tmp.* rm -f tmp.*
@ -336,11 +338,11 @@ calc_dest() {
mkdir -p "$destination/css" mkdir -p "$destination/css"
mkdir -p "$destination/js" mkdir -p "$destination/js"
{ test -r "$destination"/css/bootstrap.css } || { #{ test -r "$destination"/css/bootstrap.css } || {
cp "$SYS"/css/bootstrap.css "$destination"/css/ cp "$SYS"/css/bootstrap.css "$destination"/css/
cp "$SYS"/css/bootstrap.min.css "$destination"/css/ cp views/css/bootstrap.min.css "$destination"/css/
cp "$SYS"/css/bootstrap-responsive.css "$destination"/css/ cp "$SYS"/css/bootstrap-responsive.css "$destination"/css/
} #}
cp "$SYS"/js/bootstrap.min.js "$destination"/js/ cp "$SYS"/js/bootstrap.min.js "$destination"/js/
cp "$SYS"/js/html5.js "$destination"/js/ cp "$SYS"/js/html5.js "$destination"/js/