Skip to content
This repository has been archived by the owner on Dec 15, 2023. It is now read-only.

fix(feed-item,feed-item-row): fix avatar alignment #1170

Merged
merged 1 commit into from
Sep 13, 2023

Conversation

eabrakov
Copy link
Contributor

@eabrakov eabrakov commented Sep 13, 2023

DLT-1223 fix feed item avatar alignment

🛠️ Type Of Change

  • Fix
  • Feature
  • Refactoring
  • Documentation

📝 Checklist

  • I have reviewed my changes
  • I have added tests
  • I have added all relevant documentation
  • I have validated components with a screen reader
  • I have validated components keyboard navigation
  • I have considered the performance impact of my change
  • I have checked that my change did not significantly increase bundle size
  • I am exporting any new components or constants in the index.js in the component directory
  • I am exporting any new components or constants in the index.js in the root

🔮 Next Steps

📷 Screenshots / GIFs

Before:
image

After:
image

@github-actions
Copy link

Thanks for contributing to Dialtone Vue! Please read below for some important info regarding Vue 3 compatibility.

Currently we need to maintain two branches in Dialtone Vue, one for Vue 2, one for Vue 3.

This means you must create two PRs for every feature change you make. One into staging and one into staging-vue3.

Many times the change you have made in Vue 2 will be identical to the change you need to make in Vue 3. To make this easier we have made a script that can copy your changes from this branch to a new branch off of staging-vue3 suffixed with -vue3.

run ./copy_pr_vue3.sh from the root dialtone-vue directory.

Once the new branch is created, you will need to look at your code to make sure it still makes sense and test that your changes all work in vue 3. If everything is good you can push it and create a PR into staging-vue3.

It is a required check for every PR to have a corresponding branch called yourbranch-vue3 so that we do not forget to do it. In the special case that you need to make a change to vue2 without making it in vue3, you can set the label vue2-only on this PR.

I got "commit SHA is a merge but no -m option was given."

This happens if there are merge commits in your branch. It's no problem, you can simply skip them with git cherry-pick --skip. We don't want to copy merge commits to the Vue 3 branch.

What if I make more changes to my vue 2 branch after running ./copy_pr_vue3.sh?

You can copy these to the existing -vue3 branch by running the script with a git SHA param like so:

./copy_pr_vue3.sh 2a78db7

where 2a78db7 is the last commit from your branch that was copied to the other branch (all commits after this will be copied)

If it's just one or two commits, you may prefer to just manually use git cherry-pick which will work fine as well.

What if I get a conflict?

It's possible to get a conflict when running copy_pr_vue3.sh as there are differences in Vue 2 and Vue 3 code. If this happens you can manually fix the conflict, commit it and do git cherry-pick --continue.

@github-actions
Copy link

✔️ Deploy Preview ready!
😎 Browse the preview: https://vue.dialpad.design/deploy-previews/pr-1170/
🔨 If you experience an SSL issue then wait 2 minutes and try again.

@iropolo
Copy link
Contributor

iropolo commented Sep 13, 2023

Hello, seems like it is related to DLT-1223 .
I will assign the ticket to you and move it to In Progress (it is in Needs Triage at this moment).

Copy link
Contributor

@iropolo iropolo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update looks good to me, thanks

@github-actions github-actions bot added the visual-test-ready Add this tag when the PR is ready for visual test, to trigger GHA visual tests label Sep 13, 2023
@eabrakov eabrakov merged commit 9c1ca39 into staging Sep 13, 2023
16 of 20 checks passed
@eabrakov eabrakov deleted the fix-avatar-alignment-in-feed-item branch September 13, 2023 16:34
iropolo pushed a commit that referenced this pull request Sep 14, 2023
# [2.96.0](v2.95.2...v2.96.0) (2023-09-14)

### Bug Fixes

* **Feed Item,feed Item Row:** fix avatar alignment ([#1170](#1170)) ([9c1ca39](9c1ca39))
* **Image Viewer:** fix close icon not visible on dark mode ([#1168](#1168)) ([f703a16](f703a16))

### Features

* add `avatar-click` event in contact info ([#1164](#1164)) ([9c9e74b](9c9e74b))
* feed item pill recipe ([#1135](#1135)) ([e05fdfd](e05fdfd))
* **Leftbar Row:** add new icon color for contact center type ([#1172](#1172)) ([7a74ad4](7a74ad4))
@github-actions
Copy link

🎉 This PR is included in version 2.96.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
released visual-test-ready Add this tag when the PR is ready for visual test, to trigger GHA visual tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants