Skip to content

Commit

Permalink
Merge pull request #20 from thielCole/update/gruntfileFix
Browse files Browse the repository at this point in the history
Fixed gruntfile issue
  • Loading branch information
Andrew Cole authored and Andrew Cole committed Nov 17, 2015
2 parents 8fb0af4 + e2554f1 commit 4bb4d45
Show file tree
Hide file tree
Showing 4 changed files with 8,835 additions and 11 deletions.
7 changes: 4 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ module.exports = function (grunt) {
'<%= yeoman.app %>/*.html',
'{.tmp,<%= yeoman.app %>}/styles/{,*/}*.css',
'{.tmp,<%= yeoman.app %>}/scripts/{,*/}*.js',
'<%= yeoman.app %>/images/{,*/}*.{png,jpg,jpeg,webp}'
'<%= yeoman.app %>/img/UI_icons/{,*/}*.{png,jpg,jpeg,webp}'
],
tasks: ['livereload']
}
Expand Down Expand Up @@ -184,9 +184,10 @@ module.exports = function (grunt) {
dist: {
files: [{
expand: true,
cwd: '<%= yeoman.app %>/images',
cwd: '<%= yeoman.app %>/img/UI_icons/',

src: '{,*/}*.{png,jpg,jpeg}',
dest: '<%= yeoman.dist %>/images'
dest: '<%= yeoman.dist %>/img/UI_icons/'
}]
}
},
Expand Down
6 changes: 0 additions & 6 deletions app/bundles/app/strut.slide_editor/view/OperatingTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,6 @@ define(['libs/backbone',
actualAvailableWidthforSlideContainer = actualAvailableHeightforSlideContainer * (16 / 9);
}



console.log($("div.slideContainer.ui-selectable").height(actualAvailableHeightforSlideContainer).width(actualAvailableWidthforSlideContainer).css("margin", "0 auto"));
console.log(actualAvailableWidthforSlideContainer);
console.log(actualAvailableHeightforSlideContainer);
console.log(actualAvailableWidthforSlideContainer/actualAvailableHeightforSlideContainer);
});

this._$slideContainer = $('<div class="slideContainer"></div>')
Expand Down
4 changes: 2 additions & 2 deletions app/preview_export/reveal.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<script src="reveal/lib/js/head.min.js"></script>
<script src="reveal/js/reveal.js"></script>
<script src="scripts/onready.js"></script>
<script src="../scripts/libs/jQuery.js"></script>
<script src="scripts/jQuery.js"></script>
<script src="scripts/loadPresentation.js"></script>
<script>
ready(function() {
Expand Down Expand Up @@ -105,7 +105,7 @@
// { src: 'reveal/plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
// { src: 'reveal/plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
// { src: 'reveal/plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
{ src: '../scripts/libs/jQuery.js', async: true},
{ src: 'scripts/jQuery.js', async: true},
{ src: 'scripts/extendedReveal.js', async: true},
{ src: 'reveal/plugin/zoom-js/zoom.js', async: true, condition: function() { return !!document.body.classList; } },
{ src: 'reveal/plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } }
Expand Down
Loading

0 comments on commit 4bb4d45

Please sign in to comment.