From 807d269fd2a21be08b0894de008708380aac3c74 Mon Sep 17 00:00:00 2001 From: stacytalbot Date: Wed, 22 Apr 2020 14:38:11 +0100 Subject: [PATCH 01/11] Delete old files --- app/views/marine/index.html.erb | 72 ++++++++----------- .../marine/sections/_designations.html.erb | 41 ----------- .../marine/sections/_ecoregions.html.erb | 27 ------- app/views/marine/sections/_footer.html.erb | 59 --------------- app/views/marine/sections/_greenlist.html.erb | 20 ------ app/views/marine/sections/_header.html.erb | 57 --------------- .../{_coverage_map.html.erb => _map.html.erb} | 4 +- app/views/marine/sections/_pledges.html.erb | 39 ---------- .../social/_sharing.html.erb} | 0 9 files changed, 30 insertions(+), 289 deletions(-) delete mode 100644 app/views/marine/sections/_designations.html.erb delete mode 100644 app/views/marine/sections/_ecoregions.html.erb delete mode 100644 app/views/marine/sections/_footer.html.erb delete mode 100644 app/views/marine/sections/_greenlist.html.erb delete mode 100644 app/views/marine/sections/_header.html.erb rename app/views/marine/sections/{_coverage_map.html.erb => _map.html.erb} (93%) delete mode 100644 app/views/marine/sections/_pledges.html.erb rename app/views/{marine/sections/_social_sharing.html.erb => partials/social/_sharing.html.erb} (100%) diff --git a/app/views/marine/index.html.erb b/app/views/marine/index.html.erb index 1afbd2bdc..1339d71af 100644 --- a/app/views/marine/index.html.erb +++ b/app/views/marine/index.html.erb @@ -1,3 +1,25 @@ +<%= content_for :twitter_card, "summary_large_image" %> +<%= content_for :social_title, "Explore the World's Marine Protected Areas" %> +<%= content_for :social_description, "Over 70% of the surface of Earth is ocean, comprised of highly diverse ecosystems, and providing a wide range of marine ecosystem services that support human society, health and the economy. This website presents the most recent official coverage statistics for marine protected areas, updated monthly from the World Database on Protected Areas." %> +<%= content_for :social_image, image_url('social-marine.png') %> +<%= content_for :social_image_alt, "A map of the world with highlighted areas that represent protected areas. The following statistics are shown: there are #{@marine_statistics['total_marine_protected_areas']} marine protected areas, #{@marine_statistics['total_ocean_pa_coverage_percentage']} of the ocean is covered by protected areas and the total area protected is 23,036,078km² These statistics are for 2017." %> + + +

Highlight some text to share via Twitter or Email.

+ + + + +
+ + +<%= download_dropdown("marine", "general", [:csv, :shp, :pdf]) %> +
+ +<%= link_to 'Learn how we calculate protected area coverage statistics', '/c/calculating-protected-area-coverage' %> + <%= render partial: "./layouts/partials/hero-thematic", locals: { button_text: 'Explore marine protected areas', ##TODO put in yml button_url: search_areas_path('wdpa'), ##TODO add params to filter marine sites @@ -7,22 +29,11 @@ summary: cms_fragment_render(:summary, @cms_page) } %> -<%= link_to 'Learn how we calculate protected area coverage statistics', '/c/calculating-protected-area-coverage' %> -

<%= cms_fragment_render(:section_distribution_title, @cms_page) %>

<%= cms_fragment_render(:section_distribution_content, @cms_page) %>
- - <%= render partial: "marine/sections/ocean", locals: { national: marine_stats('national_waters_percentage'), national_coverage: marine_stats('national_waters_pa_coverage_percentage'), @@ -30,14 +41,11 @@ high_seas_coverage: marine_stats('high_seas_pa_coverage_percentage') } %> - <%= render partial: "marine/sections/coverage", locals: { cms_page: @cms_page } %> -<%= - render partial: "marine/sections/national" -%> +<%= render partial: "marine/sections/national" %>

<%= cms_fragment_render(:section_size_title, @cms_page) %>

@@ -52,40 +60,16 @@ regionCoverage: @regionCoverage, } %> -<%= render partial: "marine/sections/coverage_map" %> +<%= render partial: "marine/sections/map" %>
<%= render partial: "partials/cards/sites", locals: { - cards: cards, - title: "#{t('global.area-types.wdpa')} (#{wdpaMarineTotal})", - url: urlViewAll + cards: @marineSites, + title: "#{t('global.area-types.wdpa')} (#{@marineSitesTotal})", + url: @marineViewAllUrl } %>
<%= render "partials/carousels/themes" %> -<%= render "partials/ctas/live-report" %> - -<%= content_for :twitter_card, "summary_large_image" %> -<%= content_for :social_title, "Explore the World's Marine Protected Areas" %> -<%= content_for :social_description, "Over 70% of the surface of Earth is ocean, comprised of highly diverse ecosystems, and providing a wide range of marine ecosystem services that support human society, health and the economy. This website presents the most recent official coverage statistics for marine protected areas, updated monthly from the World Database on Protected Areas." %> -<%= content_for :social_image, image_url('social-marine.png') %> -<%= content_for :social_image_alt, "A map of the world with highlighted areas that represent protected areas. The following statistics are shown: there are #{@marine_statistics['total_marine_protected_areas']} marine protected areas, #{@marine_statistics['total_ocean_pa_coverage_percentage']} of the ocean is covered by protected areas and the total area protected is 23,036,078km² These statistics are for 2017." %> - - -

Highlight some text to share via Twitter or Email.

- - - - -
- - -<%= download_dropdown("marine", "general", [:csv, :shp, :pdf]) %> -
- -
-<%= render partial: "marine/sections/footer" %> -
+<%= render "partials/ctas/live-report" %> \ No newline at end of file diff --git a/app/views/marine/sections/_designations.html.erb b/app/views/marine/sections/_designations.html.erb deleted file mode 100644 index 232214324..000000000 --- a/app/views/marine/sections/_designations.html.erb +++ /dev/null @@ -1,41 +0,0 @@ -

Most recent designations

- -

- -

- -
-
- - <% - # NOTE - # If you update the table header names - # make sure you update the :before content - # for the table cells in table.scss - %> - -
PA name
-
Country
-
Size
-
Date of designation
-
- -
- <% @designations.each do |designation| %> -
-
- <%= link_to designation[:name], protected_area_path(designation[:wdpa_id]) %> -
-
- <%= link_to designation[:country], designation[:iso].present? ? country_path(designation[:iso]) : '#!' %> -
-
- <%= designation[:size] %> -
-
- <%= designation[:date] %> -
-
- <% end %> -
-
diff --git a/app/views/marine/sections/_ecoregions.html.erb b/app/views/marine/sections/_ecoregions.html.erb deleted file mode 100644 index cff2744e7..000000000 --- a/app/views/marine/sections/_ecoregions.html.erb +++ /dev/null @@ -1,27 +0,0 @@ -
-
-

Marine protected area representation

- -

- Despite these positive trends, gaps in MPA coverage or representativeness may undermine the conservation impact of existing MPAs. As of 2018, half of the 62 marine provinces have over 10% of their area covered by protected areas, representing an increase of 12% since 2014. Potential opportunities for new MPAs, such as in ABNJ or in areas of known critical habitat, would help to generate a globally representative network of MPAs. -

-
-
-
-
-

50% of all marine provinces have over 10% of their marine area protected

-
-
-
-
- -
-
-

Most protected marine provinces

- -
-
-

Least protected marine provinces

- -
-
diff --git a/app/views/marine/sections/_footer.html.erb b/app/views/marine/sections/_footer.html.erb deleted file mode 100644 index 03d225b5d..000000000 --- a/app/views/marine/sections/_footer.html.erb +++ /dev/null @@ -1,59 +0,0 @@ - diff --git a/app/views/marine/sections/_greenlist.html.erb b/app/views/marine/sections/_greenlist.html.erb deleted file mode 100644 index a323f4820..000000000 --- a/app/views/marine/sections/_greenlist.html.erb +++ /dev/null @@ -1,20 +0,0 @@ -

Effectively and equitably managed marine protected areas

- -
-

- An increasing need exists for the evaluation and understanding of the effectiveness of marine protected areas operating around the world. Protected Area Management Effectiveness (PAME), and in particular the Management Effectiveness Tracking Tool (METT), is used in many parts of the world. Using such tools, a recent study (Gill et al. 2017) suggests that while ecological factors are key to enhancing the performance of MPAs, available capacity including resources and staff are fundamental for effective protected area management. -

-

- The International Union for Conservation of Nature (IUCN) World Commission on Protected Areas initiated the <%= link_to 'IUCN Green List', '/c/green-list' %> of Protected and Conserved Areas Standard to increase the number of protected and conserved areas that are effectively and equitably managed and deliver conservation outcomes. See a list of marine protected areas below that potentially meet the Green List Standard. -

-
- -
- <% @green_list_areas.each do |area| %> -
-
- <%#= render 'search/protected_area', model: area %> -
-
- <% end %> -
diff --git a/app/views/marine/sections/_header.html.erb b/app/views/marine/sections/_header.html.erb deleted file mode 100644 index 78b57e463..000000000 --- a/app/views/marine/sections/_header.html.erb +++ /dev/null @@ -1,57 +0,0 @@ -<% -nav = '[ - { - id: "distribution", - name: "MPA distribution" - }, - { - id: "growth", - name: "Growth in coverage" - }, - { - id: "national", - name: "Coverage of national waters" - }, - { - id: "size-distribution", - name: "Size distribution" - }, - { - id: "ecoregions", - name: "MPA representation" - }, - { - id: "pledges", - name: "Pledges and designations" - }, - { - id: "greenlist", - name: "Green listing" - } -]' - -%> - -
- <%#= render partial: "marine/sections/social_sharing" %> - -
-
-

- Explore the World's - Marine Protected Areas -

- -
-

- Over 70% of the surface of Earth is ocean, comprised of highly diverse ecosystems, and providing a wide range of marine ecosystem services that support human society, health and the economy. This website presents the most recent official coverage statistics for marine protected areas, updated monthly from the <%= link_to 'World Database on Protected Areas', '/' %>. -

-

- <%= link_to 'Learn how we calculate protected area coverage statistics', '/c/calculating-protected-area-coverage' %> -

-
-
-
- - -
diff --git a/app/views/marine/sections/_coverage_map.html.erb b/app/views/marine/sections/_map.html.erb similarity index 93% rename from app/views/marine/sections/_coverage_map.html.erb rename to app/views/marine/sections/_map.html.erb index 466c96bb1..eb6270238 100644 --- a/app/views/marine/sections/_coverage_map.html.erb +++ b/app/views/marine/sections/_map.html.erb @@ -1,4 +1,4 @@ -

Protected areas coverage in <%= Date.today.year %>

+

MAP

The designations employed and the presentation of material on this map do not imply the expression of any opinion whatsoever on the part of the Secretariat of the United Nations concerning the legal status of any country, territory, city or area or of its authorities, or concerning the delimitation of its frontiers or boundaries.

-
+
\ No newline at end of file diff --git a/app/views/marine/sections/_pledges.html.erb b/app/views/marine/sections/_pledges.html.erb deleted file mode 100644 index 2cd301727..000000000 --- a/app/views/marine/sections/_pledges.html.erb +++ /dev/null @@ -1,39 +0,0 @@ -
-

Commitments and pledges

- -
-

- UNEP-WCMC and the Convention on Biological Diversity (CBD) secretariat are tracking commitments made by nations to expand their protected area networks. As of 2018, over 15 million km² has been pledged by over 70 countries and territories. The Regional Seas Conventions play a fundamental role in supporting sustainable management and use of the marine and coastal environment. Two of these regional conventions, namely OSPAR, the regional sea organization for the North East Atlantic, and the Convention for the Conservation of Antarctic Marine Living Resources (CCMALR) have driven the establishment of MPAs in areas beyond national jurisdiction. -

- -

- Submissions by countries to the World Database on Protected Areas are used to track progress towards global environmental commitments such as the United Nations Sustainable Development Goals (SDGs) and the Aichi Biodiversity Targets under the Strategic Plan for Biodiversity 2011-2020. -

-
-
- -
-
-

Current pledges

-

km2

-
- -
-
-
-

Global MPA pledges

- -<% -=begin%> - <%= link_to '/', title: 'Download the commitments and pledges data', class: 'button--basic-link u-hide-mobile' do %> - - Download this data - <% end %> -<% -=end%> -
- - -
-
-
diff --git a/app/views/marine/sections/_social_sharing.html.erb b/app/views/partials/social/_sharing.html.erb similarity index 100% rename from app/views/marine/sections/_social_sharing.html.erb rename to app/views/partials/social/_sharing.html.erb From b82d1671fbaa797a9f066872da9101a9b01d4783 Mon Sep 17 00:00:00 2001 From: stacytalbot Date: Wed, 22 Apr 2020 15:56:04 +0100 Subject: [PATCH 02/11] Sort out grey containers --- app/assets/stylesheets/base/_base.scss | 13 +++++++++++++ app/views/marine/sections/_coverage.html.erb | 4 ++-- app/views/marine/sections/_coverage_growth.html.erb | 4 ++-- app/views/marine/sections/_national.html.erb | 4 ++-- app/views/marine/sections/_ocean.html.erb | 4 ++-- app/views/marine/sections/_size_growth.html.erb | 4 ++-- 6 files changed, 23 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/base/_base.scss b/app/assets/stylesheets/base/_base.scss index 12e04f968..9a69eed57 100644 --- a/app/assets/stylesheets/base/_base.scss +++ b/app/assets/stylesheets/base/_base.scss @@ -88,6 +88,19 @@ img { max-width: 100%; } } } +.container--component { + $container-component-padding: calc((100% - #{$site-width-medium-desktop})/2); + $cc-padding-small: rem-calc(20 $gutter-small 24); + $cc-padding-medium: rem-calc(20 $gutter-medium 24); + $cc-padding-large: rem-calc(30 $container-component-padding 34); + + @include bg-grey-xlight; + @include border-radius; + @include responsive(margin-top, rem-calc(26), rem-calc(30), rem-calc(36)); + @include responsive(margin-bottom, rem-calc(26), rem-calc(30), rem-calc(36)); + @include responsive(padding, $cc-padding-small, $cc-padding-medium, $cc-padding-large); +} + //-------------------------------------------------- // page padding //-------------------------------------------------- diff --git a/app/views/marine/sections/_coverage.html.erb b/app/views/marine/sections/_coverage.html.erb index b871cc80d..09af1fbfa 100644 --- a/app/views/marine/sections/_coverage.html.erb +++ b/app/views/marine/sections/_coverage.html.erb @@ -1,5 +1,5 @@ -
-
+
+

<%= cms_fragment_render(:section_coverage_title, cms_page) %>

<%= cms_fragment_render(:section_coverage_content, cms_page) %>
diff --git a/app/views/marine/sections/_coverage_growth.html.erb b/app/views/marine/sections/_coverage_growth.html.erb index fa66a5660..60133632a 100644 --- a/app/views/marine/sections/_coverage_growth.html.erb +++ b/app/views/marine/sections/_coverage_growth.html.erb @@ -1,5 +1,5 @@ -
-
+
+

<%= cms_fragment_render(:section_coverage_growth_title, @cms_page) %>

<%= cms_fragment_render(:section_coverage_growth_content, @cms_page) %>
diff --git a/app/views/marine/sections/_national.html.erb b/app/views/marine/sections/_national.html.erb index e827273c3..ed68aab33 100644 --- a/app/views/marine/sections/_national.html.erb +++ b/app/views/marine/sections/_national.html.erb @@ -1,5 +1,5 @@ -
-
+
+

<%= cms_fragment_render(:section_national_title, @cms_page) %>

<%= cms_fragment_render(:section_national_content, @cms_page) %>
diff --git a/app/views/marine/sections/_ocean.html.erb b/app/views/marine/sections/_ocean.html.erb index e487f40ce..b0e838365 100644 --- a/app/views/marine/sections/_ocean.html.erb +++ b/app/views/marine/sections/_ocean.html.erb @@ -1,5 +1,5 @@ -
-
+
+

<%= cms_fragment_render(:section_ocean_title, @cms_page) %>

<%= cms_fragment_render(:section_ocean_content, @cms_page) %>
diff --git a/app/views/marine/sections/_size_growth.html.erb b/app/views/marine/sections/_size_growth.html.erb index 6621d1486..0e29c94d1 100644 --- a/app/views/marine/sections/_size_growth.html.erb +++ b/app/views/marine/sections/_size_growth.html.erb @@ -1,5 +1,5 @@ -
-
+
+

<%= cms_fragment_render(:section_size_growth_title, @cms_page) %>

<%= cms_fragment_render(:section_size_growth_content, @cms_page) %>
From 107497026b4f9985fb38a4fb5c60e750d1accf18 Mon Sep 17 00:00:00 2001 From: stacytalbot Date: Wed, 22 Apr 2020 16:14:18 +0100 Subject: [PATCH 03/11] Delete out old tracking that isn't being used --- app/views/marine/sections/_map.html.erb | 54 +++++++++++++------------ app/views/partials/_hotjar.html.erb | 10 ----- app/views/partials/_mouseflow.html.erb | 8 ---- app/views/partials/_uservoice.html.erb | 14 ------- 4 files changed, 28 insertions(+), 58 deletions(-) delete mode 100644 app/views/partials/_hotjar.html.erb delete mode 100644 app/views/partials/_mouseflow.html.erb delete mode 100644 app/views/partials/_uservoice.html.erb diff --git a/app/views/marine/sections/_map.html.erb b/app/views/marine/sections/_map.html.erb index eb6270238..fa1a3b56a 100644 --- a/app/views/marine/sections/_map.html.erb +++ b/app/views/marine/sections/_map.html.erb @@ -1,31 +1,33 @@ -

MAP

+
+

MAP

-
-
-
+
+
+
- -
+

Total area protected

+

km2

+
--> +
-
-

- The designations employed and the presentation of material on this map do not imply the expression of any opinion whatsoever on the part of the Secretariat of the United Nations concerning the legal status of any country, territory, city or area or of its authorities, or concerning the delimitation of its frontiers or boundaries. -

-
\ No newline at end of file +
+

+ The designations employed and the presentation of material on this map do not imply the expression of any opinion whatsoever on the part of the Secretariat of the United Nations concerning the legal status of any country, territory, city or area or of its authorities, or concerning the delimitation of its frontiers or boundaries. +

+
+
\ No newline at end of file diff --git a/app/views/partials/_hotjar.html.erb b/app/views/partials/_hotjar.html.erb deleted file mode 100644 index dae997138..000000000 --- a/app/views/partials/_hotjar.html.erb +++ /dev/null @@ -1,10 +0,0 @@ - diff --git a/app/views/partials/_mouseflow.html.erb b/app/views/partials/_mouseflow.html.erb deleted file mode 100644 index 70a245ba6..000000000 --- a/app/views/partials/_mouseflow.html.erb +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/app/views/partials/_uservoice.html.erb b/app/views/partials/_uservoice.html.erb deleted file mode 100644 index 9784bdd89..000000000 --- a/app/views/partials/_uservoice.html.erb +++ /dev/null @@ -1,14 +0,0 @@ - From 7b48a2c7109a9cf984c8d82a360d688d4e8c6ab6 Mon Sep 17 00:00:00 2001 From: stacytalbot Date: Wed, 22 Apr 2020 16:15:02 +0100 Subject: [PATCH 04/11] Tidy up application layout file --- app/views/layouts/application.html.erb | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 0e698c556..402c7666d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -6,12 +6,6 @@
- - <%= render "layouts/partials/topbar" %> <%= yield %> @@ -20,13 +14,5 @@
<%= render 'partials/download_modal' %> - - <%#= javascript_include_tag controller_name %> - - <% if Rails.env == 'production' %> - <%= render 'partials/hotjar' %> - <%= render 'partials/mouseflow' %> - <%= render 'partials/uservoice' %> - <% end %> From 44b00215893dff4cc782c10fadfbaad2c77184fb Mon Sep 17 00:00:00 2001 From: stacytalbot Date: Wed, 22 Apr 2020 16:54:19 +0100 Subject: [PATCH 05/11] Start to put secondary topbar in place --- app/assets/images/icons/facebook-linkedin.svg | 1 - app/assets/images/icons/facebook-white.svg | 5 +++ app/assets/images/icons/facebook.svg | 6 +-- app/assets/images/icons/linkedin-circle.svg | 1 - app/assets/images/icons/linkedin-white.svg | 5 +++ app/assets/images/icons/linkedin.svg | 6 +-- app/assets/images/icons/twitter-circle.svg | 1 - app/assets/images/icons/twitter-white.svg | 3 ++ app/assets/images/icons/twitter.svg | 4 +- .../stylesheets/components/_social.scss | 42 +++++++++++++------ .../stylesheets/components/_topbar.scss | 16 +++++++ app/views/layouts/partials/_footer.html.erb | 7 ++-- app/views/marine/index.html.erb | 10 +---- .../partials/bars/_topbar-secondary.html.erb | 13 ++++++ app/views/partials/social/_sharing.html.erb | 14 ++----- 15 files changed, 83 insertions(+), 51 deletions(-) delete mode 100755 app/assets/images/icons/facebook-linkedin.svg create mode 100755 app/assets/images/icons/facebook-white.svg mode change 100755 => 100644 app/assets/images/icons/facebook.svg delete mode 100755 app/assets/images/icons/linkedin-circle.svg create mode 100755 app/assets/images/icons/linkedin-white.svg mode change 100755 => 100644 app/assets/images/icons/linkedin.svg delete mode 100755 app/assets/images/icons/twitter-circle.svg create mode 100755 app/assets/images/icons/twitter-white.svg mode change 100755 => 100644 app/assets/images/icons/twitter.svg create mode 100644 app/views/partials/bars/_topbar-secondary.html.erb diff --git a/app/assets/images/icons/facebook-linkedin.svg b/app/assets/images/icons/facebook-linkedin.svg deleted file mode 100755 index adfd27aaa..000000000 --- a/app/assets/images/icons/facebook-linkedin.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/icons/facebook-white.svg b/app/assets/images/icons/facebook-white.svg new file mode 100755 index 000000000..f38032c40 --- /dev/null +++ b/app/assets/images/icons/facebook-white.svg @@ -0,0 +1,5 @@ + + + diff --git a/app/assets/images/icons/facebook.svg b/app/assets/images/icons/facebook.svg old mode 100755 new mode 100644 index f38032c40..7137ce7e6 --- a/app/assets/images/icons/facebook.svg +++ b/app/assets/images/icons/facebook.svg @@ -1,5 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/images/icons/linkedin-circle.svg b/app/assets/images/icons/linkedin-circle.svg deleted file mode 100755 index 25c6bef9b..000000000 --- a/app/assets/images/icons/linkedin-circle.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/icons/linkedin-white.svg b/app/assets/images/icons/linkedin-white.svg new file mode 100755 index 000000000..73af0e937 --- /dev/null +++ b/app/assets/images/icons/linkedin-white.svg @@ -0,0 +1,5 @@ + + + diff --git a/app/assets/images/icons/linkedin.svg b/app/assets/images/icons/linkedin.svg old mode 100755 new mode 100644 index 73af0e937..ea9bb8364 --- a/app/assets/images/icons/linkedin.svg +++ b/app/assets/images/icons/linkedin.svg @@ -1,5 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/images/icons/twitter-circle.svg b/app/assets/images/icons/twitter-circle.svg deleted file mode 100755 index 2067084ba..000000000 --- a/app/assets/images/icons/twitter-circle.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/icons/twitter-white.svg b/app/assets/images/icons/twitter-white.svg new file mode 100755 index 000000000..55bb9aa6a --- /dev/null +++ b/app/assets/images/icons/twitter-white.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/images/icons/twitter.svg b/app/assets/images/icons/twitter.svg old mode 100755 new mode 100644 index 55bb9aa6a..0ef46ed0b --- a/app/assets/images/icons/twitter.svg +++ b/app/assets/images/icons/twitter.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/stylesheets/components/_social.scss b/app/assets/stylesheets/components/_social.scss index a702ef90f..4988bb149 100644 --- a/app/assets/stylesheets/components/_social.scss +++ b/app/assets/stylesheets/components/_social.scss @@ -1,22 +1,33 @@ //-------------------------------------------------- // mixins //-------------------------------------------------- -@mixin social-icon ($image) { +@mixin social-basic ($image) { background-image: image-url($image); background-position: center; background-repeat: no-repeat; background-size: contain; - margin: rem-calc(0 14 24 0); - width: rem-calc(26); height: rem-calc(30); display: inline-block; + &:hover { opacity: .75; } +} + +@mixin social-icon ($image) { + @include social-basic($image); + margin-right: rem-calc(14); + width: rem-calc(41); height: rem-calc(41); +} + +@mixin social-icon-white ($image) { + @include social-basic($image); + margin: rem-calc(0 14 24 0); + width: rem-calc(26); height: rem-calc(30); + &:first-child { margin-top: 0; } - - &:hover { opacity: .75; } } + //-------------------------------------------------- // classes //-------------------------------------------------- @@ -27,13 +38,20 @@ &--share { position: relative; - .social { - &__icon { - &--email { @include social-icon('icons/email.svg'); } - &--facebook { @include social-icon('icons/facebook.svg'); } - &--linkedin { @include social-icon('icons/linkedin.svg'); } - &--twitter { @include social-icon('icons/twitter.svg'); } - } + .social__icon { + &--email { @include social-icon('icons/email.svg'); } + &--facebook { @include social-icon('icons/facebook.svg'); } + &--linkedin { @include social-icon('icons/linkedin.svg'); } + &--twitter { @include social-icon('icons/twitter.svg'); } } } + + &--share-white { + .social__icon { + &--email { @include social-icon-white('icons/email-white.svg'); } + &--facebook { @include social-icon-white('icons/facebook-white.svg'); } + &--linkedin { @include social-icon-white('icons/linkedin-white.svg'); } + &--twitter { @include social-icon-white('icons/twitter-white.svg'); } + } + } } \ No newline at end of file diff --git a/app/assets/stylesheets/components/_topbar.scss b/app/assets/stylesheets/components/_topbar.scss index b324cf83a..ca373929a 100644 --- a/app/assets/stylesheets/components/_topbar.scss +++ b/app/assets/stylesheets/components/_topbar.scss @@ -26,4 +26,20 @@ &__search { @include responsive(order, 1, 2, 2); } +} + +//-------------------------------------------------- +// classes +//-------------------------------------------------- +.topbar--secondary { + @include box-shadow-bottom-grey; + @include flex; + @include flex-h-end; + @include flex-v-center; + @include gutters; + @include responsive(padding-top, rem-calc(6), rem-calc(10), rem-calc(14)); + @include responsive(padding-bottom, rem-calc(6), rem-calc(10), rem-calc(14)); + + position: relative; //to make box shadow appear over hero + z-index: 2; //to make box shadow appear over hero } \ No newline at end of file diff --git a/app/views/layouts/partials/_footer.html.erb b/app/views/layouts/partials/_footer.html.erb index 8ae9e8064..101fffd13 100644 --- a/app/views/layouts/partials/_footer.html.erb +++ b/app/views/layouts/partials/_footer.html.erb @@ -25,10 +25,9 @@

<%= t('global.footer.title3') %>

- @@ -56,7 +56,7 @@ diff --git a/app/javascript/components/sticky/StickyTab.vue b/app/javascript/components/sticky/StickyTab.vue deleted file mode 100644 index 8e13c0925..000000000 --- a/app/javascript/components/sticky/StickyTab.vue +++ /dev/null @@ -1,36 +0,0 @@ - - - \ No newline at end of file diff --git a/app/views/marine/index.html.erb b/app/views/marine/index.html.erb index 78d9cb6d5..c57fbe1d3 100644 --- a/app/views/marine/index.html.erb +++ b/app/views/marine/index.html.erb @@ -4,12 +4,6 @@ <%= content_for :social_image, image_url('social-marine.png') %> <%= content_for :social_image_alt, "A map of the world with highlighted areas that represent protected areas. The following statistics are shown: there are #{@marine_statistics['total_marine_protected_areas']} marine protected areas, #{@marine_statistics['total_ocean_pa_coverage_percentage']} of the ocean is covered by protected areas and the total area protected is 23,036,078km² These statistics are for 2017." %> - -

Highlight some text to share via Twitter or Email.

- - - - <%= link_to 'Learn how we calculate protected area coverage statistics', '/c/calculating-protected-area-coverage' %> <%= render partial: "./partials/bars/topbar-secondary" %> From df7bcd63684aafc0152cfc9c876a3b8ec0a46138 Mon Sep 17 00:00:00 2001 From: stacytalbot Date: Mon, 4 May 2020 17:28:43 +0100 Subject: [PATCH 10/11] Make sure secondary topbar sits inside the site container --- .../stylesheets/components/_topbar.scss | 22 ++++++++++--------- app/javascript/vue.js | 4 ---- app/views/marine/index.html.erb | 2 -- .../partials/bars/_topbar-secondary.html.erb | 10 +++++---- 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/app/assets/stylesheets/components/_topbar.scss b/app/assets/stylesheets/components/_topbar.scss index ca373929a..232c8e400 100644 --- a/app/assets/stylesheets/components/_topbar.scss +++ b/app/assets/stylesheets/components/_topbar.scss @@ -4,13 +4,13 @@ .topbar { background-color: $white; - &__container { + .topbar__container { @include flex; @include flex-h-between; @include flex-v-center; } - &__logo { + .topbar__logo { @include responsive(height, rem-calc(52), rem-calc(56), rem-calc(67)); @include responsive(padding, rem-calc(0 16), rem-calc(0 20), rem-calc(0 30)); @include responsive(order, 1, 1, 1); @@ -19,11 +19,11 @@ background-color: $primary; } - &__nav { + .topbar__nav { @include responsive(order, 2, 1, 1); } - &__search { + .topbar__search { @include responsive(order, 1, 2, 2); } } @@ -33,13 +33,15 @@ //-------------------------------------------------- .topbar--secondary { @include box-shadow-bottom-grey; - @include flex; - @include flex-h-end; - @include flex-v-center; - @include gutters; - @include responsive(padding-top, rem-calc(6), rem-calc(10), rem-calc(14)); - @include responsive(padding-bottom, rem-calc(6), rem-calc(10), rem-calc(14)); position: relative; //to make box shadow appear over hero z-index: 2; //to make box shadow appear over hero + + .topbar__container { + @include flex; + @include flex-h-end; + @include flex-v-center; + @include responsive(padding-top, rem-calc(6), rem-calc(10), rem-calc(14)); + @include responsive(padding-bottom, rem-calc(6), rem-calc(10), rem-calc(14)); + } } \ No newline at end of file diff --git a/app/javascript/vue.js b/app/javascript/vue.js index ed154dd0f..98e8fa660 100644 --- a/app/javascript/vue.js +++ b/app/javascript/vue.js @@ -39,8 +39,6 @@ import SearchSiteTopbar from './components/search/SearchSiteTopbar' import SelectWithContent from './components/select/SelectWithContent' import StickyBar from './components/sticky/StickyBar' import StickyNav from './components/sticky/StickyNav' -import StickyTab from './components/sticky/StickyTab' -import SocialShareText from './components/social/SocialShareText' import TableHead from './components/table/TableHead' import Tabs from './components/tabs/Tabs' import TabTarget from './components/tabs/TabTarget' @@ -88,8 +86,6 @@ document.addEventListener('DOMContentLoaded', () => { SelectWithContent, StickyBar, StickyNav, - StickyTab, - SocialShareText, TableHead, Tabs, TabTarget, diff --git a/app/views/marine/index.html.erb b/app/views/marine/index.html.erb index c57fbe1d3..895ba9fd0 100644 --- a/app/views/marine/index.html.erb +++ b/app/views/marine/index.html.erb @@ -4,8 +4,6 @@ <%= content_for :social_image, image_url('social-marine.png') %> <%= content_for :social_image_alt, "A map of the world with highlighted areas that represent protected areas. The following statistics are shown: there are #{@marine_statistics['total_marine_protected_areas']} marine protected areas, #{@marine_statistics['total_ocean_pa_coverage_percentage']} of the ocean is covered by protected areas and the total area protected is 23,036,078km² These statistics are for 2017." %> -<%= link_to 'Learn how we calculate protected area coverage statistics', '/c/calculating-protected-area-coverage' %> - <%= render partial: "./partials/bars/topbar-secondary" %> <%= render partial: "./layouts/partials/hero-thematic", locals: { diff --git a/app/views/partials/bars/_topbar-secondary.html.erb b/app/views/partials/bars/_topbar-secondary.html.erb index 6da9f32a8..ca40df5d9 100644 --- a/app/views/partials/bars/_topbar-secondary.html.erb +++ b/app/views/partials/bars/_topbar-secondary.html.erb @@ -1,7 +1,9 @@
- +
+ - <%= render "partials/download/download" %> + <%= render "partials/download/download" %> +
\ No newline at end of file From 14bcfc8e70acf6704ca2b89dbc268625cde58550 Mon Sep 17 00:00:00 2001 From: stacytalbot Date: Thu, 7 May 2020 11:21:12 +0100 Subject: [PATCH 11/11] Remove commented out code --- app/views/marine/sections/_map.html.erb | 11 -- yarn.lock | 144 +++--------------------- 2 files changed, 14 insertions(+), 141 deletions(-) diff --git a/app/views/marine/sections/_map.html.erb b/app/views/marine/sections/_map.html.erb index fa1a3b56a..c19492dbf 100644 --- a/app/views/marine/sections/_map.html.erb +++ b/app/views/marine/sections/_map.html.erb @@ -12,17 +12,6 @@ data-zoom-position="bottomleft" data-pa-colors='{ "terrestrial": { "line": "95d0c1", "fill": "a4d6c9" }, "marine": { "line": "004280", "fill": "004a8f" } }'>
- -
diff --git a/yarn.lock b/yarn.lock index d8c61421a..2889ab8d8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2534,7 +2534,7 @@ debug@=3.1.0: dependencies: ms "2.0.0" -debug@^3.0.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: +debug@^3.0.0, debug@^3.1.1, debug@^3.2.5: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -2570,11 +2570,6 @@ deep-equal@^1.0.1: object-keys "^1.1.1" regexp.prototype.flags "^1.2.0" -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - default-gateway@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b" @@ -2658,11 +2653,6 @@ detect-file@^1.0.0: resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - detect-node@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" @@ -3288,13 +3278,6 @@ from@^0.1.7: resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4= -fs-minipass@^1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" - integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== - dependencies: - minipass "^2.6.0" - fs-minipass@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" @@ -3726,7 +3709,7 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= -iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.4: +iconv-lite@0.4, iconv-lite@0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -3750,13 +3733,6 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= -ignore-walk@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" - integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== - dependencies: - minimatch "^3.0.4" - import-cwd@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9" @@ -3850,7 +3826,7 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: +ini@^1.3.4, ini@^1.3.5: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== @@ -4720,14 +4696,6 @@ minipass-pipeline@^1.2.2: dependencies: minipass "^3.0.0" -minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" - integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== - dependencies: - safe-buffer "^5.1.2" - yallist "^3.0.0" - minipass@^3.0.0, minipass@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5" @@ -4735,13 +4703,6 @@ minipass@^3.0.0, minipass@^3.1.1: dependencies: yallist "^4.0.0" -minizlib@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" - integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== - dependencies: - minipass "^2.9.0" - mississippi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" @@ -4835,15 +4796,6 @@ nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" -needle@^2.2.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz#3342dea100b7160960a450dc8c22160ac712a528" - integrity sha512-DUzITvPVDUy6vczKKYTnWc/pBZ0EnjMJnQ3y+Jo5zfKFimJs7S3HFCxCRZYB9FUZcrzUQr3WsmvZgddMEIZv6w== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -4911,22 +4863,6 @@ node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" -node-pre-gyp@*: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - node-releases@^1.1.49: version "1.1.49" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.49.tgz#67ba5a3fac2319262675ef864ed56798bb33b93e" @@ -4964,14 +4900,6 @@ node-sass@^4.13.0: dependencies: abbrev "1" -nopt@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" - integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00= - dependencies: - abbrev "1" - osenv "^0.1.4" - normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -5014,27 +4942,6 @@ normalize-url@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== -npm-bundled@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" - integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== - dependencies: - npm-normalize-package-bin "^1.0.1" - -npm-normalize-package-bin@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" - integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== - -npm-packlist@^1.1.6: - version "1.4.8" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" - integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== - dependencies: - ignore-walk "^3.0.1" - npm-bundled "^1.0.1" - npm-normalize-package-bin "^1.0.1" - npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -5042,7 +4949,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -5222,7 +5129,7 @@ os-tmpdir@^1.0.0: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -osenv@0, osenv@^0.1.4: +osenv@0: version "0.1.5" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== @@ -6332,16 +6239,6 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -rc@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - read-cache@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" @@ -6594,7 +6491,7 @@ rgba-regex@^1.0.0: resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= -rimraf@2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3, rimraf@^2.7.1: +rimraf@2, rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -6674,7 +6571,7 @@ save@^2.4.0: lodash.assign "^4.2.0" mingo "1" -sax@^1.2.4, sax@~1.2.4: +sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -6721,7 +6618,7 @@ selfsigned@^1.10.7: dependencies: node-forge "0.9.0" -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -7224,11 +7121,6 @@ strip-indent@^1.0.1: dependencies: get-stdin "^4.0.1" -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= - style-loader@^1.0.0: version "1.1.3" resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.1.3.tgz#9e826e69c683c4d9bf9db924f85e9abb30d5e200" @@ -7305,19 +7197,6 @@ tar@^2.0.0: fstream "^1.0.12" inherits "2" -tar@^4.4.2: - version "4.4.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" - integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== - dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.8.6" - minizlib "^1.2.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.3" - terser-webpack-plugin@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" @@ -7693,6 +7572,11 @@ vue-hot-reload-api@^2.3.0: resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2" integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog== +vue-lazyload@^1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/vue-lazyload/-/vue-lazyload-1.3.3.tgz#4df50a271bde9b74c3caf7a228d6e0af50d5682f" + integrity sha512-uHnq0FTEeNmqnbBC2aRKlmtd9LofMZ6Q3mWvgfLa+i9vhxU8fDK+nGs9c1iVT85axSua/AUnMttIq3xPaU9G3A== + vue-loader@^15.7.0: version "15.9.0" resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.0.tgz#5d4b0378a4606188fc83e587ed23c94bc3a10998" @@ -7975,7 +7859,7 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: +yallist@^3.0.2: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==