Merge remote-tracking branch 'zawadzki/new-design'

[wolnelektury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index ffdcd24..99c0898 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,26 @@
 localsettings.py
 dev.sqlite
 *.db
 localsettings.py
 dev.sqlite
 *.db

+*.db-journal

 *~
 *.orig
 *~
 *.orig

+*.log
+.sass-cache
+*.css.map

 
 # Compress output
 
 # Compress output

-/wolnelektury/static/css/all.min*.css
-/wolnelektury/static/js/all*.min.js
-/wolnelektury/static/js/jquery.min.js
+/var
+
+# SCSS output
+src/wolnelektury/static/scss/*.css

 
 # Python garbage
 *.pyc
 .coverage
 
 # Python garbage
 *.pyc
 .coverage

+coverage.xml

 pip-log.txt
 nosetests.xml
 pip-log.txt
 nosetests.xml

+/htmlcov

 
 # Mac OS X garbage
 .DS_Store
 
 # Mac OS X garbage
 .DS_Store


@@ -27,3 +34,16 @@ thumbs.db
 .pydevproject
 .tmp_*
 
 .pydevproject
 .tmp_*
 

+# PyCharm
+.idea
+
+# Emacs
+\#*\#
+.\#*
+
+# Tags file
+TAGS
+
+doc/_build
+reports
+