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

move the styling on the front_ui/index to stylesheets/front_ui.scss #1223

Merged
merged 1 commit into from
Feb 2, 2020

Conversation

katungi
Copy link
Contributor

@katungi katungi commented Jan 27, 2020

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

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

  • [ x] PR is descriptively titled 📑 and links the original issue above 🔗
  • 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 📁
  • screenshots/GIFs are attached 📎 in case of UI updation
  • ask @publiclab/mapknitter-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!
Move styling from front_ui to stylesheets/front_ui
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!

@katungi katungi requested a review from cesswairimu January 27, 2020 19:39
@codecov
Copy link

codecov bot commented Jan 27, 2020

Codecov Report

Merging #1223 into main will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #1223   +/-   ##
=======================================
  Coverage   72.92%   72.92%           
=======================================
  Files          40       40           
  Lines        1400     1400           
=======================================
  Hits         1021     1021           
  Misses        379      379

@cesswairimu
Copy link
Collaborator

Looks great @katungi, could you please add a screenshot to make sure we did not break anything. Thanks for opening this

@katungi
Copy link
Contributor Author

katungi commented Jan 31, 2020 via email

@katungi
Copy link
Contributor Author

katungi commented Jan 31, 2020

Screenshot from 2020-01-27 20-29-32
Screenshot from 2020-01-27 20-29-36
Screenshot from 2020-01-27 20-29-42
Screenshot from 2020-01-27 20-29-45
Screenshot from 2020-01-27 20-44-21

@cesswairimu there you go. Screenshots added.

Copy link
Collaborator

@cesswairimu cesswairimu left a comment

Choose a reason for hiding this comment

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

Great, thanks for working on this 🚀

@@ -1,4 +1,4 @@
class AddDisplayWelcomeToMaps < ActiveRecord::Migration[5.2]
Copy link
Collaborator

Choose a reason for hiding this comment

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

Hey @katungi, I see you modified these three files, could you please remove them since they are not part of the issue?
After this we should be ready to merge. Thanks

Copy link
Contributor Author

Choose a reason for hiding this comment

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

how do remove them @cesswairimu ?
do i gitignore?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Nope, on your branch do
git log
pick the second last SHA and do
git reset SHA
if you now do git status you will see the your files unstaged
git add filename to add the files you only want
then git commit then git push -f origin branchname,
Makes sense? Let me know if u get stuck

@cesswairimu cesswairimu merged commit 75c5f64 into publiclab:main Feb 2, 2020
@welcome
Copy link

welcome bot commented Feb 2, 2020

Congrats on merging your first pull request! 🙌🎉⚡️
Your code will likely be published to https://mapknitter.org in the next few days.
In the meantime, can you tell us your Twitter handle so we can thank you properly?
Now that you've completed this, you can help someone else take their first step!
Reach out to someone else working on theirs on Public Lab's code welcome page. Thanks!

Help others take their first step

Now that you've merged your first pull request, you're the perfect person to help someone else out with this challenging first step. 🙌

https://code.publiclab.org

Try looking at this list of `first-timers-only` issues, and see if someone else is waiting for feedback, or even stuck! 😕

People often get stuck at the same steps, so you might be able to help someone get unstuck, or help lead them to some documentation that'd help. Reach out and be encouraging and friendly! 😄 🎉

Read about how to help support another newcomer here, or find other ways to offer mutual support here.

@cesswairimu
Copy link
Collaborator

Fantastic 🚀 Thanks for working on this and welcome to PublicLab 🎈

@katungi
Copy link
Contributor Author

katungi commented Feb 2, 2020 via email

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.

Move styling from front_ui to stylesheets
2 participants