Skip to content
This repository has been archived by the owner on Feb 28, 2021. It is now read-only.

Css to scss #8

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
*.swp
.vagrant

src/front/app/css

# Node modules
node_modules

# C extensions
*.so

Expand Down Expand Up @@ -33,3 +38,4 @@ nosetests.xml
.mr.developer.cfg
.project
.pydevproject
.sass-cache
36 changes: 36 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
module.exports = function(grunt) {

grunt.initConfig({
// Setting up sass to make it available
sass: {
dev: {
options: {
style: 'expanded'
},
files: {
'src/front/app/css/kite.css': 'src/assets/sass/kite.scss'
}
}
},
watch: {
sass: {
files: ['src/assets/sass/**/*.scss'],
tasks: ['sass']
},
livereload: {
options: { livereload: true },
files: ['src/front/app/**/*.css', 'src/front/app/**/*.js']
}
}
});

grunt.loadNpmTasks('grunt-contrib-sass');
grunt.loadNpmTasks('grunt-contrib-watch');

// Default task(s).
grunt.registerTask('default', ['sass:dev']);

// Development version
grunt.registerTask('dev', ['sass:dev', 'watch']);

};
21 changes: 12 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
{
"name": "angualrjs-seed",
"description": "A starter project for angular js",
"name": "Kite",
"description": "Kite is a modern webmail written in angularjs",
"devDependencies": {
"phantomjs" : "*",
"karma" : "*",
"karma-junit-reporter" : "*",
"karma-jasmine" : "*",
"karma-ng-scenario" : "*"
}
}
"phantomjs": "*",
"karma": "*",
"karma-junit-reporter": "*",
"karma-jasmine": "*",
"karma-ng-scenario": "*",
"grunt": "~0.4.1",
"grunt-contrib-sass": "~0.5.0",
"grunt-contrib-watch": "~0.5.3"
}
}
File renamed without changes.
4 changes: 4 additions & 0 deletions src/assets/sass/kite.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@import "bootstrap";
@import "bootstrap-theme";
@import "navbar";
@import "app";
2 changes: 1 addition & 1 deletion src/front/app/index-async.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
});
</script>
<title>My AngularJS App</title>
<link rel="stylesheet" href="css/app.css">
<link rel="stylesheet" href="css/kite.css">
</head>
<body ng-cloak>
<ul class="menu">
Expand Down
5 changes: 1 addition & 4 deletions src/front/app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@

<title>Kite</title>

<!-- Bootstrap core CSS -->
<link href="css/bootstrap.css" rel="stylesheet">
<link href="css/kite.css" rel="stylesheet">

<!-- custom bootstrap theme -->
<link href="css/bootstrap-theme.css" rel="stylesheet">


<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
Expand Down