diff options
| -rw-r--r-- | Gruntfile.js | 4 | ||||
| -rw-r--r-- | dist/index.html | 44 | ||||
| -rw-r--r-- | package.json | 2 |
3 files changed, 6 insertions, 44 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 04c7809..5ef6d87 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -5,11 +5,13 @@ module.exports = function(grunt) { pkg: grunt.file.readJSON('package.json'), dentist: { options: { - include: "app.min.js" + include_js: "app.min.js", + include_css: "app.css" }, build: { src: 'shader-combo.html', dest_js: 'dist/app.init.js', + dest_css: 'dist/app.css', dest_html: 'dist/index.html' } }, diff --git a/dist/index.html b/dist/index.html index c0126fa..26d4192 100644 --- a/dist/index.html +++ b/dist/index.html @@ -1,48 +1,8 @@ <!doctype html> <html> <head> -<style type="text/css"> -body { background: #f8f8f8; font-size: 14px } -div { float: left; padding: 10px;} -form { display: inline-block; } -a { color: #00f; } -#url { width: 250px; } -#width,#height,#framecount,#framedelay,#frameinterval,#background { width: 30px; text-align: right; } -#background { text-align: left; } -#username { width: 55px; } -#shader-name { width: 75px; } -#shader-id { width: 40px; } -#shader { width: 400px; height: 247px; font-family: fixed; } -#uploaded-url { display: none; width: 400px; } -#uploaded-url + br { display: none; } -#header { clear: right; width:100%; padding: 0; font-size: 12px; } -#shader-gallery,#gallery-images { display: block; height: 152px; overflow-y: auto; width: 100%; padding: 0; border-bottom: 1px solid #ccc; } -#shader-gallery img,#shader-gallery canvas,#gallery-images img, #gallery-images canvas { max-width: 200px; height: 100px; margin: 5px; cursor: pointer; clear: right; } -.shader { width: 100px; } -.shader span { display: block } -#help { float: right; } -.dragging { cursor: -webkit-grabbing !important; } -.ui-sortable-helper { cursor: -webkit-grabbing !important; } -#instructions { position: absolute;top:20px;right:20px; width:190px;height:465px; box-shadow:5px 5px 10px rgba(0,0,0,0.3); background:rgba(255,255,255,0.8); display: none; cursor: -webkit-grab; } -#instructions iframe {width: 100%;height:100%;margin:0;padding:0;border:0;} -#instructions.dragging iframe { pointer-events: none; } -#instructions .close { position: absolute; top: 5px; right: 5px; color: #f00; padding: 3px; border: 0;background: white; font-size: 10px; line-height: 10px; } -#frame-controls { display: none; } -#frames { display: block; width: 404px; max-height: 150px; overflow: auto; border: 1px solid #ddd; line-height: 0; } -#frames div { margin: 1px; padding: 0; position: relative; border: 1px solid #eee; cursor: -webkit-grab; } -#frames canvas { display: block } -#frames .remove { position: absolute; top: 5px; right: 5px; color: #f00; padding: 3px; border: 0;background: white; font-size: 10px; line-height: 10px; } -.paused { background: black; color: white; border-width: 1px; padding: 1px 3px 2px 4px; outline: 0 !important; } -.active { background: black; color: white; border-width: 1px; padding: 1px 4px 2px 4px; outline: 0 !important; } -.hidden { display: none; } -.form { display: none; border-left: 1px solid #ddd; padding-left: 5px; margin-left: 2px; } -.bold { font-weight: bold; } -.close,.remove { cursor: pointer; } -.status { font-size: 12px; } -#render,#save,#upload,#save-shader { font-weight: bold; } -#save[disabled],#upload[disabled] { font-weight: normal; } -</style> -</head> +<style type="text/css"></style> +<link rel="stylesheet" type="text/css" href="app.css"></head> <body> <div id="header"> <button id="help">help</button> diff --git a/package.json b/package.json index 53a3c10..237f408 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,6 @@ "grunt-contrib-watch": "~0.5.3", "grunt-contrib-clean": "~0.5.0", "grunt-contrib-copy": "~0.5.0", - "grunt-dentist": "~0.2.0" + "grunt-dentist": "~0.3.0" } } |