Merge remote-tracking branch 'origin/feature/djangohosting' into feature/notifybymail

2015-08-27 18:31:59 +02:00 · 2015-08-27 18:31:59 +02:00 · b72dd9c3ca
commit b72dd9c3ca
parent 59ef61dfe8 b087ad4f15
8 changed files with 8 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -14,8 +14,8 @@ local_settings.py
 media/*
 !media/keep

-CACHE/
-static/
+/CACHE/
+/static/

 \#*#
 .\#*
--- a/railshosting/static/railshosting/css/nodejshosting.css
+++ b/railshosting/static/railshosting/css/nodejshosting.css
@ -0,0 +1,6 @@
+@charset "UTF-8";
+/* CSS Document */
+
+.intro-header {
+    background: url(../img/django-intro-bg.png) no-repeat center center;
+}
--- a/railshosting/static/railshosting/img/card-django.png
+++ b/railshosting/static/railshosting/img/card-django.png
--- a/railshosting/static/railshosting/img/card-nodejs.png
+++ b/railshosting/static/railshosting/img/card-nodejs.png
--- a/railshosting/static/railshosting/img/card-rails.png
+++ b/railshosting/static/railshosting/img/card-rails.png
--- a/railshosting/static/railshosting/img/django-intro-bg.png
+++ b/railshosting/static/railshosting/img/django-intro-bg.png
--- a/railshosting/static/railshosting/img/nodejs-intro-bg.png
+++ b/railshosting/static/railshosting/img/nodejs-intro-bg.png
--- a/railshosting/static/railshosting/img/rails-intro-bg.png
+++ b/railshosting/static/railshosting/img/rails-intro-bg.png