Skip to content

Commit

Permalink
Merge pull request #14 from CottaCush/features/component-styling
Browse files Browse the repository at this point in the history
(Assets): Remove common assets, use assets from `cricket-base`
  • Loading branch information
otaruMendez authored Oct 3, 2018
2 parents a78f139 + 2c082b5 commit 7de1439
Show file tree
Hide file tree
Showing 22 changed files with 481 additions and 1,774 deletions.
110 changes: 55 additions & 55 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,61 +1,61 @@
{
"name": "cottacush/cricket-reports",
"description": "Cricket Report Module",
"keywords": [
"yii2",
"framework",
"basic",
"report template",
"admin portal"
],
"homepage": "https://github.com/cottacush/cricket-reports",
"type": "library",
"license": "MIT",
"minimum-stability": "stable",
"require": {
"cottacush/yii2-widgets": "^1.0",
"hashids/hashids": "^1.0",
"yii2tech/csv-grid": "^1.0",
"kartik-v/yii2-widget-select2": "v2.1.1"
"name": "cottacush/cricket-reports",
"description": "Cricket Report Module",
"keywords": [
"yii2",
"framework",
"basic",
"report template",
"admin portal"
],
"homepage": "https://github.com/cottacush/cricket-reports",
"type": "library",
"license": "MIT",
"minimum-stability": "stable",
"require": {
"hashids/hashids": "^1.0",
"yii2tech/csv-grid": "^1.0",
"kartik-v/yii2-widget-select2": "v2.1.1",
"cottacush/cricket-base": "^0.5.0"
},
"authors": [
{
"name": "Cotta & Cush Developers",
"email": "[email protected]",
"homepage": "http://cottacush.com",
"role": "Developer"
},
"authors": [
{
"name": "Cotta & Cush Developers",
"email": "[email protected]",
"homepage": "http://cottacush.com",
"role": "Developer"
},
{
"name": "Taiwo Ladipo",
"email": "[email protected]",
"role": "Software Engineer"
},
{
"name": "Olawale Lawal",
"email": "[email protected]",
"role": "Software Engineer"
}
],
"require-dev": {
"phpunit/phpunit": "~4.0||~5.0",
"scrutinizer/ocular": "~1.1",
"squizlabs/php_codesniffer": "~2.3"
{
"name": "Taiwo Ladipo",
"email": "[email protected]",
"role": "Software Engineer"
},
"autoload": {
"psr-4": {
"CottaCush\\Cricket\\Report\\": "src"
}
},
"scripts": {
"test": "phpunit"
{
"name": "Olawale Lawal",
"email": "[email protected]",
"role": "Software Engineer"
}
],
"require-dev": {
"phpunit/phpunit": "~4.0||~5.0",
"scrutinizer/ocular": "~1.1",
"squizlabs/php_codesniffer": "~2.3"
},
"autoload": {
"psr-4": {
"CottaCush\\Cricket\\Report\\": "src"
}
},
"scripts": {
"test": "phpunit"
},
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
},
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
},
"asset-installer-paths": {
"npm-asset-library": "vendor/npm",
"bower-asset-library": "vendor/bower"
}
"asset-installer-paths": {
"npm-asset-library": "vendor/npm",
"bower-asset-library": "vendor/bower"
}
}
}
73 changes: 72 additions & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 44 additions & 0 deletions gulpfile-config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/* Import Node.js modules */
var environments = require('gulp-environments'),
autoprefixer = require('autoprefixer');


var config = {
sourceDir: "./src/asset-files/",
buildDir: "./src/asset-files/",
styles: {
lessDir: "./src/asset-files/less",
lessFiles: ['./src/asset-files/less/styles.less'],
scssDir: "./src/asset-files/scss/",
scssFiles: "./src/asset-files/scss/**/*.scss",
destinationDir: "./src/asset-files/css",
mapsDir: "./maps", // relative to the destination directory
postcss: [
autoprefixer({browsers: ["last 5 versions", "> .5% in NG", "not ie < 11"]})
]
},
scripts: {
sourceDir: "./src/asset-files/js",
sourceFiles: ["./src/asset-files/js/**/*.js"],
destinationDir: "./src/asset-files/js"
},
images: {
sourceDir: "./src/asset-files/img",
sourceFiles: "./src/asset-files/img/**/*",
destinationDir: "./src/asset-files/img"
},
publicAssets: {
sourceDir: "",
sourceFiles: [],
destinationDir: ""
},
};

/* Add sourcemaps on all environments except production */
config.sourcemaps = !(environments.production());

/* Minify build files on all environments except development */
config.minify = !(environments.development());


module.exports = config;
Loading

0 comments on commit 7de1439

Please sign in to comment.