From a6b4373b5007b26b24476bdbb9d89fe6c38f49d3 Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Wed, 23 Sep 2020 17:31:08 +0100 Subject: [PATCH 1/6] changed hero stat text in round card --- config/locales/home/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/home/en.yml b/config/locales/home/en.yml index 425fd8135..e0083eb7c 100644 --- a/config/locales/home/en.yml +++ b/config/locales/home/en.yml @@ -15,7 +15,7 @@ en: title: Marine OECM & Protected Area Coverage hero: button: Explore Protected Areas - stat-text: Global Coverage of Protected Areas + stat-text: Global coverage of protected and conserved areas pas: title: Explore Protected Areas by... button: Explore All From 43c865bd449567a94a38f28b7d188feef8e00697 Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Wed, 23 Sep 2020 17:47:31 +0100 Subject: [PATCH 2/6] changed order of text in fact cards and changed them to initial caps --- .../stylesheets/components/cards/cards/_cards-facts.scss | 2 +- app/views/partials/cards/_facts.html.erb | 2 +- config/locales/home/en.yml | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/components/cards/cards/_cards-facts.scss b/app/assets/stylesheets/components/cards/cards/_cards-facts.scss index 52c3ae05a..e5b480f04 100644 --- a/app/assets/stylesheets/components/cards/cards/_cards-facts.scss +++ b/app/assets/stylesheets/components/cards/cards/_cards-facts.scss @@ -65,7 +65,7 @@ $cards-facts-height-tablet: rem-calc(294); @include breakpoint($small) { font-size: rem-calc(20); - margin-top: 0; + margin-top: rem-calc(10); } } diff --git a/app/views/partials/cards/_facts.html.erb b/app/views/partials/cards/_facts.html.erb index 5311bac83..d159fa103 100644 --- a/app/views/partials/cards/_facts.html.erb +++ b/app/views/partials/cards/_facts.html.erb @@ -6,13 +6,13 @@ <%= render '/partials/svgs/pin.svg' %> <%= card[:percentage] %>% -

<%= card[:title] %>

<% card[:totals].each do |total| %>

<%= total[:number] %>: <%= total[:text] %>

<% end %> +

<%= card[:title] %>

<% end %> diff --git a/config/locales/home/en.yml b/config/locales/home/en.yml index e0083eb7c..bfae0e8af 100644 --- a/config/locales/home/en.yml +++ b/config/locales/home/en.yml @@ -3,16 +3,16 @@ en: facts: - theme: terrestrial - title: Terrestrial Protected Area Coverage + title: Terrestrial protected area coverage - theme: marine - title: Marine Protected Area Coverage + title: Marine protected area coverage - theme: oecm - title: Terrestrial OECM & Protected Area Coverage + title: Terrestrial OECM & protected area coverage - theme: oecm - title: Marine OECM & Protected Area Coverage + title: Marine OECM & protected area coverage hero: button: Explore Protected Areas stat-text: Global coverage of protected and conserved areas From 6e8d21567f40d320e455a78facccd7bfe30beb16 Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Wed, 23 Sep 2020 17:48:41 +0100 Subject: [PATCH 3/6] removed coastal from map legend --- config/locales/map/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/map/en.yml b/config/locales/map/en.yml index a9d76b578..b5a4f5d75 100644 --- a/config/locales/map/en.yml +++ b/config/locales/map/en.yml @@ -8,7 +8,7 @@ en: terrestrial_wdpa: title: Terrestrial Protected Areas marine_wdpa: - title: Coastal and Marine Protected Areas + title: Marine Protected Areas oecm_marine: title: Other effective area-based conservation measures oecm: From 6a45268c8c076d2cf522690cac55103b2099b963 Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Wed, 23 Sep 2020 17:56:52 +0100 Subject: [PATCH 4/6] removed the little stat card with number of sites from carousel slide --- app/views/partials/sub_partials/_themes.html.erb | 11 ----------- db | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/app/views/partials/sub_partials/_themes.html.erb b/app/views/partials/sub_partials/_themes.html.erb index deecc17aa..c6d6b6590 100644 --- a/app/views/partials/sub_partials/_themes.html.erb +++ b/app/views/partials/sub_partials/_themes.html.erb @@ -2,17 +2,6 @@ title: "View the #{theme[:obj][:label]} page", class: "card--theme", style: "background-image: url('#{cms_fragment_render(:image, theme[:obj])}')" do %> - <% unless theme[:pas_no] == -1 %> -
- - <%= render '/partials/svgs/pin.svg' %> - -

- <%= theme[:pas_no] %> - <%= t('global.area-types.wdpa') %> -

-
- <% end %>

<%= theme[:obj][:label] %>

<%= cms_fragment_content(:summary, theme[:obj]) %>

diff --git a/db b/db index 3d8e969d2..20cf4a221 160000 --- a/db +++ b/db @@ -1 +1 @@ -Subproject commit 3d8e969d2bf7db404864cacd2492bf83c6036e2c +Subproject commit 20cf4a221dcf4463d352e47c20b66a8ec707f3c1 From d8b78e81dabb797653ec00e5ad0a666b36c83883 Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Wed, 23 Sep 2020 18:06:37 +0100 Subject: [PATCH 5/6] aligned text to top of carousel card --- app/assets/stylesheets/components/cards/card/_card-theme.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/components/cards/card/_card-theme.scss b/app/assets/stylesheets/components/cards/card/_card-theme.scss index 07b9c448d..b18dbf2f5 100644 --- a/app/assets/stylesheets/components/cards/card/_card-theme.scss +++ b/app/assets/stylesheets/components/cards/card/_card-theme.scss @@ -3,7 +3,7 @@ @include border-radius; @include flex; @include flex-column; - @include flex-h-end; + @include flex-h-start; background-color: $grey-dark; background-position: center; background-size: cover; From f2d08239c05b759d62f95a48017f7f0c30053c07 Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Wed, 23 Sep 2020 18:12:43 +0100 Subject: [PATCH 6/6] got rid of unused styles for the card ribbon --- .../components/cards/card/_card-theme.scss | 50 ------------------- 1 file changed, 50 deletions(-) diff --git a/app/assets/stylesheets/components/cards/card/_card-theme.scss b/app/assets/stylesheets/components/cards/card/_card-theme.scss index b18dbf2f5..708c78f0c 100644 --- a/app/assets/stylesheets/components/cards/card/_card-theme.scss +++ b/app/assets/stylesheets/components/cards/card/_card-theme.scss @@ -24,56 +24,6 @@ &::before { @include border-radius; } .card { - &__ribbon { - @include flex; - @include flex-column; - @include flex-h-between; - @include flex-v-center; - background-color: $grey-black; - padding: rem-calc(20 10); - text-align: center; - width: rem-calc(134); height: rem-calc(134); - - position: absolute; - top: 0; - - @include breakpoint ($small) { - width: rem-calc(150); height: rem-calc(150); - - right: rem-calc(26); - } - - @include breakpoint ($medium) { right: rem-calc(44); } - } - - &__icon { - @include icon-pin-terrestrial-light; - flex-shrink: 0; - - &.marine-protected-areas { @include icon-pin-marine-light; } - &.oecms { @include icon-pin-oecm-light; } - } - - &__number { - color: $primary; - font-size: rem-calc(20); - font-weight: $bold; - line-height: 1; - margin-top: rem-calc(10); - - display: block; - - @include breakpoint ($small) { font-size: rem-calc(30); } - @include breakpoint ($medium) { font-size: rem-calc(40); } - } - - &__number-text { - font-size: rem-calc(16); - line-height: 1; - - @include breakpoint ($small) { font-size: rem-calc(18); } - } - &__summary { display: none;