<p dir="auto">This PR continues work started in <a class="commit-link" data-hovercard-type="commit" data-hovercard-url="https://github.com/openstreetmap/openstreetmap-website/commit/9aa17258fcccf5b1f292e1190bd9a2968822274e/hovercard" href="https://github.com/openstreetmap/openstreetmap-website/commit/9aa17258fcccf5b1f292e1190bd9a2968822274e"><tt>9aa1725</tt></a> and <a class="commit-link" data-hovercard-type="commit" data-hovercard-url="https://github.com/openstreetmap/openstreetmap-website/commit/31e247c1e223145a6ac8ce9012fe5eb586f1aaea/hovercard" href="https://github.com/openstreetmap/openstreetmap-website/commit/31e247c1e223145a6ac8ce9012fe5eb586f1aaea"><tt>31e247c</tt></a> to refactor the <code>user_image</code> and <code>user_thumbnail</code> css rules. Instead of using floats and margins, we now prefer to use the flex grid to control the layout.</p>
<p dir="auto">The commits in this PR refactor each use of these helpers to use the temporary <code>_no_margins</code> rules, before refactoring the old rules and removing the class overrides at the end.</p>
<hr>
<h4>You can view, comment on, or merge this pull request online at:</h4>
<p> <a href='https://github.com/openstreetmap/openstreetmap-website/pull/3363'>https://github.com/openstreetmap/openstreetmap-website/pull/3363</a></p>
<h4>Commit Summary</h4>
<ul>
<li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/3363/commits/6283d0a47aa6713372d3b23ca9120f9ed9d29f89">Rework diary comments to use flex grid rather than floats and margins</a></li>
<li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/3363/commits/ee9c8ff7c8765923959466e7a14893e693c3c72a">Use grid for diary entry heading layout</a></li>
<li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/3363/commits/afce5886f41aae45d55bd21b0a2ada8f78659873">Rework diary entries to use grid when a heading thumbnail is shown</a></li>
<li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/3363/commits/2c9d2486ec4003e702d566ef1a13e779dc3673e2">Use flex grid for diary index headings</a></li>
<li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/3363/commits/aa77ff5aec2f843c488f589c1779c745dbd9dabd">Use flex grid for issue reports and comments</a></li>
<li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/3363/commits/dc67e54958c50301cd0b8b0ada72936a4ae0b0f2">Use grid for dashboard map popups</a></li>
<li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/3363/commits/a9ca2fe7e73a65f85a326b167384c41b37f47410">fixup popup</a></li>
<li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/3363/commits/9c9bf153cd90778172a70864eedde3672c412a53">Simplify user_image and user_thumbnail css</a></li>
</ul>
<h4 style="display: inline-block">File Changes </h4> <p style="display: inline-block">(<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3363/files">11 files</a>)</p>
<ul>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3363/files#diff-e86a39e6d0b163f152db8843fc7d647a3f5d648de4a74f1732bef4474b6e5bc8">app/assets/stylesheets/common.scss</a>
(24)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3363/files#diff-ec635e8918e14ddb395eeb0931b51ec3b0f3df431c87cdbc290119a430395284">app/assets/stylesheets/leaflet-all.scss</a>
(3)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3363/files#diff-a893bdff25132b2a60513f4fb74deb7507b568af429e60d05a48c63b7dd95230">app/views/dashboards/_contact.html.erb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3363/files#diff-19dab1f0d2d0eed75db55df8281858bd2c2409cd9841a6e8e8555c043255bc70">app/views/dashboards/_popup.html.erb</a>
(12)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3363/files#diff-09278256f628aa9b63748820a8a5bea3c5bcc191778acbb5d1f26d8f469f434c">app/views/diary_entries/_diary_comment.html.erb</a>
(38)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3363/files#diff-19308fdc270ab97cbcfbfa5628325285149496524b767672f8e80f1079db29f9">app/views/diary_entries/_diary_entry.html.erb</a>
(17)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3363/files#diff-aad6c85558af2a77937df72b074ef1a972b08171986d4dbddf0c86d0cf83a3f5">app/views/diary_entries/index.html.erb</a>
(43)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3363/files#diff-f54930d1342191d1e34f17bfc8a2b7f09fa283f05a3332495092abe2cbae50be">app/views/diary_entries/show.html.erb</a>
(12)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3363/files#diff-08f4a8682258f9243e061cfac7eed4d008241dfea6615d54569685cc7e6e425a">app/views/issues/_comments.html.erb</a>
(16)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3363/files#diff-9f4364ccf8191e24c7f76afe07a3d75250521b70be8e825706f0328b710fd73f">app/views/issues/_reports.html.erb</a>
(18)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3363/files#diff-78ff736409d758722403cce31873ba803b3fb526d37398ca21caa557b54dfd95">app/views/users/show.html.erb</a>
(2)
</li>
</ul>
<h4>Patch Links:</h4>
<ul>
<li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/3363.patch'>https://github.com/openstreetmap/openstreetmap-website/pull/3363.patch</a></li>
<li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/3363.diff'>https://github.com/openstreetmap/openstreetmap-website/pull/3363.diff</a></li>
</ul>
<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/openstreetmap/openstreetmap-website/pull/3363">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AAK2OLITBZVDVEYEZFCKCHTULKILLANCNFSM5HYHVREA">unsubscribe</a>.<br />Triage notifications on the go with GitHub Mobile for <a href="https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675">iOS</a> or <a href="https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub">Android</a>.
<img src="https://github.com/notifications/beacon/AAK2OLLPRCQEHQLHJRP5ECTULKILLA5CNFSM5HYHVREKYY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4PUV3EDA.gif" height="1" width="1" alt="" /></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/openstreetmap/openstreetmap-website/pull/3363",
"url": "https://github.com/openstreetmap/openstreetmap-website/pull/3363",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>