diff --git a/_includes/banner.html b/_includes/banner.html deleted file mode 100644 index 8b0ffc93..00000000 --- a/_includes/banner.html +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/_includes/layouts/base.html b/_includes/layouts/base.html index eec43362..6a4a5742 100644 --- a/_includes/layouts/base.html +++ b/_includes/layouts/base.html @@ -15,8 +15,6 @@ {% include "menu.html" primary_navigation: site.primary_navigation secondary_navigation: site.secondary_navigation %} - {% include "banner.html" %} - {{ content }} {% include "footer.html" %} diff --git a/cypress/e2e/home_page.cy.js b/cypress/e2e/home_page.cy.js index 05b6cf65..236fae07 100644 --- a/cypress/e2e/home_page.cy.js +++ b/cypress/e2e/home_page.cy.js @@ -15,6 +15,14 @@ describe('The Home Page', () => { }); }); + describe('Anniversary', () => { + it('doesn\'t have the 15 year anniversary banner', () => { + cy.get('div.banner.padding-2.text-center').should('not.exist'); + }) + it('doesn\'t have the anniversary section', ()=> { + cy.get('section.usa-section.anniversary').should('not.exist'); + }) + }) describe('Hero', () => { it('has the expected title', () => { cy.get('h1').contains("The Home of the U.S. Government's Open Data"); @@ -26,6 +34,15 @@ describe('The Home Page', () => { }); describe('The Metrics Widgets', () => { + it('has the metrics section', ()=> { + cy.get('section.usa-section.metrics').should('exist'); + }) + it('has a title', () => { + cy.get('section.usa-section.metrics').find('h1').contains('Metrics') + }) + it('has a description', () => { + cy.get('section.usa-section.metrics').find('div:not([class])').contains(' Below') + }) it('has a bar chart by org type', () => { cy.get('#datagov-bar-chart-org').should('be.visible').should('have.data', 'metric'); }); diff --git a/pages/index.html b/pages/index.html index 33c24b6f..40e77f81 100644 --- a/pages/index.html +++ b/pages/index.html @@ -71,42 +71,17 @@

Mission

agency missions, and strengthen the foundation of an open and transparent government. -
- - About Us {% usa_icon "arrow_forward" %} - -
- - - - - - -
-
-
-
- Data Gov is 14yrs old! -
-
-

Data.gov at 15

-
- On May 21, 2009, Data.gov launched with a total of 47 datasets. After the landmark 2013 Open Data Policy - required agencies to create comprehensive data inventories and public data listings, the site grew to 115,000+ - datasets from 88 organizations by 2015. These requirements were enacted into the Open Government Data - Act in - 2019. Today, Data.gov is nearing 300,000 datasets and dataset collections in the catalog, harvested from over - 100 organizations, and counts over a million monthly pageviews from people like you, looking to discover that - information. In 2024, Data.gov continues its commitment to open government data and transparency. Thank you - for 15 years! -
-
@@ -116,7 +91,16 @@

Data.gov at 15

-
+

Metrics

+
+ Below, you can view breakdowns of the type, age, and distribution of + catalog.data.gov + datasets. For information on top dataset page views, file downloads, and external link + clicks broken down by agency, see data.gov/metrics. + To learn more about the Metrics section, see the + Digital.gov blog post. +
+
{% if catalog and catalog.metrics and catalog.metrics.orgBarMetric %} @@ -192,4 +176,4 @@

Data.gov at 15

- \ No newline at end of file + diff --git a/styles/partials/datagovtheme.scss b/styles/partials/datagovtheme.scss index 80941904..4d3da244 100644 --- a/styles/partials/datagovtheme.scss +++ b/styles/partials/datagovtheme.scss @@ -11,8 +11,6 @@ $s3_image_about_us_card_bg: 'https://s3-us-gov-west-1.amazonaws.com/cg-0817d6e3- $s3_image_mission_graphic: 'https://s3-us-gov-west-1.amazonaws.com/cg-0817d6e3-93c4-4de8-8b32-da6919464e61/mission-graphic.svg'; $s3_image_mission_section_bg: 'https://s3-us-gov-west-1.amazonaws.com/cg-0817d6e3-93c4-4de8-8b32-da6919464e61/mission-section-bg.png'; -$s3_anniversary_banner: 'https://s3-us-gov-west-1.amazonaws.com/cg-0817d6e3-93c4-4de8-8b32-da6919464e61/15-years-anniversary-banner-2912px.jpg'; - a { color: color('blue-warm-60v'); @@ -114,26 +112,6 @@ html.datagov { } } -.banner { - background-image: url($s3_anniversary_banner); - background-size: cover; - // background-color: color('primary-vivid'); - color: white; - - @include at-media('mobile') { - background-position-x: 35%; - } - - @include at-media('tablet') { - background-position-x: 0%; - } - - a { - color: white; - text-decoration: underline; - } -} - .hero { background-image: url($s3_image_hero_image_bg); background-repeat: no-repeat; @@ -204,18 +182,17 @@ html.datagov { } } + .buttons { + display: flex; + justify-content: space-evenly; + } + position: relative; border-bottom: 1px solid color('gray-10'); margin: auto; text-align: center; } -.anniversary { - text-align: center; - @include at-media('desktop') { - text-align: left; - } -} .mediabox { border: 2px solid color('gray-10'); padding: 20px;