diff --git a/maintenance/maintenance.html b/maintenance/maintenance.html index f18a5fc6b..41d7706b6 100644 --- a/maintenance/maintenance.html +++ b/maintenance/maintenance.html @@ -15,8 +15,6 @@
-
-
diff --git a/network-api/networkapi/templates/pages/base.html b/network-api/networkapi/templates/pages/base.html index 36e65be25..f37c2e01a 100644 --- a/network-api/networkapi/templates/pages/base.html +++ b/network-api/networkapi/templates/pages/base.html @@ -52,12 +52,14 @@ {% wagtailuserbar 'bottom-left' %} {% endif %} - {% block page_top_content %}{% endblock %} + {% if page.live == False %} +
+ This is a draft page, and is only visible to users who are logged in to the CMS admin. +
+ {% endif %} {% block body_wrapped %}
-
{% if page.status == 1 %}
Draft preview. You must save as Published to make it public.
{% endif %} -
{% block primary_nav %} {% include "partials/primary_nav.html" with background="simple-background" %} diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/modular_page.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/modular_page.html index 9a653b1a9..3a4ecb793 100644 --- a/network-api/networkapi/wagtailpages/templates/wagtailpages/modular_page.html +++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/modular_page.html @@ -2,14 +2,6 @@ {% load wagtailcore_tags mini_site_tags wagtailmetadata_tags %} -{% block page_top_content %} - {% if page.live == False %} -
- This is a draft page, and is only visible to users who are logged in to the CMS admin. -
- {% endif %} -{% endblock %} - {% block content %} {% block minisite_title_mb %}{% endblock %} diff --git a/source/js/components/member-notice/member-notice.scss b/source/js/components/member-notice/member-notice.scss deleted file mode 100644 index 6d7ff51eb..000000000 --- a/source/js/components/member-notice/member-notice.scss +++ /dev/null @@ -1,44 +0,0 @@ -#member-notice { - background: $gray-05; - - & > div { - padding: 0.75em 1.5rem; - line-height: 1.2; - } - - .wrapper { - transition: height 400ms ease-in-out; - flex-grow: 1; - } - - .pane { - opacity: 1; - transition: opacity 300ms ease-in; - - &.pane-hidden { - opacity: 0; - position: absolute; - z-index: -999999; - } - } - - .btn { - background: none; - font-size: 35px; - font-weight: 900; - color: $gray-40; - padding: 0; - line-height: 1; - - &:active, - &:focus, - &:hover { - box-shadow: none; - color: $black; - } - - &.btn-expanded { - transform: rotate(45deg); - } - } -} diff --git a/source/js/main.js b/source/js/main.js index 679d37e08..7f38b6117 100644 --- a/source/js/main.js +++ b/source/js/main.js @@ -8,7 +8,6 @@ import * as Sentry from "@sentry/browser"; import JoinUs from "./components/join/join.jsx"; import Petition from "./components/petition/petition.jsx"; -import MemberNotice from "./components/member-notice/member-notice.jsx"; import MultipageNavMobile from "./components/multipage-nav-mobile/multipage-nav-mobile.jsx"; import News from "./components/news/news.jsx"; import PulseProjectList from "./components/pulse-project-list/pulse-project-list.jsx"; @@ -30,8 +29,6 @@ if ( axe(React, ReactDOM, 1000); } -const SHOW_MEMBER_NOTICE = false; - // To be populated via XHR and querySelector let env, networkSiteURL, csrfToken; @@ -274,17 +271,6 @@ let main = { // Embed various React components based on the existence of containers within the current page injectReactComponents() { - if (SHOW_MEMBER_NOTICE && document.getElementById(`member-notice`)) { - apps.push( - new Promise(resolve => { - ReactDOM.render( - resolve()} />, - document.getElementById(`member-notice`) - ); - }) - ); - } - // Embed additional instances of the Join Us box that don't need an API exposed (eg: Homepage) document.querySelectorAll(`.join-us:not(.on-nav)`).forEach(element => { var props = element.dataset; diff --git a/source/sass/main.scss b/source/sass/main.scss index 8f93828a4..2ba6f28f6 100755 --- a/source/sass/main.scss +++ b/source/sass/main.scss @@ -22,7 +22,6 @@ $bp-xl: #{map-get($grid-breakpoints, xl)}; // >= 1200px @import "../js/components/join/join"; @import "../js/components/loading-indicator/loading-indicator"; -@import "../js/components/member-notice/member-notice"; @import "../js/components/multipage-nav-mobile/multipage-nav-mobile"; @import "../js/components/pulse-project-list/pulse-project-list"; @import "../js/components/fellow-list/directory-filter-bar"; diff --git a/source/sass/wagtail.scss b/source/sass/wagtail.scss index 777ed3b71..10bb35a4c 100644 --- a/source/sass/wagtail.scss +++ b/source/sass/wagtail.scss @@ -92,7 +92,7 @@ line-height: inherit; } -body div.wagtail-draft-warning { +#wagtail-draft-warning { background: $light-red; text-align: center; font-weight: bold;