Skip to content

Commit

Permalink
Merge pull request #364 from kekey1/develop
Browse files Browse the repository at this point in the history
BOP-1207: update gruntfile for redribbon image
  • Loading branch information
kekey1 authored Feb 9, 2017
2 parents 1363861 + 3245b87 commit bbe1d3b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
8 changes: 7 additions & 1 deletion gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,12 @@ module.exports = function (grunt) {
src: '**/*',
dest: 'public/dist/fonts/',
expand: true
},
images: {
cwd: 'modules/core/client/css/img/',
src: '**/*',
dest: 'public/dist/img/',
expand: true
}
},
run: {
Expand Down Expand Up @@ -322,7 +328,7 @@ module.exports = function (grunt) {
grunt.registerTask('lint', ['sass', 'less', 'jshint', 'eslint', 'csslint']);

// Lint project files and minify them into two production files.
grunt.registerTask('build', ['env:dev', 'lint', 'ngAnnotate', 'uglify', 'copy:fonts', 'cssmin']);
grunt.registerTask('build', ['env:dev', 'lint', 'ngAnnotate', 'uglify', 'copy:fonts', 'copy:images', 'cssmin']);

// Run the project tests
grunt.registerTask('test', ['env:test', 'lint', 'mkdir:upload', 'copy:localConfig', 'dropdb', 'run:testDBload', 'server', 'mochaTest', 'protractor']); //, 'karma:unit'
Expand Down
8 changes: 4 additions & 4 deletions modules/core/client/css/core.css
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ body {
padding-bottom: 20px;
}

.content-jumbotron {
background-color: #fff;
.content-jumbotron {
background-color: #fff;
padding-top: 50px;
padding-bottom: 50px;
}

@media (max-width: 768px) {
.content-jumbotron .btn {
display: block;
Expand Down Expand Up @@ -1054,7 +1054,7 @@ form.ng-submitted .ng-invalid {
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/

.container-ribbon {
background: url(backgrounds/redribbon-bg.png) center top no-repeat transparent;
background: url(img/redribbon-bg.png) center top no-repeat transparent;
margin-top: -50px;
}

Expand Down

0 comments on commit bbe1d3b

Please sign in to comment.