diff --git a/opentech/apply/funds/templates/funds/includes/review_sidebar_item.html b/opentech/apply/funds/templates/funds/includes/review_sidebar_item.html index 87dce8719f82253bbee129474ba5ad2f56b20a1e..be0bba5a1275fcdfecc6d6f717fddc1b7adf7df0 100644 --- a/opentech/apply/funds/templates/funds/includes/review_sidebar_item.html +++ b/opentech/apply/funds/templates/funds/includes/review_sidebar_item.html @@ -37,7 +37,9 @@ <li class="reviews-sidebar__item reviews-sidebar__item--decision"> <div class="reviews-sidebar__name"> <span>{{ opinion.author }}</span> - {% if opinion.role %}{% image opinion.role.icon max-12x12 %}{% endif %} + {% with role=opinion.get_author_role %} + {% if role %}{% image role.icon max-12x12 %}{% endif %} + {% endwith %} </div> <div></div> <div class="reviews-sidebar__outcome {{ opinion.get_opinion_display|lower }}">{{ opinion.get_opinion_display}}</div> diff --git a/opentech/apply/funds/templates/funds/tables/table.html b/opentech/apply/funds/templates/funds/tables/table.html index 3111c4aef4aaa2434bb32dba3e24c9394b3f0314..6a5b6179c31d74590cfe3b065c2efdc384034553 100644 --- a/opentech/apply/funds/templates/funds/tables/table.html +++ b/opentech/apply/funds/templates/funds/tables/table.html @@ -40,10 +40,18 @@ <span class="list__item list__item--reviewer-outcome">{{ review.get_recommendation_display }}</span> </li> {% for opinion in review.opinions.all %} - <li class="list__item list__item--reviewer"> - <span class="list__item--reviewer-name">{{ opinion.author }}</span> - <span class="list__item list__item--reviewer-outcome">{{ opinion.get_opinion_display }}</span> - </li> + {% if forloop.first %} + <ul class="list list--opinion"> + {% endif %} + + <li class="list__item list__item--reviewer list__item--opinion"> + <span class="list__item--reviewer-name">{{ opinion.author }}</span> + <span class="list__item list__item--reviewer-outcome {{ opinion.get_opinion_display|lower }}">{{ opinion.get_opinion_display }}</span> + </li> + + {% if forloop.last %} + </ul> + {% endif %} {% endfor %} {% endfor %} </ul> diff --git a/opentech/static_src/src/sass/apply/base/_base.scss b/opentech/static_src/src/sass/apply/base/_base.scss index 8ab04c2e5d8a29a34c90e499fe7e255cecb5004d..eeee4df8c77e9a6a08b31a645c06e00034c3c5b3 100644 --- a/opentech/static_src/src/sass/apply/base/_base.scss +++ b/opentech/static_src/src/sass/apply/base/_base.scss @@ -16,10 +16,6 @@ html { -webkit-text-size-adjust: 100%; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - - @supports(overflow-y: overlay) { - overflow-y: overlay; - } } body { @@ -27,7 +23,13 @@ body { &.no-scroll { overflow-y: hidden; - } + } + + &.app-open { + @supports(overflow-y: overlay) { + overflow-y: overlay; + } + } } // Prevent empty space below images appearing diff --git a/opentech/static_src/src/sass/apply/components/_button.scss b/opentech/static_src/src/sass/apply/components/_button.scss index abee4d4ec20a50a6d82659386b6d4c89e78815c4..13665210138405bb396e68fb1d74cd1a76ac59b4 100644 --- a/opentech/static_src/src/sass/apply/components/_button.scss +++ b/opentech/static_src/src/sass/apply/components/_button.scss @@ -237,6 +237,7 @@ &:disabled { color: $color--mid-dark-grey; cursor: not-allowed; + pointer-events: all; // to show the tooltip on hover // tooltip &::before { diff --git a/opentech/static_src/src/sass/apply/components/_list.scss b/opentech/static_src/src/sass/apply/components/_list.scss index 630a571bb0878ee57e5e670cb5270a66a73ab44b..8b1f94a63f1662e1df1c028868acd98776e4fcf4 100644 --- a/opentech/static_src/src/sass/apply/components/_list.scss +++ b/opentech/static_src/src/sass/apply/components/_list.scss @@ -5,6 +5,36 @@ margin: 0; } + &--opinion { + position: relative; + font-size: 14px; + border-top: 1px solid $color--mid-grey; + border-bottom: 1px solid $color--mid-grey; + margin: 10px 0; + padding: 5px 0; + max-width: 150px; + + #{$root}__item--opinion:first-child { + span:last-child { + &::before, + &::after { + position: absolute; + top: -15px; + right: 5px; + } + + &::after { + @include triangle(top, $color--mist, 6px); + top: -13px; + } + + &::before { + @include triangle(top, $color--mid-grey, 6px); + } + } + } + } + &__item { &--reviewer { display: flex; @@ -30,10 +60,19 @@ text-align: right; } } + + #{$root}__item--opinion & { + font-weight: $weight--normal; + } } &--reviewer-outcome { color: $color--tomato; + position: relative; + + &.agree { + color: $color--green; + } } } } diff --git a/opentech/static_src/src/sass/apply/components/_status-block.scss b/opentech/static_src/src/sass/apply/components/_status-block.scss index 4184cf264ac021b06c120637f47b522d0813c9d9..f7acc3acce0f476492125273479f0a51eff9e9d1 100644 --- a/opentech/static_src/src/sass/apply/components/_status-block.scss +++ b/opentech/static_src/src/sass/apply/components/_status-block.scss @@ -56,6 +56,7 @@ &__title { font-weight: $weight--semibold; + width: 100%; } &__link {