diff --git a/opentech/apply/funds/templates/funds/submissions_by_round.html b/opentech/apply/funds/templates/funds/submissions_by_round.html index 8661c28f948911a9d064c8e71eec6d21ac98e4df..3347bda8965342d6a2f5ff6900f584c3a82767ee 100644 --- a/opentech/apply/funds/templates/funds/submissions_by_round.html +++ b/opentech/apply/funds/templates/funds/submissions_by_round.html @@ -7,9 +7,12 @@ <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> + <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> - <h5>{% if object.fund %}{{ object.fund }} | {% endif %}Lead: {{ object.lead }}</h5> + <p class="admin-bar__meta">{% if object.fund %}{{ object.fund }} | {% endif %}Lead: {{ object.lead }}</p> </div> <div id="submissions-by-round-app-react-switcher"></div> </div> 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/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..4da0302445d2ad6ea12643c3ece3cd5abe44faec 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,29 @@ margin-bottom: 0; } } + + &__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; + } } 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..5b843eab45c08e1919a35ea8e8390484baa01efc 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; 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; } } diff --git a/opentech/templates/includes/sprites.html b/opentech/templates/includes/sprites.html index b952c2e9570347fb06605d39f5bbe2b88d03c791..47242061fdef0944c6af3a145407ec16c84e5d37 100644 --- a/opentech/templates/includes/sprites.html +++ b/opentech/templates/includes/sprites.html @@ -296,4 +296,9 @@ <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>