diff --git a/opentech/apply/funds/templates/funds/submissions_by_round.html b/opentech/apply/funds/templates/funds/submissions_by_round.html
index 3347bda8965342d6a2f5ff6900f584c3a82767ee..2aee68595093c4fb1ecc7df571dbef701a500b53 100644
--- a/opentech/apply/funds/templates/funds/submissions_by_round.html
+++ b/opentech/apply/funds/templates/funds/submissions_by_round.html
@@ -7,12 +7,8 @@
<div class="admin-bar">
<div class="admin-bar__inner admin-bar__inner--with-button">
<div>
- <a href="{% url "apply:submissions:overview" %}" class="admin-bar__link">
- <svg><use xlink:href="#arrow"></use></svg>
- Submissions
- </a>
<h1 class="gamma heading heading--no-margin heading--bold">{{ object }}</h1>
- <p class="admin-bar__meta">{% if object.fund %}{{ object.fund }} | {% endif %}Lead: {{ object.lead }}</p>
+ <p class="admin-bar__meta">{% if object.fund %}{{ object.fund }} <span>|</span> {% endif %}Lead: {{ object.lead }}</p>
</div>
<div id="submissions-by-round-app-react-switcher"></div>
</div>
diff --git a/opentech/apply/funds/views.py b/opentech/apply/funds/views.py
index eb19a7e4a02686332a20ad85597a6bdc121a5372..b31ba4016d1a4fd448f2465ee4e25a7e29645ae5 100644
--- a/opentech/apply/funds/views.py
+++ b/opentech/apply/funds/views.py
@@ -89,7 +89,7 @@ class SubmissionOverviewView(AllActivityContextMixin, BaseAdminSubmissionsTable)
return super().get_queryset()[:5]
def get_context_data(self, **kwargs):
- base_query = RoundsAndLabs.objects.with_progress().active().order_by('-end_date')
+ base_query = RoundsAndLabs.objects.with_progress().order_by('end_date')
open_rounds = base_query.open()[:6]
open_query = '?round_state=open&active=active'
closed_rounds = base_query.closed()[:6]
diff --git a/opentech/public/navigation/templates/navigation/primarynav-apply.html b/opentech/public/navigation/templates/navigation/primarynav-apply.html
index 7e62cc2923464e30ab34dcd3b5ec27b662f9133b..a48968ebc8b9f5415e12efe286bd9d25af079341 100644
--- a/opentech/public/navigation/templates/navigation/primarynav-apply.html
+++ b/opentech/public/navigation/templates/navigation/primarynav-apply.html
@@ -3,7 +3,6 @@
{% if request.user.is_apply_staff %}
{% include "navigation/primarynav-apply-item.html" with name="Dashboard" url="dashboard:dashboard" %}
{% include "navigation/primarynav-apply-item.html" with name="Submissions" url="funds:submissions:overview" %}
- {% include "navigation/primarynav-apply-item.html" with name="Rounds" url="funds:rounds:list" %}
{% else %}
{% include "navigation/primarynav-apply-item.html" with name="Dashboard" url="dashboard:dashboard" %}
{% endif %}
diff --git a/opentech/static_src/src/app/src/components/Switcher/index.js b/opentech/static_src/src/app/src/components/Switcher/index.js
index 3f3aec96ded51b4be0178daf3fcb8edd3122c7c0..58fabc37430ba43f60dceacf49327f2a3f83652d 100644
--- a/opentech/static_src/src/app/src/components/Switcher/index.js
+++ b/opentech/static_src/src/app/src/components/Switcher/index.js
@@ -25,8 +25,8 @@ class Switcher extends React.Component {
return ReactDOM.createPortal(
<>
- <button className={`button button--switcher ${open ? 'is-active' : ''}`} onClick={handleOpen} aria-label="Show grid"><ArrayIcon /></button>
<button className={`button button--switcher ${open ? '' : 'is-active'}`} onClick={handleClose} aria-label="Show table"><GridIcon /></button>
+ <button className={`button button--switcher ${open ? 'is-active' : ''}`} onClick={handleOpen} aria-label="Show grid"><ArrayIcon /></button>
</>,
this.el,
);
diff --git a/opentech/static_src/src/sass/apply/components/_admin-bar.scss b/opentech/static_src/src/sass/apply/components/_admin-bar.scss
index 4da0302445d2ad6ea12643c3ece3cd5abe44faec..ef371d1a796b90145ab925a322066cb3ea3cf1c0 100644
--- a/opentech/static_src/src/sass/apply/components/_admin-bar.scss
+++ b/opentech/static_src/src/sass/apply/components/_admin-bar.scss
@@ -29,28 +29,11 @@
}
}
- &__link {
- display: inline-flex;
- align-items: center;
- color: $color--white;
- opacity: .8;
- transition: opacity $quick-transition;
- font-size: 14px;
- font-weight: $weight--semibold;
-
- &:hover {
- opacity: 1;
- }
-
- svg {
- width: 30px;
- height: 30px;
- fill: $color--white;
- margin-right: 5px;
- }
- }
-
&__meta {
margin: 0 0 10px;
+
+ span {
+ margin: 0 5px;
+ }
}
}
diff --git a/opentech/static_src/src/sass/apply/components/_all-submissions-table.scss b/opentech/static_src/src/sass/apply/components/_all-submissions-table.scss
index 5b843eab45c08e1919a35ea8e8390484baa01efc..81df77c7fe8888b7d61db64eda57aaaaa8f5850f 100644
--- a/opentech/static_src/src/sass/apply/components/_all-submissions-table.scss
+++ b/opentech/static_src/src/sass/apply/components/_all-submissions-table.scss
@@ -225,11 +225,6 @@
}
&__empty {
- text-align: center;
- vertical-align: middle;
- font-weight: $weight--bold;
- color: $color--default;
-
td {
padding: 20px;
}
@@ -251,8 +246,5 @@
flex-basis: auto;
font-weight: $weight--semibold;
}
-
}
-
-
}
diff --git a/opentech/templates/includes/sprites.html b/opentech/templates/includes/sprites.html
index 47242061fdef0944c6af3a145407ec16c84e5d37..b952c2e9570347fb06605d39f5bbe2b88d03c791 100644
--- a/opentech/templates/includes/sprites.html
+++ b/opentech/templates/includes/sprites.html
@@ -296,9 +296,4 @@
<symbol id="padlock" viewBox="0 0 64 64">
<g id="Icon-Lock" transform="translate(284 430)"><path class="st0" d="M-237.7-401.3h-3v-6.4c0-6.2-5.1-11.3-11.3-11.3-6.2 0-11.3 5.1-11.3 11.3v6.4h-3v-6.4c0-7.9 6.4-14.3 14.3-14.3s14.3 6.4 14.3 14.3v6.4" id="Fill-66"/><path class="st0" d="M-239.2-374.1h-25.6c-2.6 0-4.8-2.2-4.8-4.8v-19.2c0-2.6 2.2-4.8 4.8-4.8h25.6c2.6 0 4.8 2.2 4.8 4.8v19.2c0 2.7-2.2 4.8-4.8 4.8zm-25.6-25.6c-.9 0-1.6.7-1.6 1.6v19.2c0 .9.7 1.6 1.6 1.6h25.6c.9 0 1.6-.7 1.6-1.6v-19.2c0-.9-.7-1.6-1.6-1.6h-25.6z" id="Fill-67"/><path class="st0" d="M-248.8-393.3c0 1.8-1.4 3.2-3.2 3.2s-3.2-1.4-3.2-3.2 1.4-3.2 3.2-3.2 3.2 1.5 3.2 3.2" id="Fill-68"/><path class="st0" id="Fill-69" d="M-251.2-393.3h-1.6l-1.6 9.6h4.8l-1.6-9.6"/></g>
</symbol>
-
- <symbol id="arrow" viewBox="0 0 24 24">
- <path d="M0 0h24v24H0z" fill="none" />
- <path d="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z" />
- </symbol>
</svg>