diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.example | 6 | ||||
| -rw-r--r-- | scss/custom.scss | 13 | 
3 files changed, 20 insertions, 1 deletions
| diff --git a/.gitignore b/.gitignore index a1984e0ff..8ebe68c7b 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,8 @@ oook_replace  dist  ishtar.egg-info  .idea +.sass-cache  *.log  example_project/ishtar  example_project/.coverage +bootstrap-src diff --git a/Makefile.example b/Makefile.example index abb4eec77..938aefeca 100644 --- a/Makefile.example +++ b/Makefile.example @@ -21,7 +21,8 @@ help:  	#	* shell:   	#	* makemessages:   	#	* compilemessages:  -	#	* schemamigrations:  +	#	* sass: +	#	* schemamigrations:  	#	* schemamigrations_initial:   	#	* generate_doc:   	#	* fixtures:  @@ -238,3 +239,6 @@ push_install: clean  	tar cvjf install-ishtar-$(version).tar.bz2 install/  	scp install-ishtar-$(version).tar.bz2 root@git:/var/www/ishtar/install/  	rm install-ishtar-$(version).tar.bz2 + +sass: +	sass scss/custom.scss ishtar_common/static/bootstrap/bootstrap.css diff --git a/scss/custom.scss b/scss/custom.scss new file mode 100644 index 000000000..327219c6c --- /dev/null +++ b/scss/custom.scss @@ -0,0 +1,13 @@ +// Custom.scss + +// required +@import "bootstrap-src/scss/functions"; +@import "bootstrap-src/scss/variables"; +@import "bootstrap-src/scss/mixins"; + +// optional +@import "bootstrap-src/scss/reboot"; +@import "bootstrap-src/scss/type"; +@import "bootstrap-src/scss/images"; +@import "bootstrap-src/scss/code"; +@import "bootstrap-src/scss/grid"; | 
