Skip to content

SITE-2637 | Remove DDB links from footer #475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

SITE-2637 | Remove DDB links from footer #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/templates/components/global-footer-fandom.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
<div class="wds-global-footer__column">
{{global-footer/section [email protected]_apps name="fandom-apps" }}
{{global-footer/section [email protected]_stores name="fandom-stores" }}
{{global-footer/section [email protected]_stores name="ddb-stores" }}
</div>
</div>
{{global-footer/bottom-bar model=@model}}
Expand Down
22 changes: 2 additions & 20 deletions style-guide/styles/wds-components/_global-footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
33 changes: 0 additions & 33 deletions tests/dummy/app/models/global-footer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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": {
Expand Down
1 change: 0 additions & 1 deletion tests/dummy/app/templates/route-components/assets.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,6 @@
</div>
<div class="assets-wrapper">
<AssetBox @group="company-store" @name="logo-fandom" @height={{100}} />
<AssetBox @group="company-store" @name="logo-ddb" @height={{100}} />
</div>

<Demo codeOnly={{true}} name="mobile-apps-store">
Expand Down
4 changes: 1 addition & 3 deletions tests/integration/components/global-footer-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);

Expand Down
12 changes: 0 additions & 12 deletions tests/pages/components/global-footer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',

Expand Down