Removed MaxCDN dependency

This commit is contained in:
rr- 2015-07-02 20:15:20 +02:00
parent bd7dd9a2ad
commit 3c83f711c9
3 changed files with 24 additions and 23 deletions

View file

@ -87,6 +87,7 @@ module.exports = function(grunt) {
{ src: 'node_modules/marked/lib/marked.js', dest: 'public_html/lib/marked.js' },
{ src: 'node_modules/nprogress/nprogress.js', dest: 'public_html/lib/nprogress.js' },
{ src: 'node_modules/nprogress/nprogress.css', dest: 'public_html/lib/nprogress.css' },
{ cwd: 'node_modules', src: 'font-awesome/**/*', dest: 'public_html/lib/', expand: true },
]
}
},

View file

@ -1,24 +1,24 @@
{
"name": "szurubooru",
"version": "0.9.2",
"dependencies": {
"jquery.cookie": "1.4.1",
"jquery": "~2.1.1",
"underscore": "1.7.0",
"Mousetrap": "git://github.com/ccampbell/mousetrap.git",
"marked": "~0.3.2",
"nprogress": "git://github.com/rstacruz/nprogress.git",
"requirejs": "*",
"ini": "*",
"grunt": "~0.4.5",
"grunt-processhtml": "*",
"grunt-contrib-uglify": "*",
"grunt-contrib-cssmin": "*",
"grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-copy": "*",
"grunt-cli": "*",
"shelljs": "~0.3.0",
"rimraf": "~2.1"
}
"name": "szurubooru",
"version": "0.9.2",
"dependencies": {
"Mousetrap": "git://github.com/ccampbell/mousetrap.git",
"font-awesome": "^4.3.0",
"grunt": "~0.4.5",
"grunt-cli": "*",
"grunt-contrib-copy": "*",
"grunt-contrib-cssmin": "*",
"grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-uglify": "*",
"grunt-processhtml": "*",
"ini": "*",
"jquery": "~2.1.1",
"jquery.cookie": "1.4.1",
"marked": "~0.3.2",
"nprogress": "git://github.com/rstacruz/nprogress.git",
"requirejs": "*",
"rimraf": "~2.1",
"shelljs": "~0.3.0",
"underscore": "1.7.0"
}
}

View file

@ -28,7 +28,7 @@
<link rel="stylesheet" type="text/css" href="app.min.css?<%= timestamp %>"/>
/build -->
<link rel="stylesheet" type="text/css" href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css"/>
<link rel="stylesheet" type="text/css" href="/lib/font-awesome/css/font-awesome.min.css"/>
<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Droid+Sans:400,700"/>
<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Inconsolata">