Merge pull request #438 from Cadasta/bugfix/bg-photo

Fixed bg image by adding body class
Cadasta · Jul 14, 2016 · ebd8248 · ebd8248
2 parents cf0ca20 + 567ce4c
commit ebd8248
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 21 deletions.
diff --git a/cadasta/core/static/css/main.css b/cadasta/core/static/css/main.css
diff --git a/cadasta/core/static/css/main.css.map b/cadasta/core/static/css/main.css.map
diff --git a/cadasta/core/static/css/main.scss b/cadasta/core/static/css/main.scss
@@ -582,6 +582,13 @@ header {
   }
 }
 
+/* =Main container
+-------------------------------------------------------------- */
+
+main.container-fluid {
+  padding-bottom: 50px; // for footer
+}
+
 /* =Main content to right of sidebar
 -------------------------------------------------------------- */
 

diff --git a/cadasta/core/static/css/reg.scss b/cadasta/core/static/css/reg.scss
@@ -1,15 +1,12 @@
 /* =Registration area & profile pages
 -------------------------------------------------------------- */
 
-.tinted-bg { // photo for login and register forms
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: 100%;
-    width: 100%;
-    z-index: 1;
-    background: linear-gradient(rgba(44, 74, 165, 0.55), rgba(44, 74, 165, 0.55)), url("/static/img/land.jpg");
-    background-size: cover;
+body.tinted-bg { // photo for login and register forms
+  background: linear-gradient(rgba(44, 74, 165, 0.55), rgba(44, 74, 165, 0.55)), url("/static/img/land.jpg");
+  background-size: cover; 
+  -moz-background-size: cover;
+  -o-background-size: cover;
+  -webkit-background-size: cover;
 }
 
 .form-narrow {

diff --git a/cadasta/templates/allauth/account/login.html b/cadasta/templates/allauth/account/login.html
@@ -5,6 +5,7 @@
 {% load account socialaccount %}
 
 {% block top-nav %}registration{% endblock %}
+{% block body-class %}tinted-bg{% endblock %}
 
 {% block title %} | {% trans "Sign In" %}{% endblock %}
 
@@ -70,6 +71,4 @@ <h1>{% trans "Sign in to your account" %}</h1>
   </p>
 </form>
 
-<div class="tinted-bg"></div>
-
 {% endblock %}
diff --git a/cadasta/templates/allauth/account/signup.html b/cadasta/templates/allauth/account/signup.html
@@ -4,6 +4,7 @@
 {% load i18n %}
 
 {% block top-nav %}registration{% endblock %}
+{% block body-class %}tinted-bg{% endblock %}
 
 {% block title %} | {% trans "Register" %}{% endblock %}
 
@@ -73,6 +74,4 @@ <h1>{% trans "Register for a free account" %}</h1>
   </p>
 </form>
 
-<div class="tinted-bg"></div>
-
 {% endblock %}
diff --git a/cadasta/templates/core/base.html b/cadasta/templates/core/base.html
@@ -22,7 +22,7 @@
     {% endif %}
     {% block extra_head %}{% endblock %}
   </head>
-  <body id="{% block top-nav %}{% endblock %}">
+  <body id="{% block top-nav %}{% endblock %}" class="{% block body-class %}{% endblock %}">
     <div id="cadasta">
       <!-- Site header -->
       <header class="header" role="banner">