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

Add background colors on Query log + switchable text coloring (as before) #1893

Merged
merged 4 commits into from
Sep 21, 2021

Conversation

PromoFaux
Copy link
Member

By submitting this pull request, I confirm the following:

  • 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, and have included unit tests where possible.
  • 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)

What does this PR aim to accomplish?:

I'm going to throw a spanner in the works here, been playing about with this as a middle ground using background-color: rgb(229,83,75,0.1)!important; for blocked and background-color: rgb(70,149,74,0.1)!important; for allowed

image

image

image

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
… last release

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
@PromoFaux PromoFaux requested a review from a team September 16, 2021 17:48
Copy link
Member

@DL6ER DL6ER left a comment

Choose a reason for hiding this comment

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

prettier failed

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
@DL6ER
Copy link
Member

DL6ER commented Sep 17, 2021

It still fails 🙃 I'll fix it when merging #1888 into this PR.

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER
Copy link
Member

DL6ER commented Sep 17, 2021

@PromoFaux Please give it another look. I replaced the text variable rowClass = "blocked-row" by a boolean blocked so we need to change it in only one location if we ever need to change something.

@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/theme-changed/49735/4

@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/neues-update-und-farbe-im-querry-log/49755/2

@PromoFaux PromoFaux closed this Sep 20, 2021
@PromoFaux PromoFaux reopened this Sep 20, 2021
@DL6ER DL6ER changed the title Compromise between new and old colour schemes on Query log Add background colors on Query log + switchable text coloring (as before) Sep 20, 2021
@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/neues-update-und-farbe-im-querry-log/49755/7

@dschaper
Copy link
Member

Node test passed, the status is hung up here.

https://github.com/pi-hole/AdminLTE/actions/runs/1254831670

Okay to merge with admin override.

@dschaper dschaper merged commit e3a69af into devel Sep 21, 2021
@dschaper dschaper deleted the tweak/tablecolours branch September 21, 2021 16:39
@DL6ER DL6ER mentioned this pull request Sep 25, 2021
8 tasks
@rdwebdesign
Copy link
Member

rdwebdesign commented Oct 4, 2021

@PromoFaux, I have a suggestion:

Applying the CSS rule on the td tag you can get a better result without using !important:

.blocked-row td {
  background-color: rgb(229, 83, 75, 0.1);
}

.allowed-row td {
  background-color: rgb(70, 149, 74, 0.1);
}

That way, all themes keep the striped visual, and the dark themes still have the hover effect.

PromoFaux pushed a commit that referenced this pull request Oct 5, 2021
Improves PR #1893

The CSS for the background was created using "!important", to force the background colors for blocked/allowed on the table lines, but this introduced a visual problem: all lines have the same backgrounds. No more striped tables.

To solve this, I moved the effect from the `tr` tags to `td` tags. Now the rows (tr) have striped backgrounds and the cells adds the color layer.

Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>
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