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

Move to Bootstrap 5 #828

Merged
merged 13 commits into from
Feb 7, 2024
Merged

Move to Bootstrap 5 #828

merged 13 commits into from
Feb 7, 2024

Conversation

alvinBM
Copy link
Member

@alvinBM alvinBM commented Nov 15, 2023

Pullrequest

Move to bootstrap 5

Issues

@alvinBM alvinBM marked this pull request as draft November 15, 2023 12:50
composer.json Outdated Show resolved Hide resolved
@alvinBM alvinBM force-pushed the bootstrap5-integration branch from d4fbe5d to 77be84d Compare November 17, 2023 15:34
@marclaporte marclaporte mentioned this pull request Nov 20, 2023
@alvinBM alvinBM force-pushed the bootstrap5-integration branch from 77be84d to 50677f6 Compare November 22, 2023 12:47
@marclaporte
Copy link
Member

I am thrilled there is progress here!

@alvinBM alvinBM force-pushed the bootstrap5-integration branch 2 times, most recently from 97fbf78 to 0ed9f4f Compare December 13, 2023 15:11
@alvinBM alvinBM force-pushed the bootstrap5-integration branch 8 times, most recently from 825193f to e6c4443 Compare January 5, 2024 19:32
@alvinBM alvinBM force-pushed the bootstrap5-integration branch from ec67a36 to 27d4c5e Compare January 18, 2024 13:53
@alvinBM alvinBM marked this pull request as ready for review January 18, 2024 13:53
@alvinBM alvinBM force-pushed the bootstrap5-integration branch from 27d4c5e to e469922 Compare January 18, 2024 13:56
@marclaporte
Copy link
Member

yay!

modules/pop3/modules.php Outdated Show resolved Hide resolved
@kroky
Copy link
Member

kroky commented Jan 19, 2024

That seems like quite an effort. I added just a couple of comments. Code looks good. I think more people should test each form/table/page in Cypht to ensure it works correctly. Also, after that's merged, we need to test the Tiki integration as there might need to be some tweaks (especially if bootstrap versions are different).

@marclaporte
Copy link
Member

marclaporte commented Jan 19, 2024

At a meeting yesterday, @alvinBM indicated that future steps (in distinct PRs) include adding some themes from Bootswatch and testing the integration in Tiki.

@josaphatim
Copy link
Member

@alvinBM I just found some points that need to be fixed.

  • Login and success buttons color should be teal to make it uniform with link I guess.
  • Remove css styling of .nux_password
  • Add bootstrap to .credentials, .search_terms
  • Test, delete, forget, hide buttons are not working anymore on /?page=servers page
  • Class Hm_Image_Sources should be deleted as icons are replaced by twbs/bootstrap-icons
  • Adding servers (IMAP, JMAP, SMTP) is not working
  • Delete button on /?page=contacts page is not working
  • Many tests are failing
  • Review padding on /?page=highlights page when there is no rule yet
  • Add bootstrap to Github, 2fa and Wordpress Settings (Activate those modules) then got to /?page=settings page
  • Add bootstrap to 2fa authentication page

@josaphatim
Copy link
Member

josaphatim commented Jan 22, 2024

@alvinBM I think also:

  • Inputs and buttons on modal Add script and add filter must also have bootstrap classes.
  • Page /?page=block_list has no bootstrap yet
  • On message list page:
    - Snooze button dropdown must be replaced by bootstrap dropdown
    - copy and move button are not working and must all toggle a bootstrap dropdown, our custom dropdowns must be replaced everywhere.
  • On message view page:
    - Block sender button dropdown must also be replaced and its inputs must use bootstrap classes
    - In from header: there is a button that toggle a dropdown must be replaced too.
    - Next and previous buttons icons must be replaced too
  • Class .unread_count must also have a .badge class
  • The + sign before mailboxes that have children may also be replaced by an icon

@alvinBM alvinBM force-pushed the bootstrap5-integration branch 4 times, most recently from 10591d4 to 6bd3470 Compare February 6, 2024 12:38
@@ -1,3 +1,4 @@
<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

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

gremlin

modules/2fa/site.css Outdated Show resolved Hide resolved
@alvinBM alvinBM force-pushed the bootstrap5-integration branch 3 times, most recently from 39324f7 to b732308 Compare February 6, 2024 13:55
@alvinBM alvinBM force-pushed the bootstrap5-integration branch from b732308 to eedadad Compare February 6, 2024 21:24
@alvinBM
Copy link
Member Author

alvinBM commented Feb 6, 2024

  • Many tests are failing

I fixed most of the tests, and I noticed that others were not even linked to my PL, and even in master I have quite a few tests that fail.

@alvinBM
Copy link
Member Author

alvinBM commented Feb 6, 2024

Hello @marclaporte, @kroky, @josaphatim , I think that this PL is ready at this level, and as I said previously, the work of migrating to bootstrap 5 and improving the UI will be continuous work, so merging this one will allow other person who works on UI/UX to start with a new bootstrap5 base, and that will save me too many conflicts every time I try to be in sync with the master.

@kroky
Copy link
Member

kroky commented Feb 7, 2024

Alright, merging this and we will resolve further issues with different PRs...

@kroky kroky merged commit 94235eb into cypht-org:master Feb 7, 2024
@marclaporte
Copy link
Member

Bootswatch is coming: #921

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.

4 participants