Merge branch 'master' of github.com:alexandrevicenzi/Flex

# Conflicts:
#	docs/blog/theme/stylesheet/variables.less
#	static/stylesheet/style.min.css
#	templates/partial/flex.html
This commit is contained in:
Dan Watling 2021-01-01 07:21:13 -06:00
commit 8a94051054
296 changed files with 17811 additions and 15998 deletions

View file

@ -1,6 +1,6 @@
{
"name": "flex",
"version": "2.1.0",
"version": "2.3.0",
"description": "A minimalist Pelican theme",
"main": "gulpfile.js",
"directories": {
@ -24,10 +24,10 @@
},
"homepage": "https://github.com/alexandrevicenzi/Flex#readme",
"dependencies": {
"font-awesome": "^4.6.1",
"gulp": "^3.9.1",
"gulp": "^4.0.2",
"gulp-cssnano": "^2.1.3",
"gulp-less": "^3.5.0",
"gulp-rename": "^1.3.0"
"gulp-less": "^4.0.1",
"gulp-rename": "^2.0.0",
"gulp-uglify": "^3.0.2"
}
}