From 2203a167fe2a6b6d2fc4b32a63fb36f153e376fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szymon=20=C5=9Awiergosz?= Date: Mon, 6 Jun 2022 15:27:55 +0200 Subject: [PATCH] Remove DDB links from footer --- .../components/global-footer-fandom.hbs | 1 - .../styles/wds-components/_global-footer.scss | 22 ++----------- tests/dummy/app/models/global-footer.json | 33 ------------------- .../app/templates/route-components/assets.hbs | 1 - .../components/global-footer-test.js | 4 +-- tests/pages/components/global-footer.js | 12 ------- 6 files changed, 3 insertions(+), 70 deletions(-) diff --git a/app/templates/components/global-footer-fandom.hbs b/app/templates/components/global-footer-fandom.hbs index f112d79b1..368f91d09 100644 --- a/app/templates/components/global-footer-fandom.hbs +++ b/app/templates/components/global-footer-fandom.hbs @@ -24,7 +24,6 @@ {{global-footer/bottom-bar model=@model}} diff --git a/style-guide/styles/wds-components/_global-footer.scss b/style-guide/styles/wds-components/_global-footer.scss index 2145f5f2d..f82ccf8bc 100644 --- a/style-guide/styles/wds-components/_global-footer.scss +++ b/style-guide/styles/wds-components/_global-footer.scss @@ -147,30 +147,12 @@ } &.wds-is-fandom-stores { + display: flex; + line-height: 0; padding-bottom: 20px; margin-top: 14px; position: relative; - &::after { - border-bottom: 1px solid $wds-fandom-color-dark-gray; - display: block; - content: ''; - position: absolute; - left: 0; - width: 230px; - bottom: 0; - height: 1px; - } - } - - &.wds-is-ddb-stores { - margin-top: 20px; - } - - &.wds-is-fandom-stores, &.wds-is-ddb-stores { - display: flex; - line-height: 0; - .wds-global-footer__image { margin: 0 19px 0 0; diff --git a/tests/dummy/app/models/global-footer.json b/tests/dummy/app/models/global-footer.json index bc10a2db0..9ddba2121 100644 --- a/tests/dummy/app/models/global-footer.json +++ b/tests/dummy/app/models/global-footer.json @@ -120,31 +120,6 @@ } ] }, - "ddb_stores": { - "image": { - "name": "wds-company-store-logo-ddb", - "caption": { - "type": "text", - "value": "D&D Beyond" - } - }, - "links": [ - { - "type": "link-image", - "image-data": { - "name": "wds-company-store-appstore" - }, - "href": "https:\/\/apps.apple.com\/us\/app\/d-d-beyond\/id1263629972" - }, - { - "type": "link-image", - "image-data": { - "name": "wds-company-store-googleplay" - }, - "href": "https:\/\/play.google.com\/store\/apps\/details?id=com.curse.dndbeyond&hl=en" - } - ] - }, "advertise": { "header": { "type": "line-text", @@ -222,14 +197,6 @@ }, "href": "https:\/\/www.gamepedia.com\/" }, - { - "type": "link-text", - "title": { - "type": "text", - "value": "D&D Beyond" - }, - "href": "https:\/\/www.dndbeyond.com\/" - }, { "type": "link-text", "title": { diff --git a/tests/dummy/app/templates/route-components/assets.hbs b/tests/dummy/app/templates/route-components/assets.hbs index 9f2220a1d..ce306ace9 100644 --- a/tests/dummy/app/templates/route-components/assets.hbs +++ b/tests/dummy/app/templates/route-components/assets.hbs @@ -441,7 +441,6 @@
-
diff --git a/tests/integration/components/global-footer-test.js b/tests/integration/components/global-footer-test.js index a958bf90e..74afee82f 100644 --- a/tests/integration/components/global-footer-test.js +++ b/tests/integration/components/global-footer-test.js @@ -36,7 +36,7 @@ module('Integration | Component | global-footer', function(hooks) { 'design-system:global-footer-fandom-overview-header', ); assert.equal(GlobalFooter.main.fandom_overview.header, 'design-system:global-footer-fandom-overview-header'); - assert.equal(GlobalFooter.main.fandom_overview.links.length, 6); + assert.equal(GlobalFooter.main.fandom_overview.links.length, 5); assert.equal(GlobalFooter.main.follow.header, 'design-system:global-footer-follow-us-header'); assert.equal(GlobalFooter.main.follow.links.length, 5); @@ -51,8 +51,6 @@ module('Integration | Component | global-footer', function(hooks) { assert.equal(GlobalFooter.main.fandom_stores.links.length, 2); - assert.equal(GlobalFooter.main.ddb_stores.links.length, 2); - assert.equal(GlobalFooter.main.advertise.header, 'design-system:global-footer-advertise-header'); assert.equal(GlobalFooter.main.advertise.links.length, 2); diff --git a/tests/pages/components/global-footer.js b/tests/pages/components/global-footer.js index bfe9bff5d..9defe5241 100644 --- a/tests/pages/components/global-footer.js +++ b/tests/pages/components/global-footer.js @@ -91,18 +91,6 @@ export default { ), }, - ddb_stores: { - scope: 'section.wds-global-footer__section.wds-is-ddb-stores', - - links: collection( - 'ul.wds-global-footer__links-list li.wds-global-footer__links-list-item', - { - link: { scope: 'a' }, - text: text('div'), - }, - ), - }, - advertise: { scope: 'section.wds-global-footer__section.wds-is-advertise',