Design refinements required for the Pocket experiment include the following [from Wolasi]:

• Change color of "Sponsored by…" on SpoC label to units to #737373
• Change font-size to 14px for the following classes…

.ds-list:not(.ds-list-full-width) .ds-list-item-title

.ds-hero .ds-card .meta .title

.ds-column-9 .ds-card-grid .meta .title, .ds-column-10 .ds-card-grid .meta .title, .ds-column-11 .ds-card-grid .meta .title, .ds-column-12 .ds-card-grid .meta .title

.ds-hero .wrapper .meta p

.ds-card .meta .excerpt

.ds-list-item .ds-list-item-excerpt

.ds-navigation

• Make the following margin and padding changes for the indicated classes:

.ds-hero .wrapper {
  margin: 12px 0 16px;
  padding: 16px 0;
}

.ds-hero-no-border .wrapper {
  padding: 0 0 8px 0;
}

Please make the following changes/additions for the indicated classes

.ds-hero .wrapper .meta header
margin-bottom: 4px
line-height: 28px

.ds-header
margin: 12px 0;

.ds-list-item .ds-list-item-title
margin-bottom: 4px

.ds-list-item .ds-list-item-excerpt
margin-bottom: 4px

.ds-card p
margin: 4px 0 0 0

Make this addition to the section-title class

.ds-section-title {
  margin-top: 24px;
}

Please make the following change to the component header class

.ds-header {
  margin: 24px 0 12px;
}

Doesn't require further QA.

Comment on attachment 9042549 [details]
Bug 1524632 - Design tweaks for discovery stream

Beta/Release Uplift Approval Request

Feature/Bug causing the regression

Bug 1524632

User impact if declined

Less optimal visual layout for Discovery Stream

Is this code covered by automated tests?

No

Has the fix been verified in Nightly?

No

Needs manual test from QE?

Yes

If yes, steps to reproduce

1. Open about:config
2. Change browser.newtabpage.activity-stream.discoverystream.config to {"enabled":true,"show_spocs":true,"layout_endpoint":"https://getpocket.com/v3/newtab/layout?version=1&consumer_key=40249-e88c401e1b1f2242d9e441c4&layout_variant=dev-test-all"}
3. Open a new tab
4. Confirm that layout doesn't look broken

List of other uplifts needed

Bug 1524321

Risk to taking this patch

Low

Why is the change risky/not risky? (and alternatives if risky)

CSS only patch aside from 1 minor HTML tweak (class name added, truncation removed on content-src/components/DiscoveryStreamComponents/Hero/Hero.jsx)

String changes made/needed

https://hg.mozilla.org/mozilla-central/rev/ba5eb152fe23

Hello,

Verified fixed with the latest FF Nightly build 67.0a1 (buildID :20190212095015) on Win 10x64 and macOS 10.11.
Can confirm that the layout is not broken.

Comment on attachment 9042549 [details]
Bug 1524632 - Design tweaks for discovery stream

Verified in nightly, part of planned uplifts for Activity Stream experiments in 66.

I tried to uplift this, however got conflicts:

warning: conflicts while merging browser/components/newtab/common/PrerenderData.jsm! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSCard/DSCard.jsx! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/components/newtab/content-src/components/DiscoveryStreamComponents/Hero/Hero.jsx! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/components/newtab/content-src/components/DiscoveryStreamComponents/List/List.jsx! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/components/newtab/content-src/components/DiscoveryStreamComponents/SpocIntersectionObserver/SpocIntersectionObserver.jsx! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/components/newtab/css/activity-stream-linux.css.map! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/components/newtab/css/activity-stream-mac.css.map! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/components/newtab/css/activity-stream-windows.css.map! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/components/newtab/data/content/activity-stream.bundle.js! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/components/newtab/data/content/activity-stream.bundle.js.map! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/components/newtab/lib/ActivityStream.jsm! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/components/newtab/lib/DiscoveryStreamFeed.jsm! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/components/newtab/locales-src/mr/strings.properties! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/components/newtab/locales-src/sr/strings.properties! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/components/newtab/prerendered/locales/mr/activity-stream-prerendered-noscripts.html! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/components/newtab/prerendered/locales/mr/activity-stream-prerendered.html! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/components/newtab/prerendered/locales/sr/activity-stream-prerendered-noscripts.html! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/components/newtab/prerendered/locales/sr/activity-stream-prerendered.html! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/List.test.jsx! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/components/newtab/test/unit/lib/DiscoveryStreamFeed.test.js! (edit, then use 'hg resolve --mark')

The merge conflicts seem like the whole export commit bug 1526066 was attempted to be applied instead of just attachment 9042549 [details]

Tried to uplift it but still encountered conflicts:

merging browser/components/newtab/css/activity-stream-linux.css
merging browser/components/newtab/css/activity-stream-linux.css.map
merging browser/components/newtab/css/activity-stream-mac.css
merging browser/components/newtab/css/activity-stream-mac.css.map
merging browser/components/newtab/css/activity-stream-windows.css
merging browser/components/newtab/css/activity-stream-windows.css.map
merging browser/components/newtab/data/content/activity-stream.bundle.js
merging browser/components/newtab/data/content/activity-stream.bundle.js.map
warning: conflicts while merging browser/components/newtab/css/activity-stream-linux.css.map! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/components/newtab/css/activity-stream-mac.css.map! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/components/newtab/css/activity-stream-windows.css.map! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/components/newtab/data/content/activity-stream.bundle.js.map! (edit, then use 'hg resolve --mark')

Gavin Suntop, Ed Lee can you guys please take a look?

:gvn, I have fixed the patch and updated it to be dependent on Bug 1524321 (there were conflicts). Can you update the uplift to request say this depends on Bug 1524321?

:k88hudson Done!

Hello,

I have re-verified this issue again in the 66.0b8(BuildID: 20190214102000 from Taskcluster) on Win 10x64. Ubuntu 16.04 and macOS 10.12. Confirming this as verified fixed.

Pretty sure this hasn't been uplifted yet to mozilla-beta/66.

https://hg.mozilla.org/releases/mozilla-beta/rev/24c97a1ec248

Hello, re-rechecked this issue on 66.0b8(BuildID:20190214195736) with Win10x64 and macOS 10.12 . confirming this issue as verified fixed.