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

Update pi-hole.css #1097

Merged
merged 3 commits into from
May 27, 2020
Merged

Update pi-hole.css #1097

merged 3 commits into from
May 27, 2020

Conversation

XhmikosR
Copy link
Contributor

@XhmikosR XhmikosR commented Dec 18, 2019

  • format code
  • use background-color instead of the background shorthand
  • use the animation shorthand
  • only transition opacity and transform in the chart tooltip
  • add browserslist settings in package.json

By submitting this pull request, I confirm the following: {please fill any appropriate checkboxes, e.g: [X]}

{Please ensure that your pull request is for the 'devel' branch!}

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)
  • I have Signed Off all commits. (git commit --signoff)

This is untested

It will conflict with #1094 so I'll need to rebase this later. We might also want to wait until we land #1080 and #1079 so that we do this once for the CSS part.

Non-whitespace diff: https://github.com/pi-hole/AdminLTE/pull/1097/files?w=1

@XhmikosR
Copy link
Contributor Author

I think I'm gonna redo this after we all agree on some sensible browserslistrc. There's no point in supporting IE < 9 or even 10, or Opera Mini since these should not work already anyway due to JS.

@XhmikosR
Copy link
Contributor Author

XhmikosR commented Jan 2, 2020

@dschaper can we agree on a more realistic browserslistrc? Then I will update this and remove any obsolete vendor prefixes from our CSS.

@dschaper
Copy link
Member

dschaper commented Jan 2, 2020

Sure, @PromoFaux which IE do we still need?

@PromoFaux
Copy link
Member

IE10 and 11, though, 10 becomes EOL at the end of this month. I can't imagine there are too many enterprise environments out there running <11.

@dschaper
Copy link
Member

dschaper commented Jan 2, 2020

I think a min of 11 is good.

@XhmikosR
Copy link
Contributor Author

XhmikosR commented Jan 2, 2020

IMHO we should target IE >= 10. IE 9 might also work, but I cannot test it personally.

Plus the normal evergreen browsers.

See https://browsersl.ist/?q=defaults%2C+IE+%3E%3D+10%2C+not+ie_mob+%3C%3D+11 and play with it to visualize the browsers.

@dschaper
Copy link
Member

dschaper commented Jan 2, 2020

If 10 is supportable then great. I was operating under the assumption that 11 would be uncomfortable to shim in but 10 would be like ripping off a band-aid.

If it's not to much more then 10 would be great.

@XhmikosR
Copy link
Contributor Author

XhmikosR commented Jan 2, 2020

It should work, but I cannot confirm if the current devel branch works with IE 10. As long as we don't use new features, we should be fine.

@XhmikosR XhmikosR marked this pull request as ready for review January 3, 2020 13:38
@XhmikosR
Copy link
Contributor Author

XhmikosR commented Jan 3, 2020

This is ready for review. The browserslist config I used is added in package.json. I can add the needed tools to automate this if you guys want later (postcss-cli and autoprefixer)

@XhmikosR XhmikosR force-pushed the XhmikosR-patch-1 branch 2 times, most recently from 5180f42 to 9016149 Compare January 3, 2020 13:51
@XhmikosR
Copy link
Contributor Author

XhmikosR commented Jan 3, 2020

Alright, I went ahead and added everything. Now everything is automated regarding CSS and JS, including CSS prefixes for our CSS but we still need to run autoprefixer (npm run prefix) manually.

@XhmikosR XhmikosR force-pushed the XhmikosR-patch-1 branch 3 times, most recently from 96acbb1 to 5feea09 Compare January 3, 2020 13:59
@XhmikosR XhmikosR force-pushed the XhmikosR-patch-1 branch 2 times, most recently from 76918a7 to 52eb6fc Compare January 19, 2020 12:00
@XhmikosR
Copy link
Contributor Author

This is ready for review.

style/pi-hole.css Outdated Show resolved Hide resolved
@XhmikosR XhmikosR force-pushed the XhmikosR-patch-1 branch 2 times, most recently from f19042c to 0332621 Compare March 11, 2020 19:54
@XhmikosR
Copy link
Contributor Author

Rebased

@XhmikosR XhmikosR force-pushed the XhmikosR-patch-1 branch 2 times, most recently from 1ef4c66 to 6ac7e5f Compare May 17, 2020 14:28
PromoFaux
PromoFaux previously approved these changes May 17, 2020
@XhmikosR XhmikosR force-pushed the XhmikosR-patch-1 branch 2 times, most recently from 6d72c0a to c48cf6c Compare May 17, 2020 16:55
@PromoFaux
Copy link
Member

@XhmikosR Is this one ready for review and merge?

@XhmikosR
Copy link
Contributor Author

I think I need to do a couple more tests.

@XhmikosR XhmikosR marked this pull request as draft May 18, 2020 18:05
@XhmikosR XhmikosR force-pushed the XhmikosR-patch-1 branch 3 times, most recently from a06c83c to ff3f46b Compare May 22, 2020 08:59
@XhmikosR XhmikosR marked this pull request as ready for review May 22, 2020 09:02
@XhmikosR XhmikosR force-pushed the XhmikosR-patch-1 branch from ff3f46b to 8fe0735 Compare May 22, 2020 09:03
@XhmikosR XhmikosR marked this pull request as draft May 22, 2020 12:52
@XhmikosR XhmikosR force-pushed the XhmikosR-patch-1 branch from 8fe0735 to 76f5424 Compare May 24, 2020 08:28
@XhmikosR XhmikosR mentioned this pull request May 24, 2020
9 tasks
@XhmikosR XhmikosR marked this pull request as ready for review May 24, 2020 08:30
@XhmikosR
Copy link
Contributor Author

@PromoFaux : I think this is finally ready. I split the patches a bit, tighten the browserslist settings and it should be good to go after one more tests round :)

@XhmikosR XhmikosR force-pushed the XhmikosR-patch-1 branch from 76f5424 to 9d52e9f Compare May 25, 2020 18:02
XhmikosR added 3 commits May 26, 2020 13:13
* add browserslist settings in package.json
* add prettier scripts for CSS and JS (JS is mainly for devel since xo handles this for us)
* add autoprefixer to handle CSS prefixes for us (`npm run prefix`)

Signed-off-by: XhmikosR <[email protected]>
* format code
* use `background-color` instead of the `background` shorthand
* use the `animation` shorthand
* remove unneeded CSS prefixes

Signed-off-by: XhmikosR <[email protected]>
@XhmikosR XhmikosR force-pushed the XhmikosR-patch-1 branch from 9d52e9f to ba86bb8 Compare May 26, 2020 10:14
@PromoFaux PromoFaux merged commit 1bd4500 into devel May 27, 2020
@PromoFaux PromoFaux deleted the XhmikosR-patch-1 branch May 27, 2020 09:16
@XhmikosR XhmikosR added this to the v5.1 milestone Jun 4, 2020
@PromoFaux PromoFaux mentioned this pull request Jul 5, 2020
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-5-1-released/35577/1

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.

5 participants