diff --git a/opentech/apply/funds/templates/funds/submissions_by_round.html b/opentech/apply/funds/templates/funds/submissions_by_round.html
index 8661c28f948911a9d064c8e71eec6d21ac98e4df..2aee68595093c4fb1ecc7df571dbef701a500b53 100644
--- a/opentech/apply/funds/templates/funds/submissions_by_round.html
+++ b/opentech/apply/funds/templates/funds/submissions_by_round.html
@@ -7,9 +7,8 @@
<div class="admin-bar">
<div class="admin-bar__inner admin-bar__inner--with-button">
<div>
- <h5><a href="{% url "apply:submissions:overview" %}">< Submissions</a></h5>
<h1 class="gamma heading heading--no-margin heading--bold">{{ object }}</h1>
- <h5>{% if object.fund %}{{ object.fund }} | {% endif %}Lead: {{ object.lead }}</h5>
+ <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/apply/review/templatetags/review_tags.py b/opentech/apply/review/templatetags/review_tags.py
index 444a7e27cbb9fe50fcdabff84e9ec9c03cf39538..e5ef985c5bb9a148cb20a60a4aaccf07593dba08 100644
--- a/opentech/apply/review/templatetags/review_tags.py
+++ b/opentech/apply/review/templatetags/review_tags.py
@@ -21,7 +21,7 @@ TRAFFIC_LIGHT_COLORS = {
}
}
-TRAFFIC_LIGHT_TEMPLATE = '<span class="traffic-light traffic-light--{color}">{value}</span>'
+TRAFFIC_LIGHT_TEMPLATE = '<span aria-label="Traffic light score" class="traffic-light traffic-light--{color}">{value}</span>'
@register.filter()
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/abstracts/_variables.scss b/opentech/static_src/src/sass/apply/abstracts/_variables.scss
index dd696f978e042db6d19e5cadc9a3ec926dbf3847..c4e87dfd68b25855e2d32040473b05eebd7d5b49 100644
--- a/opentech/static_src/src/sass/apply/abstracts/_variables.scss
+++ b/opentech/static_src/src/sass/apply/abstracts/_variables.scss
@@ -26,7 +26,7 @@ $color--mint: #40c2ad;
$color--grass: #7dc588;
$color--ocean: #1888b1;
$color--sky-blue: #e7f2f6;
-$color--marine: #177da8;
+$color--marine: #14729a;
$color--mist: #f3fafe;
$color--green: #7dc558;
$color--pastel-red: #f1a9a9;
@@ -39,6 +39,7 @@ $color--linkedin: #137ab8;
$color--facebook: #396ab5;
// Transparent
+$color--black-60: rgba(0, 0, 0, .6);
$color--black-50: rgba(0, 0, 0, .5);
$color--black-40: rgba(0, 0, 0, .4);
$color--black-25: rgba(0, 0, 0, .25);
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 9cc8a34affd212942794afee61b732f8529eb8b6..ef371d1a796b90145ab925a322066cb3ea3cf1c0 100644
--- a/opentech/static_src/src/sass/apply/components/_admin-bar.scss
+++ b/opentech/static_src/src/sass/apply/components/_admin-bar.scss
@@ -28,4 +28,12 @@
margin-bottom: 0;
}
}
+
+ &__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 fae5401c5bf37bd6067f631e12dfc69c61cbc573..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
@@ -13,7 +13,7 @@
th {
&.reviews_stats { // sass-lint:disable-line class-name-format
- color: $color--mid-dark-grey;
+ color: $color--black-60;
span {
font-size: 13px;
@@ -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/static_src/src/sass/apply/components/_table.scss b/opentech/static_src/src/sass/apply/components/_table.scss
index 3b5dfbe90b3b4048efab1c55d267c7a545dd5d47..5bb173ed3f425c1ca9a4f557d5b2414287e5e4b6 100644
--- a/opentech/static_src/src/sass/apply/components/_table.scss
+++ b/opentech/static_src/src/sass/apply/components/_table.scss
@@ -13,7 +13,7 @@ table {
text-align: left;
a {
- color: $color--mid-dark-grey;
+ color: $color--black-60;
transition: color .25s ease-out;
}
}