diff --git a/opentech/apply/funds/templates/funds/revisions_list.html b/opentech/apply/funds/templates/funds/revisions_list.html index e4ba90161be5948ab61c37bc108e918de6ada55b..7b56f1242f5160d5d981bb2975c517ef72644bc0 100644 --- a/opentech/apply/funds/templates/funds/revisions_list.html +++ b/opentech/apply/funds/templates/funds/revisions_list.html @@ -7,16 +7,24 @@ </div> </div> -<div class="wrapper wrapper--medium wrapper--tabs"> - {% with base_revision=revisions.0.id %} - {% for revision in revisions %} - <div> - {{ revision.date }} by {{ revision.author }} - {% if not forloop.first %} - <a class="button button--primary" href="{% url 'apply:revisions:compare' submission_pk=submission.id from=revision.id to=base_revision %}">Compare</a> - {% endif %} - </div> - {% endfor %} +<div class="wrapper wrapper--medium"> + <ul class="revision"> + {% with base_revision=revisions.0.id %} + {% for revision in revisions %} + <li class="revision__item"> + <p class="revision__meta"> + <span class="revision__date">{{ revision.date }} </span> + <span>by {{ revision.author }}</span> + {% if forloop.first %} + <span class="revision__current">- current</span> + {% endif %} + </p> + {% if not forloop.first %} + <a class="button button--compare" href="{% url 'apply:revisions:compare' submission_pk=submission.id from=revision.id to=base_revision %}">Compare</a> + {% endif %} + </li> + {% endfor %} + </ul> {% endwith %} </div> {% endblock %} diff --git a/opentech/static_src/src/sass/apply/abstracts/_variables.scss b/opentech/static_src/src/sass/apply/abstracts/_variables.scss index 81126004d8b0cc4bb63af135c5335b416b3cda07..270d7feec422c9a2573fe49bb38823387456ac2d 100755 --- a/opentech/static_src/src/sass/apply/abstracts/_variables.scss +++ b/opentech/static_src/src/sass/apply/abstracts/_variables.scss @@ -84,3 +84,4 @@ $breakpoints: ( // Transition $transition: 0.25s ease-out; +$quick-transition: 0.15s ease; diff --git a/opentech/static_src/src/sass/apply/components/_button.scss b/opentech/static_src/src/sass/apply/components/_button.scss index d13790982d31c8da032c74a79e8373ec66b6152f..b5da0a5462ec417feff575bb3ee5123a4b928e3d 100644 --- a/opentech/static_src/src/sass/apply/components/_button.scss +++ b/opentech/static_src/src/sass/apply/components/_button.scss @@ -158,5 +158,28 @@ &--top-space { margin-top: 20px; } + + &--compare { + width: 75px; + padding: 3px; + margin-top: 10px; + font-size: 12px; + font-weight: $weight--bold; + text-align: center; + text-transform: uppercase; + border: 1px solid currentColor; + transition: background-color, color, border, $quick-transition; + + @include media-query(tablet-portrait) { + margin-top: 0; + } + + &:focus, + &:hover { + color: $color--white; + background-color: $color--light-blue; + border: 1px solid $color--light-blue; + } + } } diff --git a/opentech/static_src/src/sass/apply/components/_revision.scss b/opentech/static_src/src/sass/apply/components/_revision.scss new file mode 100644 index 0000000000000000000000000000000000000000..af2e53db43fd681f85e5f6e6e1a8a35f36ffb121 --- /dev/null +++ b/opentech/static_src/src/sass/apply/components/_revision.scss @@ -0,0 +1,38 @@ +.revision { + margin: 20px 0; + border: 1px solid $color--mid-grey; + + @include media-query(tablet-portrait) { + margin: 4rem 0; + } + + &__item { + display: flex; + flex-direction: column; + padding: 15px; + background: $color--white; + border-bottom: 1px dashed $color--mid-grey; + + @include media-query(tablet-portrait) { + flex-direction: row; + justify-content: space-between; + } + + &:first-child { + background-color: $color--sky-blue; + } + + &:last-child { + border-bottom: 0; + } + } + + &__meta { + margin: 0; + } + + &__date, + &__current { + font-weight: $weight--semibold; + } +} diff --git a/opentech/static_src/src/sass/apply/main.scss b/opentech/static_src/src/sass/apply/main.scss index 63871a707aac44968e454410f473add3fb67537d..e53ac847e4db149e720752f4c5bd44f04694b78f 100755 --- a/opentech/static_src/src/sass/apply/main.scss +++ b/opentech/static_src/src/sass/apply/main.scss @@ -39,6 +39,7 @@ @import 'components/reviews-sidebar'; @import 'components/select2'; @import 'components/submission-meta'; +@import 'components/revision'; @import 'components/table'; @import 'components/traffic-light'; @import 'components/wrapper';