Skip to content

Commit

Permalink
Revert "Give a try on sass"
Browse files Browse the repository at this point in the history
This reverts commit 6b1baf9.
  • Loading branch information
gsemet committed Oct 22, 2014
1 parent 6b1baf9 commit 55d5490
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 167 deletions.
14 changes: 4 additions & 10 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,16 @@ Main File formats

From my humble web 2.0 experience I choose the following technologies:

**Sass**
**Less**

This source file compiles to CSS file. I clearly prefere CSS over concurent solution like SCSS, it
is less powerful, but powerful enough, and doesn't repends on Ruby environment (I hate when a tool
forces us to setup a complete environment, completely different from the current one).

This requires to install ruby on Windows plateform, I am sorry for this inconvinience. But the
syntax is more powerful than Less, and stay in the same curly brace safe spirit than the next two
other file format just bellow (I don't want to use SCSS).
I clearly prefer the ``sass`` syntax, for the lack of curly braces, matching the two other file
format syntaxes.

**Reference**: http://sass-lang.com/
**Reference**: http://lesscss.org/

**CoffeeScript**

Expand Down Expand Up @@ -212,11 +211,6 @@ Install the .NET Framework 2.0 SDK

http://www.microsoft.com/fr-fr/download/confirmation.aspx?id=19988

Install Ruby
------------

http://rubyinstaller.org/

Install grunt and bower
-----------------------

Expand Down
13 changes: 5 additions & 8 deletions gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,10 @@ module.exports = function (grunt) {
globalstrict: false
}
},
sass: {
dist: {
options: {
style: 'expanded'
},
less: {
jid: {
files: {
"public/css/<%= jablConfig.appTitle.camelized %>.css": "src/sass/<%= jablConfig.appTitle.camelized %>.sass"
"public/css/<%= jablConfig.appTitle.camelized %>.css": "src/less/<%= jablConfig.appTitle.camelized %>.less"
}
}
},
Expand Down Expand Up @@ -167,15 +164,15 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-jade');
grunt.loadNpmTasks ('grunt-contrib-less');
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-coffee');
grunt.loadNpmTasks('grunt-sitemap');
grunt.loadNpmTasks('grunt-contrib-sass');

grunt.registerTask('build', ['jade',
'coffee',
'sass',
'less',
'copy',
'sitemap',
'jshint:beforeConcat',
Expand Down
10 changes: 0 additions & 10 deletions lin-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,5 @@ fi
if [[ ! -z $https_proxy ]]; then
npm config set https-proxy ${https_proxy}
fi
echo "Installing Sass"
if [[ ! -z $http_proxy ]]; then
sudo gem install --http-proxy ${http_proxy} sass
else
sudo gem install sass
fi

echo "npm install"
npm install

echo "bower install"
bower install
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
"grunt-sitemap": "~1.1.0"
},
"devDependencies": {
"bootstrap": "~3.2.0",
"grunt": "~0.4.5",
"grunt-contrib-coffee": "~0.12.0",
"grunt-contrib-concat": "~0.5.0",
"grunt-contrib-uglify": "~0.6.0",
"grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-watch": "~0.6.1",
"grunt-contrib-less": "~0.11.4",
"grunt-contrib-jade": "~0.13.0",
"grunt-contrib-connect": "~0.8.0",
"grunt-contrib-copy": "~0.7.0",
"grunt-contrib-jade": "~0.13.0",
"grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-sass": "^0.8.1",
"grunt-contrib-uglify": "~0.6.0",
"grunt-contrib-watch": "~0.6.1"
"grunt-contrib-coffee": "~0.12.0",
"bootstrap": "~3.2.0"
},
"engines": {
"node": ">=0.8.0"
Expand Down
125 changes: 0 additions & 125 deletions src/sass/guake.sass

This file was deleted.

7 changes: 0 additions & 7 deletions win-install.bat
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
echo "Ensure you have ruby and gem installed in your path"

pause
start /B gem install sass



start /B npm install
start /B bower install

Expand Down

0 comments on commit 55d5490

Please sign in to comment.