Skip to content

Commit

Permalink
Added new functionality to hide filters panel with button; Updated ve…
Browse files Browse the repository at this point in the history
…rsion numbe rin bower and package so they are equal; Updated bower release to bump both files and push tags directly
  • Loading branch information
santilland committed Aug 30, 2016
1 parent 7fe7296 commit 5526df4
Show file tree
Hide file tree
Showing 9 changed files with 313 additions and 275 deletions.
9 changes: 5 additions & 4 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -305,13 +305,14 @@ module.exports = function (grunt) {
},
release: {
options: {
push: false, //default: true
pushTags: false, //default: true
//push: false, //default: true
//pushTags: false, //default: true
npm: false, //default: true
tagName: 'v<%= version %>', //default: '<%= version %>'
tagMessage: 'Tagging version v<%= version %>', //default: 'Version <%= version %>',
commitMessage: 'Release v<%= version %>', //default: 'release <%= version %>'
github: false
github: false,
additionalFiles: ['bower.json']
}
},
compress: {
Expand Down Expand Up @@ -366,7 +367,7 @@ module.exports = function (grunt) {
grunt.registerTask('createrelease', [
'clean:dist',
'build',
'compress:release',
//'compress:release',
'release'
]);

Expand Down
2 changes: 1 addition & 1 deletion app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]-->

<div id="scatter" style="width:100%;height:100%;position: relative;"></div>
<div id="scatter" style="width:100%;height:60%;position: relative;"></div>
<div id="histograms" style="width:100%;height:38%;position: relative;margin-left: -30px;"></div>

<div style="position:absolute; left:50%; top:0px;">
Expand Down
11 changes: 6 additions & 5 deletions app/scripts/main.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5526df4

Please sign in to comment.