Skip to content

Commit

Permalink
Bug fixes for Grunt (RocketMap#579)
Browse files Browse the repository at this point in the history
* Added npm and grunt, added node_modules/ to git ignore

* Adjusted side to the left

* Updated Grunt to minify CSS and JS, references on maps.html updated

* Added minified css and js to gitignore

* changed to having dist/ folder instead

* Fixed grunt issues, adjusted some js
  • Loading branch information
CarlTaylor1989 authored Jul 20, 2016
1 parent 599640b commit bbdd53d
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ module.exports = function(grunt) {
options: { livereload: true }
},
js: {
files: ['**/*.js', '!node_modules/**/*.js'],
files: ['**/*.js', '!node_modules/**/*.js', '!static/dist/**/*.js'],
options: { livereload: true },
tasks: ['uglify']
},
css: {
files: '**/*.scss',
options: { livereload: true },
tasks: ['sass','cssmin']
tasks: ['sass', 'cssmin']
}
},
cssmin: {
Expand Down
2 changes: 2 additions & 0 deletions static/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
$navToggle = document.querySelector('a[href="#nav"]'),
$navClose;

var $overlay = document.querySelector('#trigger-overlay');

// Event: Prevent clicks/taps inside the nav from bubbling.
addEventsListener($nav, 'click touchend', function(event) {
event.stopPropagation();
Expand Down
File renamed without changes.
22 changes: 16 additions & 6 deletions templates/map.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,31 @@ <h1><a href="#">GoMap</a></h1>
</nav>

<div id="main">
<button id="trigger-overlay">Test</button>
<div id="map"></div>
</div>

<div class="overlay overlay-contentscale">
<button type="button" class="overlay-close">Close</button>
<nav>
<ul>
<li><a href="#">Login Details Here</a></li>
</ul>
</nav>
</div>

</body>

<!-- Scripts -->
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/skel/3.0.1/skel.min.js"></script>
<script src="/static/dist/js/app.min.js"></script>
<script src="/static/js/vendor/classie.js"></script>
<!-- <script src="/static/js/vendor/demo7.js"></script> -->
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/skel/3.0.1/skel.min.js"></script>
<script type="text/javascript" src="/static/dist/js/app.min.js"></script>
<script type="text/javascript" src="/static/js/vendor/classie.js"></script>
<script type="text/javascript" src="/static/js/vendor/svg-overlay.js"></script>

<script type="text/javascript">
var center_lat = {{lat}};
var center_lng = {{lng}};
var center_lat = {{lat}};
var center_lng = {{lng}};
</script>

<script async defer src="https://maps.googleapis.com/maps/api/js?key={{ gmaps_key }}&callback=initMap"></script>
Expand Down

0 comments on commit bbdd53d

Please sign in to comment.