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

Apply LCARS theme to a few things missing it #2538

Merged
merged 2 commits into from
Mar 27, 2023

Conversation

infinitytec
Copy link
Contributor

@infinitytec infinitytec commented Mar 3, 2023

Thank you for your contribution to the Pi-hole Community!

Please read the comments below to help us consider your Pull Request.

We are all volunteers and completing the process outlined will help us review your commits quicker.

Please make sure you

  1. Base your code and PRs against the repositories developmental branch.
  2. Sign Off all commits as we enforce the DCO for all contributions
  3. Sign all your commits as they must have verified signatures
  4. File a pull request for any change that requires changes to our documentation at our documentation repo

What does this PR aim to accomplish?:

More fixes to the LCARS theme. This styles the "about" hamburger menu on the upper right and modals such as the Teleporter import.

How does this PR accomplish the above?:

This makes a few changes to style some previously unstyled popups.

Before:
before1
before2

After:
after1
after2

Link documentation PRs if any are needed to support this PR:

n/a


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code and I have tested my changes.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)
  6. I have checked that another pull request for this purpose does not exist.
  7. I have considered, and confirmed that this submission will be valuable to others.
  8. I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  9. I give this submission freely, and claim no ownership to its content.

  • I have read the above and my PR is ready for review. Check this box to confirm

@infinitytec infinitytec changed the base branch from master to devel March 3, 2023 05:09
@infinitytec infinitytec changed the title Update lcars.css Apply LCARS theme to a few things missing it Mar 3, 2023
@yubiuser
Copy link
Member

yubiuser commented Mar 3, 2023

Could you please provide some screenshots before/after to show the relevant changes?

@infinitytec
Copy link
Contributor Author

Could you please provide some screenshots before/after to show the relevant changes?

Done!

@rdwebdesign
Copy link
Member

I think the top right menu became too dark and very hard to distinguish from the background:
LCARS_top_right_menu

@infinitytec
Copy link
Contributor Author

infinitytec commented Mar 4, 2023

I think the top right menu became too dark and very hard to distinguish from the background:
How about this?
image

Edit: I swapped out my arbitrary color of #010101 with the #111111 used elsewhere. It's a little lighter, but barely noticable.

@yubiuser
Copy link
Member

Thanks for your PR. First, this is a lot about personal taste:

I like the new menu with the blue border. However, I see some flickering after opening the menu - is this intended? The teleporter modal with the new black background is hard to distinguish from the rest of the (dark) interface. Could you add a blue border here as well?

@infinitytec
Copy link
Contributor Author

Thanks for your PR. First, this is a lot about personal taste:

I like the new menu with the blue border. However, I see some flickering after opening the menu - is this intended? The teleporter modal with the new black background is hard to distinguish from the rest of the (dark) interface. Could you add a blue border here as well?

The flickering is intended. It matches the alert messages that pop up. LCARS often has elements that do this and I thought it would be fun to have it there. We can remove it if that's a problem.

I'll add the border to the other modal. I'll also check to see if there are some in other locations that can be updated to match.

style/themes/lcars.css Outdated Show resolved Hide resolved
style/themes/lcars.css Outdated Show resolved Hide resolved
@infinitytec
Copy link
Contributor Author

OK, I've made the changes. I have determined the borer appears to show on all modals.

@rdwebdesign
Copy link
Member

Why did you close the PR?

@infinitytec
Copy link
Contributor Author

Why did you close the PR?

Oops

@infinitytec infinitytec reopened this Mar 11, 2023
@rdwebdesign
Copy link
Member

rdwebdesign commented Mar 11, 2023

You changed the background from white to the dark color.
Now some other elements need to be changed too.

  1. The modal has bright internal lines (header and footer borders):

    image

    You can choose to make them very faint (changing the color to something darker #222, #333, etc.) or you can use the same color as the borders #48f.

    Example:

    .modal-header,
    .modal-footer {
      border-color: #222;
    }
  2. Also, the close button (small x on the top right) is black and almost invisible.
    You need to change its color and opacity to make it more visible.
    Add:

    .close {
      color: #9ab;
      opacity: 0.4;
      text-shadow: none;
    }
    
    .close:focus, .close:hover {
      color: #48f;  
      opacity: 1;
    }
  3. On the top-menu, the links states (hover, focus, etc.) are now using too dark colors.
    Focus is specially important, because it's used when navigating using the keyboard.

    To fix this, please change the lines 512-514 to:

    .dropdown-menu > li > a:hover,
    .dropdown-menu > li > a:active,
    .dropdown-menu > li > a:focus {
      color: #48f;
    }   

@infinitytec
Copy link
Contributor Author

You changed the background from white to the dark color. Now some other elements need to be changed too.

1. The modal has bright internal lines (header and footer borders):
   ![image](https://user-images.githubusercontent.com/1385443/224512744-7e133476-8bc3-4bed-b471-c53cd55897a9.png)
   You can choose to make them very faint (changing the color to something darker `#222`, `#333`, etc.) or you can use the same color as the borders `#48f`.
   Example:
   ```css
   .modal-header,
   .modal-footer {
     border-color: #222;
   }
   ```

2. Also, the close button (small `x` on the top right) is black and almost invisible.
   You need to change its color and opacity to make it more visible.
   Add:
   ```css
   .close {
     color: #9ab;
     opacity: 0.4;
     text-shadow: none;
   }
   
   .close:focus, .close:hover {
     color: #48f;  
     opacity: 1;
   }
   ```

3. On the top-menu, the links states (hover, focus, etc.) are now using too dark colors.
   Focus is specially important, because it's used when navigating using the keyboard.
   To fix this, please change the lines 512-514 to:
   ```css
   .dropdown-menu > li > a:hover,
   .dropdown-menu > li > a:active,
   .dropdown-menu > li > a:focus {
     color: #48f;
   }   
   ```

Good suggestions. Added,

style/themes/lcars.css Outdated Show resolved Hide resolved
@infinitytec
Copy link
Contributor Author

infinitytec commented Mar 17, 2023

Sounds good. I'll try to make that change this weekend.

Edit: done.

@infinitytec
Copy link
Contributor Author

The API Modal now has a better close button:
image

style/themes/lcars.css Outdated Show resolved Hide resolved
style/themes/lcars.css Show resolved Hide resolved
Signed-off-by: infinitytec <infinitytec@users.noreply.github.com>

Update lcars.css

Signed-off-by: infinitytec <infinitytec@users.noreply.github.com>

Update lcars.css

Signed-off-by: infinitytec <infinitytec@users.noreply.github.com>

Update lcars.css

Signed-off-by: infinitytec <infinitytec@users.noreply.github.com>

Add additional styling for API modal close button

Signed-off-by: infinitytec <infinitytec@users.noreply.github.com>

Update lcars.css

Signed-off-by: infinitytec <infinitytec@users.noreply.github.com>

Update lcars.css

Signed-off-by: infinitytec <infinitytec@users.noreply.github.com>

Update lcars.css

Signed-off-by: infinitytec <infinitytec@users.noreply.github.com>

Improved borders for modals and fixed header colors

Signed-off-by: infinitytec <infinitytec@users.noreply.github.com>

Update style/themes/lcars.css

Signed-off-by: infinitytec <infinitytec@users.noreply.github.com>

Update style/themes/lcars.css

Signed-off-by: infinitytec <infinitytec@users.noreply.github.com>

Update lcars.css

Signed-off-by: infinitytec <infinitytec@users.noreply.github.com>

Adjusted theme a bit more

Signed-off-by: infinitytec <infinitytec@users.noreply.github.com>

Update lcars.css

Signed-off-by: infinitytec <infinitytec@users.noreply.github.com>

Update lcars.css

Signed-off-by: infinitytec <infinitytec@users.noreply.github.com>
Co-Authored-By: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: infinitytec <infinitytec@users.noreply.github.com>
@yubiuser yubiuser merged commit d0508f8 into pi-hole:devel Mar 27, 2023
@DL6ER DL6ER mentioned this pull request May 28, 2023
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.

3 participants