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

Seperated css #7258

Merged
merged 5 commits into from
Jan 18, 2020
Merged

Seperated css #7258

merged 5 commits into from
Jan 18, 2020

Conversation

sssash18
Copy link
Contributor

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

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!

@sssash18 sssash18 mentioned this pull request Jan 16, 2020
5 tasks
@sssash18 sssash18 requested a review from jywarren January 16, 2020 09:55
@codecov
Copy link

codecov bot commented Jan 16, 2020

Codecov Report

Merging #7258 into master will increase coverage by 20.35%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #7258       +/-   ##
==========================================
+ Coverage   61.25%   81.6%   +20.35%     
==========================================
  Files          97      97               
  Lines        5709    5600      -109     
==========================================
+ Hits         3497    4570     +1073     
+ Misses       2212    1030     -1182
Impacted Files Coverage Δ
app/controllers/admin_controller.rb 78.05% <ø> (+55.36%) ⬆️
app/models/tag.rb 97.46% <ø> (+0.46%) ⬆️
app/models/node.rb 90.92% <100%> (+2.98%) ⬆️
app/controllers/application_controller.rb 92.3% <100%> (+8.4%) ⬆️
app/models/comment.rb 76.95% <100%> (+2.66%) ⬆️
app/controllers/home_controller.rb 98.38% <0%> (+1.61%) ⬆️
app/models/user.rb 91.01% <0%> (+1.95%) ⬆️
app/models/image.rb 82.5% <0%> (+2.5%) ⬆️
app/models/spamaway.rb 94.87% <0%> (+2.56%) ⬆️
... and 33 more

@sssash18
Copy link
Contributor Author

@publiclab/reviewers Should I add the stylesheet link in application.html.erb?

@jywarren
Copy link
Member

jywarren commented Jan 16, 2020 via email

@sssash18
Copy link
Contributor Author

@jywarren I already added the stylesheet link in notes.html.erb

Copy link
Member

@Uzay-G Uzay-G left a comment

Choose a reason for hiding this comment

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

This looks good @sssash18! Thanks for contributing 👍

@@ -1,3 +1,4 @@
<%= stylsheet_link_tag "notes", :media => "all" %>
Copy link
Member

Choose a reason for hiding this comment

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

It's good but you made a typo here. You need to write stylesheet

@sssash18
Copy link
Contributor Author

@Uzay-G I fixed the typo

@@ -1,3 +1,4 @@
<%= stylesheet_link_tag "notes", :media => "all" %>
Copy link
Member

Choose a reason for hiding this comment

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

I think you actually don't need to add this. Rails automatically adds these assets through the asset pipeline: https://guides.rubyonrails.org/asset_pipeline.html#controller-specific-assets

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@Uzay-G Previously I did'nt added it but this was the reply from @jywarren in the previous pr
Screenshot 2020-01-16 at 9 34 40 PM

Copy link
Member

Choose a reason for hiding this comment

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

Hmm. Well, i made the request because it seemed in the screenshots generated here that the styles were not appearing. I don't know that they're automatically included; we do have other styles that are for only specific pages, i believe?

https://stable.publiclab.org/tag/water-quality shows the way that page is supposed to look:

image

And i think the styles weren't getting loaded. Do you have this running locally and can you confirm? If not, we can check the latest auto-generated screenshots for this PR. Thanks for your patience on this!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jywarren This is the page that I am getting locally without including the stylesheet link
Screenshot 2020-01-18 at 3 03 55 PM

Copy link
Member

Choose a reason for hiding this comment

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

And what happens when you include it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@Uzay-G It remains the same
Screenshot 2020-01-18 at 4 43 15 PM

Copy link
Member

Choose a reason for hiding this comment

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

Yeah alright so we need to remove the stylesheet link tag

@sssash18
Copy link
Contributor Author

@Uzay-G @jywarren I think now it's fine.

Copy link
Member

@Uzay-G Uzay-G left a comment

Choose a reason for hiding this comment

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

Yeah that fixed it. Thanks for your help @sssash18!

Copy link
Member

@SidharthBansal SidharthBansal left a comment

Choose a reason for hiding this comment

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

Great

@SidharthBansal SidharthBansal merged commit d8c644a into publiclab:master Jan 18, 2020
NitinBhasneria pushed a commit to NitinBhasneria/plots2 that referenced this pull request Jan 21, 2020
* Removed css from notes.html.erb

* Added a new css file

* Added stylesheet link

* Fixed typo

* removed stylesheet link
vinitshahdeo pushed a commit to vinitshahdeo/plots2 that referenced this pull request Feb 1, 2020
* Removed css from notes.html.erb

* Added a new css file

* Added stylesheet link

* Fixed typo

* removed stylesheet link
NitinBhasneria pushed a commit to NitinBhasneria/plots2 that referenced this pull request Feb 5, 2020
* Removed css from notes.html.erb

* Added a new css file

* Added stylesheet link

* Fixed typo

* removed stylesheet link
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.

To move css present in _notes.html.erb
4 participants