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

[wolnelektury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3224d62..99c0898 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,18 +6,21 @@ dev.sqlite
 *.orig
 *.log
 .sass-cache
 *.orig
 *.log
 .sass-cache

+*.css.map

 
 # Compress output
 
 # Compress output

-/static
+/var

 
 # SCSS output
 
 # SCSS output

-/apps/wolnelektury_core/static/css/main/*.css
+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


@@ -31,8 +34,16 @@ thumbs.db
 .pydevproject
 .tmp_*
 
 .pydevproject
 .tmp_*
 

+# PyCharm
+.idea
+
+# Emacs
+\#*\#
+.\#*
+

 # Tags file
 TAGS
 
 # Tags file
 TAGS
 

-media
-search_index
+doc/_build
+reports
+