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

bootstrap classes integration #7789

Merged
merged 3 commits into from
Apr 21, 2020

Conversation

keshav234156
Copy link
Member

@keshav234156 keshav234156 commented Apr 7, 2020

Fixes publiclab/PublicLab.Editor#443 Fixes #7532

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/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!

@keshav234156
Copy link
Member Author

@jywaren I have added only classes being used from Bootstrap.

@codecov
Copy link

codecov bot commented Apr 7, 2020

Codecov Report

Merging #7789 into master will increase coverage by 0.02%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #7789      +/-   ##
==========================================
+ Coverage   81.94%   81.97%   +0.02%     
==========================================
  Files          97       97              
  Lines        5627     5630       +3     
==========================================
+ Hits         4611     4615       +4     
+ Misses       1016     1015       -1     
Impacted Files Coverage Δ
app/models/tag.rb 97.51% <100.00%> (+0.05%) ⬆️
app/services/search_service.rb 95.09% <100.00%> (-0.05%) ⬇️
app/api/srch/search.rb 66.24% <0.00%> (+0.63%) ⬆️

@nicoleiocana
Copy link
Contributor

Since plots2 utilizes Bootstrap 4, I think we should refrain from using the .btn-default class since it is no longer being utilized. Source. Furthermore, if we just added the class .btn-secondary to the button element, the bootstrap styling would automatically be applied, making our code more efficient.

@keshav234156
Copy link
Member Author

keshav234156 commented Apr 10, 2020

@nicoleiocana You are right. But the problem arises as https://github.com/publiclab/PublicLab.Editor/ uses bootstrap version 3.4 and plots2 uses version 4 there are class mismatches so they are not interchangeable
I have done similar to

.note-comment .btn-default {

@keshav234156
Copy link
Member Author

Screenshot from 2020-04-10 18-55-32
Screenshot from 2020-04-10 18-55-21
Screenshot from 2020-04-10 18-55-11

@keshav234156
Copy link
Member Author

@jywarren Please review!!

@keshav234156 keshav234156 requested a review from jywarren April 14, 2020 14:05
@jywarren
Copy link
Member

Ah, hmm, so is the solution here that it now has some CSS customizations that make it compatible with both Bootstrap 3 and 4? Would you mind adding some documentation to the README accordingly, so folks know what's going on, and maybe linking to it from a comment in the stylesheet?

Thank you! Such great work!!!

@keshav234156
Copy link
Member Author

@jywarren included the comments

@jywarren jywarren merged commit f7908c3 into publiclab:master Apr 21, 2020
@jywarren
Copy link
Member

Awesome, thank you!!!

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.

make button/link styles more consistent and clearly "pressable" Including Bootstrap in plots2/editor
3 participants