Moved images also to /dist

This commit is contained in:
jos 2015-02-28 21:02:39 +01:00
parent 12214f930a
commit d9939177dd
6 changed files with 20 additions and 19 deletions

16
dist/jsoneditor.css vendored
View File

@ -33,12 +33,12 @@
}
.jsoneditor .field.empty {
background-image: url("../img/jsoneditor-icons.png");
background-image: url("img/jsoneditor-icons.png");
background-position: 0 -144px;
}
.jsoneditor .value.empty {
background-image: url("../img/jsoneditor-icons.png");
background-image: url("img/jsoneditor-icons.png");
background-position: -48px -144px;
}
@ -87,7 +87,7 @@
margin: 0;
border: none;
cursor: pointer;
background: transparent url("../img/jsoneditor-icons.png");
background: transparent url("img/jsoneditor-icons.png");
}
.jsoneditor div.tree button.collapsed {
@ -182,7 +182,7 @@
}
.jsoneditor div.tree button.dragarea {
background: url("../img/jsoneditor-icons.png") -72px -72px;
background: url("img/jsoneditor-icons.png") -72px -72px;
cursor: move;
}
@ -280,7 +280,7 @@
border: none;
padding: 0;
margin: 0;
background-image: url("../img/jsoneditor-icons.png");
background-image: url("img/jsoneditor-icons.png");
}
.jsoneditor-contextmenu ul li button div.expand {
@ -289,7 +289,7 @@
height: 24px;
padding: 0;
margin: 0 4px 0 0;
background: url("../img/jsoneditor-icons.png") 0 -72px;
background: url("img/jsoneditor-icons.png") 0 -72px;
opacity: 0.4;
}
@ -463,7 +463,7 @@
padding: 0;
border-radius: 2px;
border: 1px solid #aec0f8;
background: #e3eaf6 url("../img/jsoneditor-icons.png");
background: #e3eaf6 url("img/jsoneditor-icons.png");
color: #4D4D4D;
opacity: 0.8;
font-family: arial, sans-serif;
@ -592,7 +592,7 @@
padding: 0;
margin: 0;
border: none;
background: url("../img/jsoneditor-icons.png");
background: url("img/jsoneditor-icons.png");
vertical-align: top;
}

File diff suppressed because one or more lines are too long

View File

@ -14,6 +14,8 @@ var IMAGE = './src/css/img/jsoneditor-icons.png';
var DIST = './dist';
var FILE = 'jsoneditor.js';
var FILE_MAP = 'jsoneditor.map';
var FILE_CSS = 'jsoneditor.css';
var FILE_MIN_CSS = 'jsoneditor.min.css';
var JSONEDITOR_JS = DIST + '/' + FILE;
var JSONEDITOR_MIN_JS = DIST + '/jsoneditor.min.js';
var JSONEDITOR_MAP_JS = DIST + '/' + FILE_MAP;
@ -87,11 +89,11 @@ gulp.task('bundle-css', ['mkdir'], function () {
'src/css/menu.css',
'src/css/searchbox.css'
])
.pipe(concatCss(JSONEDITOR_CSS))
.pipe(gulp.dest('.'))
.pipe(concatCss(JSONEDITOR_MIN_CSS))
.pipe(concatCss(FILE_CSS))
.pipe(gulp.dest(DIST))
.pipe(concatCss(FILE_MIN_CSS))
.pipe(minifyCSS())
.pipe(gulp.dest('.'));
.pipe(gulp.dest(DIST));
gutil.log('bundled ' + JSONEDITOR_CSS);
gutil.log('bundled ' + JSONEDITOR_MIN_CSS);
@ -118,8 +120,7 @@ gulp.task('minify', ['bundle'], function () {
// TODO: zip file using archiver
var pkg = 'jsoneditor-' + require('./package.json').version + '.zip';
gulp.task('zip', shell.task([
'zip ' + pkg + ' ' +
'README.md NOTICE LICENSE HISTORY.md jsoneditor.js jsoneditor.css jsoneditor.min.js jsoneditor.min.css jsoneditor.map img docs examples -r '
'zip ' + pkg + ' ' + 'README.md NOTICE LICENSE HISTORY.md dist docs examples -r '
]));
// The default task (called when you run `gulp`)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

View File

@ -3,8 +3,8 @@
<head>
<!--<meta http-equiv="Content-Type" content="text/html;charset=utf-8">-->
<script src="../jsoneditor.js"></script>
<link rel="stylesheet" type="text/css" href="../jsoneditor.css">
<link href="../dist/jsoneditor.css" rel="stylesheet" type="text/css">
<script src="../dist/jsoneditor.js"></script>
<style>
body {

View File

@ -3,8 +3,8 @@
<head>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
<script src="../jsoneditor.min.js"></script>
<link rel="stylesheet" type="text/css" href="../jsoneditor.min.css">
<link href="../dist/jsoneditor.min.css" rel="stylesheet" type="text/css">
<script src="../dist/jsoneditor.min.js"></script>
<style type="text/css">
body {