Skip to content
This repository has been archived by the owner on Jun 28, 2022. It is now read-only.

Change CSS to avoid Jasmine bug #9

Merged
merged 3 commits into from
Dec 4, 2015
Merged

Change CSS to avoid Jasmine bug #9

merged 3 commits into from
Dec 4, 2015

Conversation

prather-mcs
Copy link
Contributor

I use pictures to show how this bug makes the project more confusing
to students here:
http://discussions.udacity.com/t/found-an-actual-bug-in-jasmine/17025

I reported and fixed the Jasmine bug here:
jasmine/jasmine#844

Review on Reviewable

I use pictures to show how this bug makes the project more confusing
to students here:
http://discussions.udacity.com/t/found-an-actual-bug-in-jasmine/17025

I reported and fixed the Jasmine bug here:
jasmine/jasmine#844
@walesmd
Copy link
Contributor

walesmd commented Dec 3, 2015

@prather-mcs Can you resolve the current conflicts? If so, I'll gladly merge this.

I use pictures to show how this bug makes the project more confusing
to students here:
http://discussions.udacity.com/t/found-an-actual-bug-in-jasmine/17025

I reported and fixed the Jasmine bug here:
jasmine/jasmine#844
@prather-mcs
Copy link
Contributor Author

Hello @walesmd.

Did I resolve current conflicts? And keep the CSS changes I intended?

If so, all thanks is to your Git & GitHub courseware, which I used alongside the normal Git documentation to get the PR up-to-date and ready to merge.

@@ -26,7 +26,7 @@
<h1 class="header-title">Feeds</h1>
</div>

<div class="menu">
<div class="slide-menu hidden">
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you remove the hidden class from this element? That class does not exist in the CSS file and was removed in prior commits.

Removed 'hidden' class from class attribute value.
@prather-mcs
Copy link
Contributor Author

My apologies for not quite merging it in the right way for this project. I was so focused on taking the right steps with git remotes, branches, and forks, that I failed to actually get the text content right at the merge conflict line.

With my latest change, that mistake should have been amended.

walesmd added a commit that referenced this pull request Dec 4, 2015
@walesmd walesmd merged commit 55ed1f7 into udacity:master Dec 4, 2015
amyyf referenced this pull request in amyyf/frontend-nanodegree-feedreader Jul 18, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants