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

Fix content blocks #2423

Merged
merged 5 commits into from
Jan 22, 2025
Merged

Fix content blocks #2423

merged 5 commits into from
Jan 22, 2025

Conversation

laritakr
Copy link
Collaborator

@laritakr laritakr commented Jan 21, 2025

Refs:
#2417
notch8/palni_palci_knapsack#172

Restore text color in dropdown menus: fix got lost during a merge conflict patch.
Restore facet border color but in the right location (removed #2420 due to double border)
Fixes appearance of content blocks form by removing duplicate tabs, adding appropriate classes, and adding translations.

Screenshots

Dropdown menu text now matches link text color

Screenshot 2025-01-21 at 3 54 29 PM

Facet border color once again based on a darker version of facet background color rather than bootstrap default

An exception is the cultural theme
Screenshot 2025-01-22 at 1 59 05 PM

Fixes content blocks form

Screenshot 2025-01-22 at 4 47 33 PM

@laritakr laritakr added the patch-ver for release notes label Jan 21, 2025
@laritakr laritakr marked this pull request as draft January 21, 2025 21:00
Copy link

github-actions bot commented Jan 21, 2025

Test Results

    3 files  ±0      3 suites  ±0   17m 50s ⏱️ -3s
2 055 tests ±0  1 999 ✅ ±0  56 💤 ±0  0 ❌ ±0 
2 082 runs  ±0  2 024 ✅ ±0  58 💤 ±0  0 ❌ ±0 

Results for commit 11bd59b. ± Comparison against base commit 984c237.

This pull request removes 42 and adds 42 tests. Note that renamed tests count towards both.
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to destroy fcd98a7c-4fdd-443e-af0f-482d926ac286
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to edit 7b6d7b0b-009e-4ded-8df1-0274d818855f
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to read 1a5805bb-6034-473b-a132-ae017f945519
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to update 2601f71f-14bb-4d56-bf7e-ec8e4477cb64
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor FileSet permissions is expected not to be able to destroy e651257e-d023-4850-840a-bf899164cccf
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor FileSet permissions is expected not to be able to edit e1af1f1c-2292-4bc2-9f25-91291557b438
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor FileSet permissions is expected not to be able to read 17c54763-bc6e-4546-b944-3f016d2c7c75
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor FileSet permissions is expected not to be able to update 366a1f0c-39d2-40e1-8aef-28bb1ea5f20a
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor GenericWork permissions is expected not to be able to destroy 8cac715a-e694-4e72-b9b8-bd44dbc026f4
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor GenericWork permissions is expected not to be able to edit 7e441a04-b522-4e96-99ba-fc63c7e5a940
…
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to destroy a13a169d-e85d-4d93-92ff-d059ff4eb1bf
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to edit fa311d70-87ff-4984-b5f1-309479c9e403
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to read 4be21ff0-1e9e-400f-be92-6c25501ad672
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to update 0c6dd12e-51ee-4e3f-a966-d89aa4da55f2
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor FileSet permissions is expected not to be able to destroy 44681838-00e4-4b4b-8fd8-d0834d5b462d
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor FileSet permissions is expected not to be able to edit ad6ad8c2-ad9e-4182-b284-c2a2aca95e4d
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor FileSet permissions is expected not to be able to read 15b6d805-2c6d-4286-9f70-6fe3fec10fb4
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor FileSet permissions is expected not to be able to update ad1a7e03-b13c-4efd-9c1d-b68f5a105c22
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor GenericWork permissions is expected not to be able to destroy f5ab6ed1-edc6-4636-929c-fd43de7736e6
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor GenericWork permissions is expected not to be able to edit ffcf6216-ee42-45ec-83ce-3c9b3a488551
…

♻️ This comment has been updated with latest results.

@laritakr laritakr changed the title Fix dropdown menu text color Fix a few color settings Jan 22, 2025
Removes duplicated tabs.
Adds appropriate classes.
Adds missing translations.
@laritakr laritakr changed the title Fix a few color settings Fix content blocks Jan 22, 2025
@laritakr laritakr marked this pull request as ready for review January 22, 2025 21:49
kirkkwang
kirkkwang previously approved these changes Jan 22, 2025
Copy link
Collaborator

@kirkkwang kirkkwang left a comment

Choose a reason for hiding this comment

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

great work!

The spec mistakenly used the wrong count expectation, due to duplicate
content block form tabs which are now removed.
@laritakr laritakr merged commit 8dc2077 into main Jan 22, 2025
8 checks passed
@laritakr laritakr deleted the fix-dropdown-color-again branch January 22, 2025 23:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
patch-ver for release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants