infrastructure/devfund-website
0
2
Fork 0
Code Issues 28 Pull Requests Projects 1 Releases Wiki Activity

Config: Initialize web-assets v2 forms component compilation for survey templates temporarily #96859

Closed
Márton Lente wants to merge 2 commits from survey-web-assets-v2-component-forms into survey
pull from: survey-web-assets-v2-component-forms
merge into: infrastructure:survey

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 2 Files Changed 6 +19 -2
6 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -1,6 +1,10 @@
[submodule "assets_shared"] [submodule "assets_shared"]
path = assets_shared path = assets_shared
url = https://projects.blender.org/infrastructure/web-assets.git url = https://projects.blender.org/infrastructure/web-assets.git
[submodule "assets_shared_v2_component_forms"]
branch = component-forms
path = assets_shared_v2
url = https://projects.blender.org/infrastructure/web-assets.git
[submodule "donation-box"] [submodule "donation-box"]
path = donation-box path = donation-box
url = https://projects.blender.org/infrastructure/devfund-donation-box.git url = https://projects.blender.org/infrastructure/devfund-donation-box.git

2
assets_shared

@ -1 +1 @@
Subproject commit 8839ec4de330d84ed68bfdbb27017ab4920e426b Subproject commit ca8eb5303b6974c2285a8637c93b5f26f41478f0

5
blender_fund/settings.py
View File

@ -285,6 +285,11 @@ PIPELINE = {
'output_filename': 'css/main.css', 'output_filename': 'css/main.css',
'extra_context': {'media': 'screen,projection'}, 'extra_context': {'media': 'screen,projection'},
}, },
'main-web-assets-v2-component-forms': {
'source_filenames': ('blender_fund_main/styles/main-web-assets-v2-component-forms.sass',),
'output_filename': 'css/main-web-assets-v2-component-forms.css',
'extra_context': {'media': 'screen,projection'},
},
'looper_admin': { 'looper_admin': {
'source_filenames': ('looper/styles/*.sass',), 'source_filenames': ('looper/styles/*.sass',),
'output_filename': 'css/looper_admin.css', 'output_filename': 'css/looper_admin.css',

2
blender_fund_main/static/blender_fund_main/styles/main-web-assets-v2-component-forms.sass Normal file
View File

@ -0,0 +1,2 @@
$font-path: '../../assets/fonts'
@import '../../../../assets_shared_v2_component_forms/src/styles/main.sass'

4
blender_fund_main/templates/blender_fund_main/survey.html
View File

@ -1,3 +1,7 @@
{% block stylesheet_custom %}
{% stylesheet 'main-web-assets-v2-component-forms' %}
{% endblock stylesheet_custom %}
<h1>Survey</h1> <h1>Survey</h1>
Hi {{ user.username }}! Hi {{ user.username }}!

4
templates/blender_fund/layout.html
View File

@ -35,7 +35,9 @@
<script defer data-domain="fund.blender.org" src="https://analytics.blender.org/js/script.js"></script> <script defer data-domain="fund.blender.org" src="https://analytics.blender.org/js/script.js"></script>
{% stylesheet 'main' %} {% block stylesheet_custom %}
{% stylesheet 'main' %}
{% endblock stylesheet_custom %}
{% if settings.GOOGLE_ANALYTICS_TRACKING_ID %} {% if settings.GOOGLE_ANALYTICS_TRACKING_ID %}
<script async src="https://www.googletagmanager.com/gtag/js?id={{ settings.GOOGLE_ANALYTICS_TRACKING_ID }}"></script> <script async src="https://www.googletagmanager.com/gtag/js?id={{ settings.GOOGLE_ANALYTICS_TRACKING_ID }}"></script>