diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c75eb646dd03203c1410f168fd9a743ef7fffbff..373ab45231694264e56c8bfc8b7c319c8d45b100 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ pages: stage: deploy script: - npm install - - ./node_modules/grunt-cli/bin/grunt public:dev + - npm run install artifacts: paths: - public diff --git a/README.md b/README.md index 1bc773e85b001a46eaf66f4f9aec6c209badc526..f0e564d28e55c2d10ad16cdcb839e500fb2c4222 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ ## Presteps 1. Install Node ( Welcome to the world of Node <3 ) -2. run `npm install -g grunt-cli` +2. run `npm install -g gulp-cli` ## Installation @@ -15,7 +15,7 @@ ## Running the application -* `grunt serve` - starts a local server and keeps watching the file changes +* `gulp serve` - starts a local server and keeps watching the file changes ### Under the Hood! diff --git a/gulpfile.js b/gulpfile.js index 95b9cf8486421b6f09343a75c69e93fff37c6fbb..c7e0fbe407f439a35a15161644ed548dd9cc5638 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -138,7 +138,7 @@ gulp.task('public', [ 'assetscopy', 'pughtml', 'htmllint', - 'jslint', + // 'jslint', 'jsuglify', // 'csslint', 'cssmin' diff --git a/package.json b/package.json index 6d8d1e42ede301f135715ed80b9b196a9f944c1d..2727f9047ae75b7621ff8a8dee4b029325597f97 100644 --- a/package.json +++ b/package.json @@ -37,5 +37,8 @@ "normalize.css": "^7.0.0" }, "author": "FSCI - Free Software Community of India <fosscommunity.in@disroot.org>", - "license": "GPL-3.0" + "license": "GPL-3.0", + "scripts": { + "install": "gulp public" + } } diff --git a/pug/templates/individual_event_page.pug b/pug/templates/individual_event_page.pug index f85e8c9c5825fb8aab82c1510723257e7a5aba25..5bb0e7baf1a1df26d22d19973ae62ed53cb147f4 100644 --- a/pug/templates/individual_event_page.pug +++ b/pug/templates/individual_event_page.pug @@ -28,9 +28,9 @@ block content img.img-rounded.pull-left(src=event.imgurl) h4.list-group-item-heading= event.name p.list-group-item-text!= event.locationame - .col-sm-7.bootcards-cards.hidden-xs + .col-sm-12.bootcards-cards // contact details - #contactCard + #contactCard.col-sm-4 .panel.panel-default .panel-heading.clearfix h3.panel-title.pull-left Contact Details @@ -56,10 +56,9 @@ block content label= "CONTACT INFO" h4.list-group-item-heading= evt.contactinfo - .panel.panel-default.bootcards-richtext + .panel.panel-default.bootcards-richtext.col-sm-8 .panel-heading h3.panel-title Description - .panel-body - | evt.description + .panel-body!= evt.description p.lead img(src=evt.imgurl, alt=evt.name)