Skip to content
This repository has been archived by the owner on Nov 20, 2018. It is now read-only.

Commit

Permalink
chore(build): cp non-js to _build
Browse files Browse the repository at this point in the history
Also created .editorconfig & renamed css files in client dir to match their output name.
#1569
  • Loading branch information
rnicholus committed Aug 6, 2016
1 parent 20f904c commit 053d4d5
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 4 deletions.
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,9 @@ lint:

_build:
mkdir $@

cp -pR $(SRC-DIR)/placeholders $@
cp $(SRC-DIR)/*.css $@
cp $(SRC-DIR)/*.gif $@

build-dnd-standalone: _build
$(NPM-BIN)/uglifyjs $(DND-FILES) -o $(BUILD-OUT-DIR)/dnd.js -b -e window:global --source-map $(BUILD-OUT-DIR)/dnd.js.map -p relative
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions test/dev/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,9 @@
<title>Fine Uploader Development</title>
<meta charset="utf-8" />
<link href="https://netdna.bootstrapcdn.com/twitter-bootstrap/2.1.0/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
<link href="../../client/fineuploader-gallery.css" rel="stylesheet" type="text/css"/>
<link href="../../client/fineuploader-new.css" rel="stylesheet" type="text/css"/>
<!--<link href="../../client/fineuploader.css" rel="stylesheet" type="text/css"/>-->
<link href="../../_build/fine-uploader-gallery.css" rel="stylesheet" type="text/css"/>
<link href="../../_build/fine-uploader-new.css" rel="stylesheet" type="text/css"/>
<!--<link href="../../_build/fine-uploader.css" rel="stylesheet" type="text/css"/>-->
<link href="styles.css" rel="stylesheet" type="text/css"/>
<script src="../../_build/all.fine-uploader.js"></script>
<script src="../../node_modules/pica/dist/pica.js"></script>
Expand Down

0 comments on commit 053d4d5

Please sign in to comment.