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

Scale homepage modal buttons #1606

Merged
merged 4 commits into from
Apr 12, 2022
Merged

Conversation

sakshi-2412
Copy link
Contributor

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

Scaled homepage modal buttons so that they are of the same height on all screens

modal-buttons.mp4

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

  • 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

@welcome
Copy link

welcome bot commented Mar 6, 2022

Thanks for opening this pull request! Dangerbot will test out your code and reply in a bit with some pointers and requests.
There may be some errors, but don't worry! We're here to help! 👍🎉😄

@gitpod-io
Copy link

gitpod-io bot commented Mar 6, 2022

@codeclimate
Copy link

codeclimate bot commented Mar 6, 2022

Code Climate has analyzed commit 02780ff and detected 0 issues on this pull request.

View more on Code Climate.

<a class="btn btn-primary btn-lg" href= 'https://store.publiclab.org/collections/mapping-kits'>
Get a mapping kit <i class="fa fa-angle-double-right fa-fw" style="font-size:18px;color:white;"></i>
</a>
<% if logged_in? %>
<a class="btn btn-primary btn-lg" href="<%= new_map_url %>">
<a class="btn btn-primary btn-lg" href="<%= new_map_url %>" style="display:flex; align-content:center; flex-wrap:wrap; justify-content:center;">
Copy link
Contributor

Choose a reason for hiding this comment

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

You can refactor these duplicated inline styles into .modal-buttons a selector.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure! I'll do that

@sakshi-2412
Copy link
Contributor Author

@VladimirMikulic I have updated the changes.. can you please take a look. Thanks

@jywarren
Copy link
Member

I'm trying to fix some unrelated dependency issues in #1616 which should unblock this -- we'll need to rebase again, but hang on and let me try to get this working!

@codecov
Copy link

codecov bot commented Mar 23, 2022

Codecov Report

Merging #1606 (841ad96) into main (4331ef0) will decrease coverage by 1.44%.
The diff coverage is 59.58%.

❗ Current head 841ad96 differs from pull request most recent head 0b53472. Consider uploading reports for the commit 0b53472 to get more accurate results

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1606      +/-   ##
==========================================
- Coverage   72.98%   71.54%   -1.45%     
==========================================
  Files          40       40              
  Lines        1399     1409      +10     
==========================================
- Hits         1021     1008      -13     
- Misses        378      401      +23     
Impacted Files Coverage Δ
app/channels/concurrent_editing_channel.rb 0.00% <0.00%> (-83.34%) ⬇️
app/controllers/utility_controller.rb 0.00% <0.00%> (-100.00%) ⬇️
app/helpers/users_helper.rb 21.73% <0.00%> (ø)
app/models/map.rb 92.25% <ø> (-1.30%) ⬇️
app/helpers/application_helper.rb 50.00% <20.00%> (ø)
app/controllers/annotations_controller.rb 59.25% <22.22%> (ø)
app/controllers/sessions_controller.rb 32.91% <22.22%> (ø)
app/controllers/front_ui_controller.rb 74.28% <33.33%> (ø)
app/controllers/application_controller.rb 88.88% <50.00%> (ø)
app/controllers/images_controller.rb 76.54% <61.90%> (ø)
... and 15 more

@jywarren
Copy link
Member

#1616 succeeded!!!! Can you rebase this over the latest main branch? I believe it will then pass. Thank you!!!

@sakshi-2412
Copy link
Contributor Author

Did I do something wrong? I had to resolve some merge conflicts, not sure if I did it right 😞

@jywarren
Copy link
Member

Hi, I'm so sorry to reply late. I'm going to try rebasing this over the latest main branch and I /think/ it will resolve -- nothing you did wrong, in any case!

@jywarren jywarren force-pushed the modalButtons#1174 branch from f58ce43 to e7450ba Compare April 12, 2022 19:07
@jywarren
Copy link
Member

OK, rebased! Let's see - 🤞

@jywarren jywarren force-pushed the modalButtons#1174 branch from e7450ba to 2153688 Compare April 12, 2022 19:33
@jywarren jywarren force-pushed the modalButtons#1174 branch from 2153688 to 0b53472 Compare April 12, 2022 21:44
@jywarren jywarren merged commit 6034b99 into publiclab:main Apr 12, 2022
@jywarren
Copy link
Member

OK phew, sorry that took a while, it's merged now! Thank you!!

@cesswairimu cesswairimu mentioned this pull request Jul 1, 2022
5 tasks
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.

Homepage modal buttons not scaled
3 participants