Skip to content

Commit

Permalink
Merge pull request #4535 from pymedusa/release/release-0.2.6
Browse files Browse the repository at this point in the history
Release/release 0.2.6
  • Loading branch information
medariox authored Jul 3, 2018
2 parents c65ca26 + 1d046eb commit a096810
Show file tree
Hide file tree
Showing 360 changed files with 28,713 additions and 17,882 deletions.
3 changes: 0 additions & 3 deletions .build/.bowerrc

This file was deleted.

15 changes: 0 additions & 15 deletions .build/.snyk

This file was deleted.

15 changes: 9 additions & 6 deletions .build/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = function(grunt) { // eslint-disable-line xo/filename-case
clean: {
dist: './dist/',
bower_components: './bower_components', // eslint-disable-line camelcase
fonts: '../static/css/*.ttf',
fonts: '../themes-default/slim/static/css/*.ttf',
options: {
force: true
}
Expand Down Expand Up @@ -43,6 +43,9 @@ module.exports = function(grunt) { // eslint-disable-line xo/filename-case
outlayer: [
'item.js',
'outlayer.js'
],
openSans: [
'openSans.css'
]
},
bowerOptions: {
Expand All @@ -59,7 +62,7 @@ module.exports = function(grunt) { // eslint-disable-line xo/filename-case
src: [
'*.ttf'
],
dest: '../static/css/'
dest: '../themes-default/slim/static/css/'
}]
},
glyphicon: {
Expand All @@ -74,7 +77,7 @@ module.exports = function(grunt) { // eslint-disable-line xo/filename-case
'*.woff',
'*.woff2'
],
dest: '../static/fonts/'
dest: '../themes-default/slim/static/fonts/'
}]
},
vender: {
Expand All @@ -85,7 +88,7 @@ module.exports = function(grunt) { // eslint-disable-line xo/filename-case
src: [
'bower.js'
],
dest: '../static/js/',
dest: '../themes-default/slim/static/js/',
rename: function(dest, src) {
return dest + src.replace('bower.js', 'vender.js');
}
Expand All @@ -95,7 +98,7 @@ module.exports = function(grunt) { // eslint-disable-line xo/filename-case
uglify: {
bower: {
files: {
'../static/js/vender.min.js': './dist/bower.js'
'../themes-default/slim/static/js/vender.min.js': './dist/bower.js'
}
}
},
Expand All @@ -106,7 +109,7 @@ module.exports = function(grunt) { // eslint-disable-line xo/filename-case
},
bower: {
files: {
'../static/css/vender.min.css': './dist/bower.css'
'../themes-default/slim/static/css/vender.min.css': './dist/bower.css'
}
}
}
Expand Down
15 changes: 7 additions & 8 deletions .build/bower.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
{
"name": "Medusa",
"private": true,
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"dependencies": {
"jquery": "3.0.0",
"jquery-ui": "1.12.1",
Expand All @@ -26,7 +19,13 @@
"qtip2": "2.2.1",
"tablesorter": "jquery.tablesorter#2.28.1",
"isotope": "3.0.1",
"openSans": "https://google-fonts.azurewebsites.net/googleFonts/openSans?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic"
"openSans": "https://google-fonts.azurewebsites.net/googleFonts/openSans?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic",

"fizzy-ui-utils": "2.0.5",
"get-size": "2.0.2",
"masonry": "4.2.0",
"ev-emitter": "1.1.0",
"imagesloaded": "4.1.3"
},
"resolutions": {
"bootstrap": "3.3.7",
Expand Down
19 changes: 19 additions & 0 deletions .build/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"name": "Medusa-bower",
"private": true,
"scripts": {
"install": "yarn run grunt"
},
"dependencies": {
"bower": "^1.8.4",
"grunt": "^0.4.5",
"grunt-bower-concat": "^1.0.0",
"grunt-bower-task": "^0.5.0",
"grunt-cli": "^0.1.13",
"grunt-contrib-clean": "^1.0.0",
"grunt-contrib-copy": "^0.8.2",
"grunt-contrib-cssmin": "^0.14.0",
"grunt-contrib-uglify": "^0.11.1",
"load-grunt-tasks": "^3.3.0"
}
}
34 changes: 0 additions & 34 deletions .build/test/testrunner.html

This file was deleted.

26 changes: 0 additions & 26 deletions .build/test/tests.js

This file was deleted.

Loading

0 comments on commit a096810

Please sign in to comment.