Conflicts: djangoapps/multicourse/__init__.py requirements.txt sass/_info.scss sass/_textbook.scss sass/courseware/_sequence-nav.scss sass/courseware/_video.scss sass/index/_base.scss sass/index/_extends.scss sass/index/_footer.scss sass/index/_header.scss sass/index/_index.scss sass/index/_variables.scss sass/layout/_calculator.scss sass/print.scss static/css static/css/application.css static/css/marketing.css templates/main.html templates/marketing.html templates/sass/index/_base.scss templates/sass/index/_extends.scss templates/sass/index/_footer.scss templates/sass/index/_header.scss templates/sass/index/_index.scss templates/sass/index/_variables.scss templates/sass/marketing/_base.scss templates/sass/marketing/_extends.scss templates/sass/marketing/_footer.scss templates/sass/marketing/_header.scss templates/sass/marketing/_index.scss templates/sass/marketing/_variables.scss
This project is using Sass to generate it's CSS. Sass is a CSS preprocessor that allows for faster development of CSS. For more information about sass: http://sass-lang.com To use sass all you need to do is enter: $ gem install sass We are also using Bourbon with sass. They are a generic set of mixins, and functions that allow for more rapid development of CSS3. Find out more about bourbon here: https://github.com/thoughtbot/bourbon To use bourbon you need to install it with: $ gem install bourbon Then to generate Sass files cd to templates directory and watch the sass files for development: $ sass --watch sass:../static/css/ -r ./sass/bourbon/lib/bourbon.rb To generate a compressed css file for production: $ sass --watch sass:../static/css/ -r ./sass/bourbon/lib/bourbon.rb --style :compressed These will automatically generate the CSS files on save.