css/webpack: Transition landing-page.css to webpack.

This commit transitions landing-page.css from the Django pipeline
to being compiled by webpack as landing-page.scss under the
'landing-page' and 'integration' bundles.
This commit is contained in:
Armaan Ahluwalia 2018-05-03 18:46:01 +05:30 committed by Tim Abbott
parent 1c016e990d
commit 54bf2a6231
18 changed files with 8 additions and 23 deletions

View File

@ -5,7 +5,6 @@
<style media="screen">
.app.portico-page { padding-bottom: 0px; }
</style>
{% stylesheet 'landing-page' %}
{{ render_bundle('landing-page') }}
{% endblock %}

View File

@ -1,7 +1,6 @@
{% extends "zerver/portico.html" %}
{% block customhead %}
{% stylesheet 'landing-page' %}
{{ render_bundle('landing-page') }}
{% endblock %}

View File

@ -6,7 +6,6 @@
{% block customhead %}
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{% stylesheet 'landing-page' %}
{{ render_bundle('landing-page') }}
{% endblock %}

View File

@ -6,7 +6,6 @@
{% block customhead %}
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{% stylesheet 'landing-page' %}
{{ render_bundle('landing-page') }}
{% endblock %}

View File

@ -6,7 +6,6 @@
{% block customhead %}
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{% stylesheet 'landing-page' %}
{{ render_bundle('landing-page') }}
{% endblock %}

View File

@ -6,7 +6,6 @@
{% block customhead %}
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{% stylesheet 'landing-page' %}
{{ render_bundle('landing-page') }}
{% endblock %}

View File

@ -2,7 +2,6 @@
{% block customhead %}
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{% stylesheet 'landing-page' %}
{{ render_bundle('landing-page') }}
<style>
.portico-page {

View File

@ -6,7 +6,6 @@
{% block customhead %}
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{% stylesheet 'landing-page' %}
{{ render_bundle('landing-page') }}
{% endblock %}

View File

@ -2,7 +2,6 @@
{% block customhead %}
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{% stylesheet 'landing-page' %}
{{ render_bundle('integrations') }}
{% endblock %}

View File

@ -2,7 +2,6 @@
{% block customhead %}
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{% stylesheet 'landing-page' %}
{{ render_bundle('landing-page') }}
{% endblock %}

View File

@ -6,7 +6,6 @@
{% block customhead %}
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{% stylesheet 'landing-page' %}
{{ render_bundle('landing-page') }}
{% endblock %}

View File

@ -6,7 +6,6 @@
{% block customhead %}
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{% stylesheet 'landing-page' %}
<script>
var contributors_list = {{ contrib|safe }};
</script>

View File

@ -4,7 +4,6 @@
{% block customhead %}
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{% stylesheet 'landing-page' %}
{{ render_bundle('landing-page') }}
{% endblock %}

View File

@ -6,7 +6,6 @@
{% block customhead %}
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{% stylesheet 'landing-page' %}
{{ render_bundle('landing-page') }}
{% endblock %}

View File

@ -2,7 +2,6 @@
{% block customhead %}
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{% stylesheet 'landing-page' %}
{{ render_bundle('landing-page') }}
{% endblock %}

View File

@ -31,8 +31,14 @@
"./static/js/portico/help.js"
],
"katex": "./node_modules/katex/dist/katex.min.js",
"landing-page": "./static/js/portico/landing-page.js",
"integrations": "./static/js/portico/integrations.js",
"landing-page": [
"./static/js/portico/landing-page.js",
"./static/styles/landing-page.scss"
],
"integrations": [
"./static/js/portico/integrations.js",
"./static/styles/landing-page.scss"
],
"signup": [
"./static/js/portico/signup.js",
"./node_modules/jquery-validation/dist/jquery.validate.min.js"

View File

@ -852,12 +852,6 @@ PIPELINE = {
'STYLESHEETS': {
# If you add a style here, please update stylesheets()
# in frontend_tests/zjsunit/output.js as needed.
'landing-page': {
'source_filenames': (
'styles/landing-page.css',
),
'output_filename': 'min/landing.css'
},
'apple_sprite': {
'source_filenames': (
'generated/emoji/apple_sprite.css',