Skip to content

Bump Primer to 0.90.1, Octicons to 19.36.0 #24456

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.

Sign up for GitHub

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

Merged
myabc merged 4 commits into from
Jul 29, 2026
Merged

Bump Primer to 0.90.1, Octicons to 19.36.0 #24456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da66190
Bump Primer to 0.90.1, Octicons to 19.36.0
myabc Jul 27, 2026
0e58e25
Remove pending example from RichTextArea form spec
myabc Jul 27, 2026
319d4b5
Click the collapsible header's toggle button
myabc Jul 28, 2026
aa54da8
Fix alignment of drag handle and action menu within collapsable heade…
HDinger Jul 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ end

# Set cooldown 0 for our own gems
source "https://rubygems.org", cooldown: 0 do
gem "openproject-octicons", "~>19.35.0"
gem "openproject-octicons_helper", "~>19.35.0"
gem "openproject-primer_view_components", "~>0.89.2"
gem "openproject-octicons", "~>19.36.0"
gem "openproject-octicons_helper", "~>19.36.0"
gem "openproject-primer_view_components", "~>0.90.1"
end
22 changes: 11 additions & 11 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -899,15 +899,15 @@ GEM
validate_email
validate_url
webfinger (~> 2.0)
openproject-octicons (19.35.0)
openproject-octicons_helper (19.35.0)
openproject-octicons (19.36.0)
openproject-octicons_helper (19.36.0)
actionview
openproject-octicons (= 19.35.0)
openproject-octicons (= 19.36.0)
railties
openproject-primer_view_components (0.89.2)
openproject-primer_view_components (0.90.1)
actionview (>= 7.2.0)
activesupport (>= 7.2.0)
openproject-octicons (>= 19.34.0)
openproject-octicons (>= 19.36.0)
view_component (>= 3.1, < 5.0)
openproject-token (8.12.0)
activemodel
Expand Down Expand Up @@ -1676,10 +1676,10 @@ DEPENDENCIES
openproject-ldap_departments!
openproject-ldap_groups!
openproject-meeting!
openproject-octicons (~> 19.35.0)!
openproject-octicons_helper (~> 19.35.0)!
openproject-octicons (~> 19.36.0)!
openproject-octicons_helper (~> 19.36.0)!
openproject-openid_connect!
openproject-primer_view_components (~> 0.89.2)!
openproject-primer_view_components (~> 0.90.1)!
openproject-recaptcha!
openproject-reporting!
openproject-resource_management!
Expand Down Expand Up @@ -2054,10 +2054,10 @@ CHECKSUMS
openproject-ldap_departments (1.0.0)
openproject-ldap_groups (1.0.0)
openproject-meeting (1.0.0)
openproject-octicons (19.35.0) sha256=a5033550d0961b4a8cb0993512a899716d633e17c2b5147bc6a9ed74f3952b38
openproject-octicons_helper (19.35.0) sha256=c32d142a4bb7fda739b16768aa8846fd88ffc1750509d8056f516056e8767361
openproject-octicons (19.36.0) sha256=7a1beef93d3d93df0c4c68de3708be481ce3d8a7c9f56c72a94d17d150559792
openproject-octicons_helper (19.36.0) sha256=e4c737107fec97d2c1511a84aa7d351327a33fdb4afbe150600fc5c1caf7c3c2
openproject-openid_connect (1.0.0)
openproject-primer_view_components (0.89.2) sha256=e5a5afdfb42f0a78845c4fe22efb3df36275ec7cb1c33d83f89e35592b569f3c
openproject-primer_view_components (0.90.1) sha256=50ba1e55e5e4893383a86a2f3f8e68162ecf07fa01857265ff9fabda030d3f63
openproject-recaptcha (1.0.0)
openproject-reporting (1.0.0)
openproject-resource_management (1.0.0)
Expand Down
5 changes: 2 additions & 3 deletions app/components/open_project/common/border_box_list_component.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,9 @@
margin-left: calc(-1 * var(--stack-padding-normal))
&.op-border-box-list-header_collapsible
grid-template-areas: "drag_handle heading actions menu"

&--drag_handle
align-self: stretch
align-self: center
cursor: grab
color: var(--fgColor-muted)
justify-self: center
Expand All @@ -128,8 +129,6 @@
&--menu
margin-left: var(--stack-gap-normal)
align-self: flex-start
// Unfortunately, the invisible button style bites us here again.
margin-top: -6px

&--heading-line
display: flex
Expand Down
28 changes: 14 additions & 14 deletions frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,14 @@
"@ng-select/ng-option-highlight": "^23.2.0",
"@ng-select/ng-select": "^23.2.0",
"@ngneat/content-loader": "^7.0.0",
"@openproject/octicons-angular": "^19.35.0",
"@openproject/primer-view-components": "^0.89.2",
"@openproject/octicons-angular": "^19.36.0",
"@openproject/primer-view-components": "^0.90.1",
"@openproject/reactivestates": "^3.0.1",
"@openproject/stimulus-elements": "^0.2.0",
"@primer/css": "^22.1.0",
"@primer/live-region-element": "^0.8.0",
"@primer/primitives": "^11.5.1",
"@primer/view-components": "npm:@openproject/primer-view-components@^0.89.2",
"@primer/view-components": "npm:@openproject/primer-view-components@^0.90.1",
"@rails/request.js": "^0.0.13",
"@stimulus-components/auto-submit": "^6.0.0",
"@stimulus-components/reveal": "^5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion modules/backlogs/app/components/backlogs/inbox_component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ See COPYRIGHT and LICENSE files for more details.
interactive: true,
scheme: :transparent,
padding: :condensed,
header_padding: :default,
header_padding: :condensed,
test_selector: "backlog-inbox",
data: {
controller: "sortable-lists--list",
Expand Down
2 changes: 1 addition & 1 deletion modules/backlogs/app/components/backlogs/work_package_card_list_component.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def initialize(

@system_arguments = system_arguments
@system_arguments[:padding] = :condensed
@system_arguments[:header_padding] = :default
@system_arguments[:header_padding] = :condensed
merge_drag_and_drop_data! if drag_and_drop

@list = OpenProject::Common::BorderBoxListComponent.new(
Expand Down
4 changes: 2 additions & 2 deletions modules/backlogs/spec/components/backlogs/work_package_card_list_component_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@ def render_component(work_packages:, container:, drag_and_drop:)
expect(rendered_component).to have_css(".Box-header")
end

it "keeps condensed row padding with spacious header padding" do
it "keeps condensed row and header padding" do
expect(rendered_component).to have_css(
".Box.Box--condensed.op-border-box-list_header-padding-default"
".Box.Box--condensed.op-border-box-list_header-padding-condensed"
)
end

Expand Down
6 changes: 4 additions & 2 deletions spec/features/types/creation_wizard_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@
def start_wizard
visit types_path

# The type's group is collapsed by default, hiding its "Add sub-type" footer link.
find("[role='button'][aria-expanded='false']", text: bug_type.name).click
# The type's group is collapsed by default, hiding its "Add variant" footer link.
find(".CollapsibleHeader", text: bug_type.name)
.find(:button, aria: { expanded: false })
.click
click_on I18n.t("types.index.add_subtype", name: bug_type.name)
end

Expand Down
6 changes: 1 addition & 5 deletions spec/lib/primer/open_project/forms/rich_text_area_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@ def render_form
let(:params) { { scope_id_to_model: false, rich_text_options: {} } }

it "renders the label" do
pending "Primer Forms render incorrect label `for` value: primer/view_components#3695"

expect(rendered_form).to have_element :label, for: "ultimate_answer"
end

Expand Down Expand Up @@ -110,9 +108,7 @@ def render_form
let(:params) { { scope_id_to_model: false, rich_text_options: {} } }

it "renders the label" do
pending "Primer Forms render incorrect label `for` value: primer/view_components#3695"

expect(rendered_form).to have_element :label, for: "ultimate_answer"
expect(rendered_form).to have_element :label, for: "super_form_ultimate_answer"
end

it "renders the hidden textarea" do
Expand Down
Loading