Skip to content

Commit

Permalink
Merge remote-tracking branch 'AlexanderGW/dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexanderGW committed Oct 18, 2020
2 parents a90149f + ef7d4e9 commit aecc71f
Show file tree
Hide file tree
Showing 49 changed files with 4,883 additions and 664 deletions.
32 changes: 32 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
module.exports = function (grunt) {
const sass = require('node-sass');

grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
sass: {
theme: {
options: {
implementation: sass,
sourceMap: true
},
files: {
'src/plugin/example/asset/example.css': 'src/plugin/example/asset/example.scss',
'src/plugin/debug/asset/debug.css': 'src/plugin/debug/asset/debug.scss'
}
}
},
watch: {
sass: {
files: ['**/*.scss'],
tasks: [
'sass:theme'
]
}
}
});
grunt.loadNpmTasks('grunt-sass');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.registerTask('default', [
'sass:theme'
]);
};
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ Ideas for this framework stem from experience with Drupal, Laravel, WordPress, a

https://gailey-white.com/deft-php-framework

#### Default public docroot
#### The public directory
`~/public`

#### Default config
#### The default configuration
`~/config/deft.php`

If left unchanged, Deft will default to the **example**, and **debug** plugins.
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"ext-fileinfo": "*",
"ext-gd": "*",
"ext-json": "*",
"php": ">=5.4"
"php": ">=7.0"
},
"require-dev": {
"phpunit/phpunit": "^8.5",
Expand Down
Loading

0 comments on commit aecc71f

Please sign in to comment.