Skip to content

Commit

Permalink
move bower component in root + favicon
Browse files Browse the repository at this point in the history 
Signed-off-by: Gaetan Semet <[email protected]>
  • Loading branch information
@gsemet
gsemet committed May 24, 2015
1 parent f6e1a31 commit a9ad0c3
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 37 deletions.
4 changes: 2 additions & 2 deletions .bowerrc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"directory": "public/bower"
}
"directory": "bower"
}
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ public/bower/
node_modules
public/
bower_components/
bower
74 changes: 43 additions & 31 deletions gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ module.exports = function(grunt) {
},
files: {
"public/css/<%= jablConfig.appTitle.camelized %>.css": "src/less/<%= jablConfig.appTitle.camelized %>.less",
"public/css/bootstrap-lightbox.css": "public/bower/bootstrap-lightbox/less/bootstrap-lightbox.less"
"public/css/bootstrap-lightbox.css": "bower/bootstrap-lightbox/less/bootstrap-lightbox.less"
}
},
prod: {
Expand All @@ -78,7 +78,7 @@ module.exports = function(grunt) {
},
files: {
"public/css/<%= jablConfig.appTitle.camelized %>.min.css": "src/less/<%= jablConfig.appTitle.camelized %>.less",
"public/css/bootstrap-lightbox.min.css": "public/bower/bootstrap-lightbox/less/bootstrap-lightbox.less"
"public/css/bootstrap-lightbox.min.css": "bower/bootstrap-lightbox/less/bootstrap-lightbox.less"
}
},

Expand Down Expand Up @@ -165,27 +165,39 @@ module.exports = function(grunt) {
copy: {
main: {
files: [
// includes files within path
// includes files within path
{
expand: true,
nonull: true,
flatten: true,
src: ['src/img/*',
'public/bower/blueimp-gallery/img/*.*',
'public/bower/blueimp-bootstrap-image-gallery/img/*.*'
],
src: [
'src/img/*.jpg',
'src/img/*.gif',
'src/img/*.png',
'src/img/*.svg',
'bower/blueimp-gallery/img/*.*',
'bower/blueimp-bootstrap-image-gallery/img/*.*'
],
dest: 'public/img/',
filter: 'isFile'
},
},
{
expand: true,
nonull: true,
flatten: true,
src: ['src/js/*'],
dest: 'public/js/',
filter: 'isFile'
},
]
},
{
expand: true,
nonull: true,
flatten: true,
src: ['src/img/favicon.ico'],
dest: 'public/',
filter: 'isFile'
},
]
},
js: {
files: [
Expand All @@ -194,21 +206,21 @@ module.exports = function(grunt) {
nonull: true,
flatten: true,
src: [
'public/bower/bootstrap/dist/js/bootstrap.js',
// 'public/bower/jquery-scrolldeck/js/jquery-1.8.2.min.js',
// 'public/bower/jquery-scrolldeck/js/jquery.easing.1.3.js',
// 'public/bower/jquery-scrolldeck/js/jquery.scrollTo-1.4.3.1.min.js',
// 'public/bower/jquery-scrolldeck/js/jquery.scrollorama.js',
// 'public/bower/jquery-scrolldeck/js/jquery.scrolldeck.js',
'public/bower/bootstrap-lightbox/js/bootstrap-lightbox.js',
'public/bower/jquery/dist/jquery.min.js',
'public/bower/jquery/dist/jquery.min.map',
'public/bower/magnific-popup/dist/*.js',
'public/bower/ScrollMagic/scrollmagic/uncompressed/ScrollMagic.js',
'public/bower/ScrollMagic/scrollmagic/uncompressed/plugins/jquery.ScrollMagic.js',
'public/bower/jquery-scrolldeck/decks/parallax/scripts/jquery.parallax-1.1.js',
'public/bower/blueimp-bootstrap-image-gallery/js/bootstrap-image-gallery*.js',
'public/bower/blueimp-gallery/js/blueimp-gallery*.js'
'bower/bootstrap/dist/js/bootstrap.js',
// 'bower/jquery-scrolldeck/js/jquery-1.8.2.min.js',
// 'bower/jquery-scrolldeck/js/jquery.easing.1.3.js',
// 'bower/jquery-scrolldeck/js/jquery.scrollTo-1.4.3.1.min.js',
// 'bower/jquery-scrolldeck/js/jquery.scrollorama.js',
// 'bower/jquery-scrolldeck/js/jquery.scrolldeck.js',
'bower/bootstrap-lightbox/js/bootstrap-lightbox.js',
'bower/jquery/dist/jquery.min.js',
'bower/jquery/dist/jquery.min.map',
'bower/magnific-popup/dist/*.js',
'bower/ScrollMagic/scrollmagic/uncompressed/ScrollMagic.js',
'bower/ScrollMagic/scrollmagic/uncompressed/plugins/jquery.ScrollMagic.js',
'bower/jquery-scrolldeck/decks/parallax/scripts/jquery.parallax-1.1.js',
'bower/blueimp-bootstrap-image-gallery/js/bootstrap-image-gallery*.js',
'bower/blueimp-gallery/js/blueimp-gallery*.js'
],
dest: 'public/js/',
filter: 'isFile'
Expand All @@ -222,11 +234,11 @@ module.exports = function(grunt) {
nonull: true,
flatten: true,
src: [
'public/bower/bootstrap/dist/css/bootstrap*.css',
'public/bower/bootstrap/dist/css/bootstrap*.map',
'public/bower/magnific-popup/dist/*.css',
'public/bower/blueimp-gallery/css/blueimp-gallery*.css',
'public/bower/blueimp-bootstrap-image-gallery/css/bootstrap-image-gallery*.css'
'bower/bootstrap/dist/css/bootstrap*.css',
'bower/bootstrap/dist/css/bootstrap*.map',
'bower/magnific-popup/dist/*.css',
'bower/blueimp-gallery/css/blueimp-gallery*.css',
'bower/blueimp-bootstrap-image-gallery/css/bootstrap-image-gallery*.css'
],
dest: 'public/css/',
filter: 'isFile'
Expand All @@ -239,7 +251,7 @@ module.exports = function(grunt) {
expand: true,
nonull: true,
flatten: true,
src: ['public/bower/bootstrap/fonts/glyphicons-halflings-regular.woff',
src: ['bower/bootstrap/fonts/glyphicons-halflings-regular.woff',
],
dest: 'public/fonts/',
filter: 'isFile'
Expand Down
5 changes: 2 additions & 3 deletions karma-unit.conf.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ module.exports = function(config) {

// list of files / patterns to load in the browser
files: [
'public/bower/angular/angular.js',
'public/bower/angular-mocks/angular-mocks.js',
'bower/angular/angular.js',
'bower/angular-mocks/angular-mocks.js',
'public/js/guake.js',
'src/js/test/unit/**/*.js'
],
Expand Down Expand Up @@ -71,4 +71,3 @@ module.exports = function(config) {

});
};

Binary file added src/img/favicon.ico
View file
Binary file not shown.
Binary file added src/img/favicon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/less/guake.less
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Import Bootstrap
@import "../../public/bower/bootstrap/less/bootstrap.less";
@import "../../bower/bootstrap/less/bootstrap.less";

// Add your custom styles right here...
// Variables
Expand Down

0 comments on commit a9ad0c3

Please sign in to comment.