Skip to content

Commit

Permalink
Merge pull request #98 from aryaapp/mf/pdfv2
Browse files Browse the repository at this point in the history
Switching to pdfmake
  • Loading branch information
m20io committed Feb 11, 2016
2 parents 67d4a93 + 9e00dbf commit 3b5925e
Show file tree
Hide file tree
Showing 13 changed files with 68,304 additions and 94 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"d3": "^3.5.9",
"es6-promise": "^3.0.2",
"fstream": "^1.0.8",
"fullpage.js": "^2.7.4",
"history": "^1.17.0",
"isomorphic-fetch": "^2.2.0",
"jquery": "^2.1.4",
Expand Down Expand Up @@ -49,6 +48,7 @@
"reselect": "^2.0.3"
},
"devDependencies": {
"aliasify": "^1.9.0",
"babel": "^6.0.15",
"babel-core": "^6.4.0",
"babel-loader": "^6.2.1",
Expand Down
Binary file added src/images/emo-c1_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/emo-c2_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/emo-c3_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/emo-c4_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/emo-c5_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions src/javascript/utilities/index.js

Large diffs are not rendered by default.

220 changes: 133 additions & 87 deletions src/javascript/views/JournalPdfView.js

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion src/static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
<script src="/lib/modernizr.js"></script>
<script src="/lib/jquery.slimscroll.min.js"></script>
<script src="/lib/transition.js"></script>
<script src="/lib/collapse.js"></script>
<script src="/lib/pdfmake.min.js"></script>
<script src="/lib/vfs_fonts.js"></script>


<!-- <link rel="stylesheet" type="text/css" href="jquery.fullPage.css" /> -->
Expand Down
Loading

0 comments on commit 3b5925e

Please sign in to comment.