Merge branch 'master' into wip-storage-backend

pillar/config.py

@@ -53,6 +53,8 @@ BIN_RSYNC = '/usr/bin/rsync'
 
 GCLOUD_APP_CREDENTIALS = 'google_app.json'
 GCLOUD_PROJECT = '-SECRET-'
+# Used for cross-verification on various Google sites (eg. YouTube)
+GOOGLE_SITE_VERIFICATION = ''
 
 ADMIN_USER_GROUP = '5596e975ea893b269af85c0e'
 SUBSCRIBER_USER_GROUP = '5596e975ea893b269af85c0f'

src/styles/_join.sass

@@ -6,7 +6,7 @@
 
 	#page-header
 		display: block
-		padding: 30px 0 15px 0
+		padding: 30px 0 150px 0
 		font-size: .9em
 
 		.container

src/templates/join.jade

@@ -11,7 +11,7 @@ meta(property="og:image", content="{{ url_for('static', filename='assets/img/bac
 
 | {% block header_backdrop %}
 .navbar-backdrop.join(
-	style="background-image: url({{ url_for('static', filename='assets/img/backgrounds/background_agent327_02.jpg')}})")
+	style="background-image: url({{ url_for('static', filename='assets/img/backgrounds/background_andy_waking.jpg')}})")
 | {% endblock %}
 
 | {% block page_overlay %}

src/templates/join_agent.jade

@@ -2,7 +2,7 @@
 
 | {% block body %}
 .join-project(
-	style="background-image: url({{ url_for('static', filename='assets/img/backgrounds/background_agent327_02.jpg')}})")
+	style="background-image: url({{ url_for('static', filename='assets/img/backgrounds/background_agent327_03.jpg')}})")
 
 	.join-project__title
 		span.icon

src/templates/layout.jade

@@ -8,6 +8,10 @@ html(lang="en")
 		meta(name="author", content="Blender Institute")
 		meta(name="theme-color", content="#3e92aa")
 
+		| {% if config['GOOGLE_SITE_VERIFICATION'] %}
+		meta(name="google-site-verification" content="{{ config['GOOGLE_SITE_VERIFICATION'] }}")
+		| {% endif %}
+
 		meta(property="og:site_name", content="Blender Cloud")
 		meta(property="og:locale", content="en_US")
 		meta(name="twitter:card", content="summary_large_image")