archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into wip-storage-backend

Browse Source
This commit is contained in:
Sybren A. Stüvel 2017-03-23 12:06:36 +01:00
commit 41414319a5
5 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pillar/config.py
View File

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

2
src/styles/_join.sass
View File

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

2
src/templates/join.jade
View File

@ -11,7 +11,7 @@ meta(property="og:image", content="{{ url_for('static', filename='assets/img/bac
| {% block header_backdrop %} | {% block header_backdrop %}
.navbar-backdrop.join( .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 %} | {% endblock %}
| {% block page_overlay %} | {% block page_overlay %}

2
src/templates/join_agent.jade
View File

@ -2,7 +2,7 @@
| {% block body %} | {% block body %}
.join-project( .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 .join-project__title
span.icon span.icon

4
src/templates/layout.jade
View File

@ -8,6 +8,10 @@ html(lang="en")
meta(name="author", content="Blender Institute") meta(name="author", content="Blender Institute")
meta(name="theme-color", content="#3e92aa") 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:site_name", content="Blender Cloud")
meta(property="og:locale", content="en_US") meta(property="og:locale", content="en_US")
meta(name="twitter:card", content="summary_large_image") meta(name="twitter:card", content="summary_large_image")