Skip to content
This repository has been archived by the owner on Oct 17, 2022. It is now read-only.

Update CSS/JS file names to remove frontier reference #668

Merged
merged 1 commit into from Sep 13, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions Gruntfile.js
Expand Up @@ -38,8 +38,8 @@ module.exports = function(grunt) {
},
clean: {
build: ['dist'],
cleanup_js: ['dist/js/*.*', '!dist/js/frontier.*'],
cleanup_css: ['dist/css/*.css', '!dist/css/frontier.*.css']
cleanup_js: ['dist/js/*.*', '!dist/js/app.*'],
cleanup_css: ['dist/css/*.css', '!dist/css/app.*.css']
},
jade: {
build: {
Expand Down Expand Up @@ -198,16 +198,16 @@ module.exports = function(grunt) {
src: app,
dest: 'dist/js/app.js'
},
frontier: {
js: {
options: {
sourceMap: true
},
src: ['<%= uglify.vendor.dest %>', '<%= uglify.app.dest %>'],
dest: 'dist/js/frontier.min.js'
dest: 'dist/js/app.min.js'
},
css: {
src: ['dist/css/*.min.css', 'dist/css/*.css'],
dest: 'dist/css/frontier.min.css'
dest: 'dist/css/app.min.css'
}
},
uglify: {
Expand All @@ -233,6 +233,6 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-http');

grunt.registerTask('default', ['http', 'clean', 'jade', 'copy', 'cssmin', 'concat:vendor', 'concat:app', 'uglify', 'concat:frontier', 'concat:css', 'clean:cleanup_js', 'clean:cleanup_css']);
grunt.registerTask('default', ['http', 'clean', 'jade', 'copy', 'cssmin', 'concat:vendor', 'concat:app', 'uglify', 'concat:js', 'concat:css', 'clean:cleanup_js', 'clean:cleanup_css']);
grunt.registerTask('build', 'default');
};
4 changes: 2 additions & 2 deletions views/layout.jade
Expand Up @@ -32,7 +32,7 @@ html
meta(property="og:description", content="Ethereum is a decentralized platform for applications that run exactly as programmed without any chance of fraud, censorship or third-party interference.")

link(href='//fonts.googleapis.com/css?family=Source+Sans+Pro:200,400,600,900,400italic' rel='stylesheet' type='text/css')
link(rel='stylesheet', href='/css/frontier.min.css')
link(rel='stylesheet', href='/css/app.min.css')
link(rel='stylesheet', href='//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/styles/default.min.css')
body
include ./includes/head.jade
Expand All @@ -41,7 +41,7 @@ html

include ./includes/footer.jade

script(src="/js/frontier.min.js")
script(src="/js/app.min.js")
script(src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/highlight.min.js")

script
Expand Down