Skip to content
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.

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

Feature/serviceproviders uniquelinks #143

Merged
merged 10 commits into from
May 26, 2020

Conversation

jvillalp
Copy link
Contributor

@jvillalp jvillalp commented May 26, 2020

Description

  • all servce btns that display should display corresponding link
  • removed underline of link when on hover (did some styling)
  • changes expansion panel to have a better flow on the movie card
  • some styling on movie card and service btns
  • fixed bug/issue Change Text on Service Providers button #137

Type of change

  • Bug fix (non-breaking change which fixes an issue)

Change Status

  • Complete, but not tested (may need new tests)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • My code has been reviewed by at least one peer
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings
  • There are no merge conflicts

Copy link
Contributor

@msinnema33 msinnema33 left a comment

Choose a reason for hiding this comment

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

several lines of commented out code (in line comments). Need to change baseURL.

@jvillalp
Copy link
Contributor Author

several lines of commented out code (in line comments). Need to change baseURL.

will do! good catch!

@Steven-matos
Copy link
Contributor

this PR is going to cause merge conflicts with my PR request

@jvillalp
Copy link
Contributor Author

this PR is going to cause merge conflicts with my PR request

did you already merge yours to master? we'll need to do that with either this one or the other, depending on which one gets added first.

@Steven-matos
Copy link
Contributor

this PR is going to cause merge conflicts with my PR request

did you already merge yours to master? we'll need to do that with either this one or the other, depending on which one gets added first.

mine is waiting to be added I cleaned out a lot of code in the movie card that's why I say its going to cause conflict

@jvillalp
Copy link
Contributor Author

jvillalp commented May 26, 2020

this PR is going to cause merge conflicts with my PR request

did you already merge yours to master? we'll need to do that with either this one or the other, depending on which one gets added first.

mine is waiting to be added I cleaned out a lot of code in the movie card that's why I say its going to cause conflict

some of the code you deleted i actually uncommented for the 'where to watch' btn, so that might be an issue, but if you merge yours to master, i can bring those changes back and that shouldn't mess with ur edits right? since you just worked on the movie slider for the ratings page? my edits are more geared towards the service providers button/links

@jvillalp jvillalp requested a review from msinnema33 May 26, 2020 19:55
@moviedatascience
Copy link
Contributor

I'm going to merge just to see what it looks like deployed but would love for Mike to do another check to make sure it doesn't have errant code lines.

@moviedatascience moviedatascience self-requested a review May 26, 2020 19:57
@moviedatascience moviedatascience merged commit 70e1586 into master May 26, 2020
@moviedatascience moviedatascience deleted the feature/serviceproviders-uniquelinks branch May 26, 2020 19:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants