mozilla / fxa-content-server

DEPRECATED - Migrated to https://github.com/mozilla/fxa
Mozilla Public License 2.0
163 stars 120 forks source link

<style>(<fxa-client>): add client icon for send in device list #7082

Closed AlbionaHoti closed 5 years ago

AlbionaHoti commented 5 years ago

Hi, @lmorchard I added the changes from your guide - Can you review it please, and if you can give me a hint on how to test this part because I see there is the clients.mustache file - there is the 'isOAuthApp' part - but should I create in a different way a firefox account so that part of the code can be shown? Because I can only see the isWebSession for now and the showMobileApps

fixes #7062

shane-tomlinson commented 5 years ago

Hi @AlbionaHoti - the icon looks good to me, could you rebase this PR off of the current master so that we can merge?

Screenshot 2019-03-26 at 13 39 46
AlbionaHoti commented 5 years ago

@shane-tomlinson I think I did something wrong!

I did git rebase master - there were some merge conflicts - then fixed them - then git rebase --continue

shane-tomlinson commented 5 years ago

@shane-tomlinson I think I did something wrong! I did git rebase master - there were some merge conflicts - then fixed them - then git rebase --continue

From the looks of it, there's a merge

shane-tomlinson commented 5 years ago

@AlbionaHoti I used git cherry-pick to open a new PR with your change: https://github.com/mozilla/fxa-content-server/pull/7103. Closing this PR here.