Merge branch 'app'

[wolnelektury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 944c338..ed1bedc 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,24 @@
 localsettings.py
 dev.sqlite
+fabfile_local.py
 *.db
 *.db-journal
 *~
 *.orig
+*.log
+.sass-cache
+*.css.map
 
 # Compress output
-/wolnelektury/static/css/all.min*.css
-/wolnelektury/static/js/all*.min.js
-/wolnelektury/static/css/book.min*.css
-/wolnelektury/static/js/book*.min.js
-/wolnelektury/static/js/jquery.min.js
+/var
+
+# SCSS output
+src/wolnelektury/static/scss/*.css
 
 # Python garbage
 *.pyc
 .coverage
+coverage.xml
 pip-log.txt
 nosetests.xml
 
@@ -30,5 +34,12 @@ thumbs.db
 .pydevproject
 .tmp_*
 
+# PyCharm
+.idea
+
 # Tags file
-TAGS
\ No newline at end of file
+TAGS
+
+doc/_build
+reports
+