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

fix header slightly covers .popover-content #3898 #4041

Merged
merged 4 commits into from Nov 30, 2018

Conversation

sashadev-sky
Copy link
Member

@sashadev-sky sashadev-sky commented Nov 25, 2018

Fixes #3898 (<=== Add issue number here)

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
  • code is in uniquely-named feature branch and has no merge conflicts
  • PR is descriptively titled
  • ask @publiclab/reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

Thanks!

@rishabhptr
Copy link
Contributor

@sashadev-sky Thank you for the PR! Would you mind adding a screenshot showing how it looks now 😄 Thanks!

@sashadev-sky
Copy link
Member Author

@rishabhptr thank you for the feedback! This is what it looks like on my localhost server:

screen shot 2018-11-25 at 11 28 03 am

the dropdown stretches further over the header if more "likes" are added.

Also, my PR failed the travis danger tests. Could you please advise how I can fix this?

sashadev-sky added a commit to sashadev-sky/plots2 that referenced this pull request Nov 25, 2018
@sashadev-sky sashadev-sky reopened this Nov 25, 2018
@jonxuxu
Copy link
Member

jonxuxu commented Nov 26, 2018

Hi, your travis build seems to have an error similar to the one I'm getting: The command "if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then danger --verbose; fi" exited with 1.

I was wondering if you know why it's happening. If you've figured out a way to solve it I would really appreciate it!

Copy link
Contributor

@rishabhptr rishabhptr left a comment

Choose a reason for hiding this comment

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

@sashadev-sky I think you should try rebasing, as your branch is quite stale. Perhaps updating it might fix the problem. 👍

.travis.yml Outdated
@@ -27,5 +27,4 @@ script:
- docker-compose exec web bash -c "CI=TRUE GENERATE_REPORT=true rails test -d"
- echo -e '<?xml version="1.0" encoding="UTF-8"?>' > output.xml
- tail -n +2 -q ./test/reports/TEST*.xml >> output.xml
- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then danger --verbose; fi'

- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then danger --verbose; fi'
Copy link
Contributor

Choose a reason for hiding this comment

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

This is unrelated to the PR, so you could remove it. 😄

@plotsbot
Copy link
Collaborator

plotsbot commented Nov 26, 2018

2 Messages
📖 @sashadev-sky Thank you for your pull request! I’m here to help with some tips and recommendations. Please take a look at the list provided and help us review and accept your contribution! And don’t be discouraged if you see errors – we’re here to help.
📖 It looks like you haven’t marked all the checkboxes. Help us review and accept your suggested changes by going through the steps one by one. If it is still a ‘Work in progresss’, please include ‘[WIP]’ in the title.

Generated by 🚫 Danger

@sashadev-sky
Copy link
Member Author

@rishabhptr Thank you for the feedback! I'm still failing the build after rebasing. Any idea why?
@JonathanXu1 Did you manage to resolve it?

@jonxuxu
Copy link
Member

jonxuxu commented Nov 27, 2018

No I never got help from mentors regarding that issue.. sorry!

@rishabhptr
Copy link
Contributor

@sashadev-sky What I meant by updating was that your feature branch is quite behind main master branch, because a lot code might have been added after you cloned the repository.

Please try to follow the following link for getting the latest changes. You can follow them from step 3.

https://publiclab.org/wiki/contributing-to-public-lab-software#Rewinding+the+master+branch

@sashadev-sky
Copy link
Member Author

@rishabhptr Rebasing worked, thank you! Can I have a review please?
@JonathanXu1 updating you in case you're still curious 👍

@jonxuxu
Copy link
Member

jonxuxu commented Nov 28, 2018

Thanks for the heads up! It was very helpful

@jywarren
Copy link
Member

Oh this looks lovely! Thanks! I'm just wondering about one last thing - if the message about the page not having tags is gone, and the menu button is closer up against the top menu, does it still work, or does it get cut off? Could you try resolving the alert message by adding some tag to the page, and reloading and screenshotting again?

See how i'm not sure if this is both obscured by the header but also cut off by the page height?

image

@sashadev-sky
Copy link
Member Author

@jywarren Without the alert message it still fits into the page height:
(below is the same view from the 'moderator' and 'user' accounts, respectively)

screen shot 2018-11-29 at 10 48 16 pm

screen shot 2018-11-29 at 10 50 11 pm

@jywarren jywarren merged commit 8a9dc8f into publiclab:master Nov 30, 2018
@jywarren
Copy link
Member

Great work and good documentation of the issue! Thanks a ton!

jonxuxu pushed a commit to jonxuxu/plots2 that referenced this pull request Dec 2, 2018
…#4041)

* fix header slightly covers .popover-content

* fix header slightly covers .popover-content publiclab#3898 (rebased)

* resolve merge conflicts

* change ssh key to http url
jywarren pushed a commit that referenced this pull request Dec 5, 2018
* Add test for "self.gmil_quote_present?"

To solve part of #3435

* Add test for "self.gmail_quote_present?"

To solve part of #3435

* Bump skylight from 3.1.1 to 3.1.2 (#4080)

Bumps [skylight](https://github.com/skylightio/skylight-ruby) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/skylightio/skylight-ruby/releases)
- [Changelog](https://github.com/skylightio/skylight-ruby/blob/v3.1.2/CHANGELOG.md)
- [Commits](skylightio/skylight-ruby@v3.1.1...v3.1.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* updated scrypt and removed inserting new answer's text into comment form (#4049)

* fix header slightly covers .popover-content #3898 (#4041)

* fix header slightly covers .popover-content

* fix header slightly covers .popover-content #3898 (rebased)

* resolve merge conflicts

* change ssh key to http url

* Set git unshallow for travis to avoid danger bot issues (#3936)

* Inline wiki table formatting broken (#4081)

* fix for inline table

* removed additional file

* removed additional file

* removed additional file

* removed additional file

* tag fix for non-existent tags (#4084)

* tag fix

* Update tag_controller_test.rb

* Update tag_controller_test.rb

* Comment display on /comments (#4086)

* Test for power tag embedded grids (#4085)

* Update tag_controller_test.rb

* Update tag_controller.rb

* Update tag_controller.rb

* Update tag_controller_test.rb

* Update _nodes.html.erb

* Update restful_typeahead.js

* work on node.scraped_image, starting with test (#4077)

* starting with test

* fixes for scraped image!

* fallback lead images for other types

* revision fixture fix

* fixes

* Update node.rb

* additional tweaks

* Update notes_controller_test.rb

* Update revisions.yml

* Update node_test.rb

* Update revisions.yml

* Update nodes.yml

* fixes to question search (#4087)

* Add required (#4006)

* Remove redundancy of 'new_contributor' code (#3903)

* Add range buttons to /tag/____ page #3298

Update the file app/views/tag/show.html.erb in the plots2 repository (press the little pen Icon) and edit the line as shown below.

* Update the file app/models/node_tag.rb

#3864

* a href='/tag/first-time-poster'

#3864

* a href='/tag/first-time-poster'

#3864

* Remove unrelated issues

* remove redundancy of 'new_contributor' code

drupal_user

* remove redundancy of 'new_contributor' code

node_tag

* fix

* Update node_tag.rb

* Update node_tag.rb

* Update drupal_user.rb

* Update node_tag.rb

* Update node_tag.rb

* Update node_tag.rb

* Update tag_test.rb

* Update restful_typeahead.js

* Create a comment_moderation mailer  (#4068)

* send mail to moderator when comment marked as spam

* changing email recipient

* changing recipient email in test

* changing recipient email in mailer test

* updated js deps (#4088)

* Update index.html.erb (#4090)

* Update _node_wiki.html.erb

* Bump omniauth-facebook from 4.0.0 to 5.0.0 (#3784)

Bumps [omniauth-facebook](https://github.com/mkdynamic/omniauth-facebook) from 4.0.0 to 5.0.0.
- [Release notes](https://github.com/mkdynamic/omniauth-facebook/releases)
- [Changelog](https://github.com/mkdynamic/omniauth-facebook/blob/master/CHANGELOG.md)
- [Commits](simi/omniauth-facebook@v4.0.0...v5.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Fixed duplicate pagination in search (#4089)

* Update _comment.html.erb

* Delete questions/_comment.html.erb (#4097)

* fileupload (#4095)

* Fix and test for inline grids in comments (#4096)

* Test for inline grids in comments

* Update _comment.html.erb

* Update comment_controller_test.rb

* Update comment_controller_test.rb

* Update _thumbnail.html.erb

* yarn upgrade test (#4099)

* Update comment_test.rb

* Update comment_test.rb

* Update comment_test.rb

* Update comment_test.rb

* Update comment_test.rb

* Update comment_test.rb

* Update comment_test.rb

* Update to include nokogiri requirement

* Update comment_test.rb

* Update gmail_parsing_test.rb

* Update comment_test.rb
@sashadev-sky sashadev-sky deleted the issue-3898 branch April 9, 2019 00:08
SrinandanPai pushed a commit to SrinandanPai/plots2 that referenced this pull request May 5, 2019
…#4041)

* fix header slightly covers .popover-content

* fix header slightly covers .popover-content publiclab#3898 (rebased)

* resolve merge conflicts

* change ssh key to http url
SrinandanPai pushed a commit to SrinandanPai/plots2 that referenced this pull request May 5, 2019
…liclab#4103)

* Add test for "self.gmil_quote_present?"

To solve part of publiclab#3435

* Add test for "self.gmail_quote_present?"

To solve part of publiclab#3435

* Bump skylight from 3.1.1 to 3.1.2 (publiclab#4080)

Bumps [skylight](https://github.com/skylightio/skylight-ruby) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/skylightio/skylight-ruby/releases)
- [Changelog](https://github.com/skylightio/skylight-ruby/blob/v3.1.2/CHANGELOG.md)
- [Commits](skylightio/skylight-ruby@v3.1.1...v3.1.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* updated scrypt and removed inserting new answer's text into comment form (publiclab#4049)

* fix header slightly covers .popover-content publiclab#3898 (publiclab#4041)

* fix header slightly covers .popover-content

* fix header slightly covers .popover-content publiclab#3898 (rebased)

* resolve merge conflicts

* change ssh key to http url

* Set git unshallow for travis to avoid danger bot issues (publiclab#3936)

* Inline wiki table formatting broken (publiclab#4081)

* fix for inline table

* removed additional file

* removed additional file

* removed additional file

* removed additional file

* tag fix for non-existent tags (publiclab#4084)

* tag fix

* Update tag_controller_test.rb

* Update tag_controller_test.rb

* Comment display on /comments (publiclab#4086)

* Test for power tag embedded grids (publiclab#4085)

* Update tag_controller_test.rb

* Update tag_controller.rb

* Update tag_controller.rb

* Update tag_controller_test.rb

* Update _nodes.html.erb

* Update restful_typeahead.js

* work on node.scraped_image, starting with test (publiclab#4077)

* starting with test

* fixes for scraped image!

* fallback lead images for other types

* revision fixture fix

* fixes

* Update node.rb

* additional tweaks

* Update notes_controller_test.rb

* Update revisions.yml

* Update node_test.rb

* Update revisions.yml

* Update nodes.yml

* fixes to question search (publiclab#4087)

* Add required (publiclab#4006)

* Remove redundancy of 'new_contributor' code (publiclab#3903)

* Add range buttons to /tag/____ page publiclab#3298

Update the file app/views/tag/show.html.erb in the plots2 repository (press the little pen Icon) and edit the line as shown below.

* Update the file app/models/node_tag.rb

publiclab#3864

* a href='/tag/first-time-poster'

publiclab#3864

* a href='/tag/first-time-poster'

publiclab#3864

* Remove unrelated issues

* remove redundancy of 'new_contributor' code

drupal_user

* remove redundancy of 'new_contributor' code

node_tag

* fix

* Update node_tag.rb

* Update node_tag.rb

* Update drupal_user.rb

* Update node_tag.rb

* Update node_tag.rb

* Update node_tag.rb

* Update tag_test.rb

* Update restful_typeahead.js

* Create a comment_moderation mailer  (publiclab#4068)

* send mail to moderator when comment marked as spam

* changing email recipient

* changing recipient email in test

* changing recipient email in mailer test

* updated js deps (publiclab#4088)

* Update index.html.erb (publiclab#4090)

* Update _node_wiki.html.erb

* Bump omniauth-facebook from 4.0.0 to 5.0.0 (publiclab#3784)

Bumps [omniauth-facebook](https://github.com/mkdynamic/omniauth-facebook) from 4.0.0 to 5.0.0.
- [Release notes](https://github.com/mkdynamic/omniauth-facebook/releases)
- [Changelog](https://github.com/mkdynamic/omniauth-facebook/blob/master/CHANGELOG.md)
- [Commits](simi/omniauth-facebook@v4.0.0...v5.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Fixed duplicate pagination in search (publiclab#4089)

* Update _comment.html.erb

* Delete questions/_comment.html.erb (publiclab#4097)

* fileupload (publiclab#4095)

* Fix and test for inline grids in comments (publiclab#4096)

* Test for inline grids in comments

* Update _comment.html.erb

* Update comment_controller_test.rb

* Update comment_controller_test.rb

* Update _thumbnail.html.erb

* yarn upgrade test (publiclab#4099)

* Update comment_test.rb

* Update comment_test.rb

* Update comment_test.rb

* Update comment_test.rb

* Update comment_test.rb

* Update comment_test.rb

* Update comment_test.rb

* Update to include nokogiri requirement

* Update comment_test.rb

* Update gmail_parsing_test.rb

* Update comment_test.rb
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.

None yet

5 participants