Skip to content

Commit 377b4d6

Browse files
committed
Merge of Insiders features tied to 'Caribbean Red' funding goal
1 parent 62742b4 commit 377b4d6

File tree

32 files changed

+228
-198
lines changed

32 files changed

+228
-198
lines changed

material/assets/javascripts/bundle.48dfec6c.min.js

Lines changed: 0 additions & 29 deletions
This file was deleted.

material/assets/javascripts/bundle.48dfec6c.min.js.map

Lines changed: 0 additions & 7 deletions
This file was deleted.

material/assets/javascripts/workers/search.94ec81fe.min.js

Lines changed: 0 additions & 48 deletions
This file was deleted.

material/assets/javascripts/workers/search.94ec81fe.min.js.map

Lines changed: 0 additions & 7 deletions
This file was deleted.

material/assets/stylesheets/main.92558b1b.min.css

Lines changed: 0 additions & 2 deletions
This file was deleted.

material/assets/stylesheets/main.92558b1b.min.css.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

material/base.html

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
{% endif %}
4040
{% endblock %}
4141
{% block styles %}
42-
<link rel="stylesheet" href="{{ 'assets/stylesheets/main.92558b1b.min.css' | url }}">
42+
<link rel="stylesheet" href="{{ 'assets/stylesheets/main.8b42a75e.min.css' | url }}">
4343
{% if config.theme.palette %}
4444
{% set palette = config.theme.palette %}
4545
<link rel="stylesheet" href="{{ 'assets/stylesheets/palette.3f5d1f46.min.css' | url }}">
@@ -119,8 +119,10 @@
119119
<div class="md-container" data-md-component="container">
120120
{% block hero %}{% endblock %}
121121
{% block tabs %}
122-
{% if "navigation.tabs" in features %}
123-
{% include "partials/tabs.html" %}
122+
{% if not "navigation.tabs.sticky" in features %}
123+
{% if "navigation.tabs" in features %}
124+
{% include "partials/tabs.html" %}
125+
{% endif %}
124126
{% endif %}
125127
{% endblock %}
126128
<main class="md-main" data-md-component="main">
@@ -196,7 +198,7 @@ <h1>{{ page.title | d(config.site_name, true)}}</h1>
196198
"base": base_url,
197199
"features": features,
198200
"translations": {},
199-
"search": "assets/javascripts/workers/search.94ec81fe.min.js" | url,
201+
"search": "assets/javascripts/workers/search.f8263e09.min.js" | url,
200202
"version": config.extra.version or None
201203
} -%}
202204
{%- set translations = app.translations -%}
@@ -223,7 +225,7 @@ <h1>{{ page.title | d(config.site_name, true)}}</h1>
223225
</script>
224226
{% endblock %}
225227
{% block scripts %}
226-
<script src="{{ 'assets/javascripts/bundle.48dfec6c.min.js' | url }}"></script>
228+
<script src="{{ 'assets/javascripts/bundle.4fc53ad4.min.js' | url }}"></script>
227229
{% for path in config["extra_javascript"] %}
228230
<script src="{{ path | url }}"></script>
229231
{% endfor %}

material/overrides/assets/javascripts/bundle.f9a9c765.min.js

Lines changed: 0 additions & 18 deletions
This file was deleted.

material/overrides/assets/javascripts/bundle.f9a9c765.min.js.map

Lines changed: 0 additions & 7 deletions
This file was deleted.

material/overrides/main.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
{% endblock %}
1717
{% block scripts %}
1818
{{ super() }}
19-
<script src="{{ 'overrides/assets/javascripts/bundle.f9a9c765.min.js' | url }}"></script>
19+
<script src="{{ 'overrides/assets/javascripts/bundle.5c8bd0f7.min.js' | url }}"></script>
2020
{% endblock %}

0 commit comments

Comments
 (0)