From a7dd33320e27661b5747a73d903d3a3f0029f8e4 Mon Sep 17 00:00:00 2001 From: Henriette Darge Date: Tue, 10 Sep 2024 10:40:13 +0200 Subject: [PATCH] Bump primer to 0.46.0 --- Gemfile | 2 +- Gemfile.lock | 4 +-- .../index_sub_header_component.html.erb | 2 -- frontend/package-lock.json | 28 +++++++++---------- frontend/package.json | 4 +-- .../src/global_styles/primer/_overrides.sass | 5 ---- 6 files changed, 19 insertions(+), 26 deletions(-) diff --git a/Gemfile b/Gemfile index 0fddf9e836bb..8d4c612cba50 100644 --- a/Gemfile +++ b/Gemfile @@ -398,4 +398,4 @@ end gem "openproject-octicons", "~>19.18.0" gem "openproject-octicons_helper", "~>19.18.0" -gem "openproject-primer_view_components", "~>0.45.0" +gem "openproject-primer_view_components", "~>0.46.0" diff --git a/Gemfile.lock b/Gemfile.lock index 2890548968c1..7f49b5a2e5ff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -803,7 +803,7 @@ GEM actionview openproject-octicons (= 19.18.0) railties - openproject-primer_view_components (0.45.0) + openproject-primer_view_components (0.46.0) actionview (>= 5.0.0) activesupport (>= 5.0.0) openproject-octicons (>= 19.17.0) @@ -1301,7 +1301,7 @@ DEPENDENCIES openproject-octicons (~> 19.18.0) openproject-octicons_helper (~> 19.18.0) openproject-openid_connect! - openproject-primer_view_components (~> 0.45.0) + openproject-primer_view_components (~> 0.46.0) openproject-recaptcha! openproject-reporting! openproject-storages! diff --git a/app/components/projects/index_sub_header_component.html.erb b/app/components/projects/index_sub_header_component.html.erb index b0913bbc70d6..354a7e3b152a 100644 --- a/app/components/projects/index_sub_header_component.html.erb +++ b/app/components/projects/index_sub_header_component.html.erb @@ -8,8 +8,6 @@ icon: :search, size: :small }, - input_width: :medium, - show_clear_button: true, clear_button_id: clear_button_id, data: filter_input_data_attributes) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 9aa8f7c1d671..3277e95d041d 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -47,7 +47,7 @@ "@ngneat/content-loader": "^7.0.0", "@ngx-formly/core": "^6.1.4", "@openproject/octicons-angular": "^19.18.0", - "@openproject/primer-view-components": "^0.45.0", + "@openproject/primer-view-components": "^0.46.0", "@openproject/reactivestates": "^3.0.1", "@primer/css": "^21.3.3", "@types/hotwired__turbo": "^8.0.1", @@ -4819,9 +4819,9 @@ } }, "node_modules/@openproject/primer-view-components": { - "version": "0.45.0", - "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.45.0.tgz", - "integrity": "sha512-lvyFwL9d7RbEQt+IC+TMJWoafqeixBuaniMlhEtGXp6jGzrdaJiug1IIykLR0QC63w8lshRZ3Y2hdpnAeqqK9Q==", + "version": "0.46.0", + "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.46.0.tgz", + "integrity": "sha512-gk0InEfiReZMS2pPvuV0wEXK9eFuJ1o6YxnEDKmlWDxEqnVu3Hr4FJ2VrgSvyoznrs1A7IZvm0cqwjsYMODOlw==", "dependencies": { "@github/auto-check-element": "^5.2.0", "@github/auto-complete-element": "^3.6.2", @@ -4887,9 +4887,9 @@ }, "node_modules/@primer/view-components": { "name": "@openproject/primer-view-components", - "version": "0.45.0", - "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.45.0.tgz", - "integrity": "sha512-lvyFwL9d7RbEQt+IC+TMJWoafqeixBuaniMlhEtGXp6jGzrdaJiug1IIykLR0QC63w8lshRZ3Y2hdpnAeqqK9Q==", + "version": "0.46.0", + "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.46.0.tgz", + "integrity": "sha512-gk0InEfiReZMS2pPvuV0wEXK9eFuJ1o6YxnEDKmlWDxEqnVu3Hr4FJ2VrgSvyoznrs1A7IZvm0cqwjsYMODOlw==", "dependencies": { "@github/auto-check-element": "^5.2.0", "@github/auto-complete-element": "^3.6.2", @@ -25423,9 +25423,9 @@ } }, "@openproject/primer-view-components": { - "version": "0.45.0", - "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.45.0.tgz", - "integrity": "sha512-lvyFwL9d7RbEQt+IC+TMJWoafqeixBuaniMlhEtGXp6jGzrdaJiug1IIykLR0QC63w8lshRZ3Y2hdpnAeqqK9Q==", + "version": "0.46.0", + "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.46.0.tgz", + "integrity": "sha512-gk0InEfiReZMS2pPvuV0wEXK9eFuJ1o6YxnEDKmlWDxEqnVu3Hr4FJ2VrgSvyoznrs1A7IZvm0cqwjsYMODOlw==", "requires": { "@github/auto-check-element": "^5.2.0", "@github/auto-complete-element": "^3.6.2", @@ -25472,7 +25472,7 @@ "integrity": "sha512-h2ITbCj415T1JpWQDeQd1xYL6TrzkehfUOXxnV0FpblYyMsVBAks6LL7HGJ+ZrydG+Ds0i1rvvi8Q61jErieNA==", "requires": { "@primer/primitives": "^8.2.0", - "@primer/view-components": "npm:@openproject/primer-view-components@^0.45.0" + "@primer/view-components": "npm:@openproject/primer-view-components@^0.46.0" } }, "@primer/primitives": { @@ -25481,9 +25481,9 @@ "integrity": "sha512-K8A/DA6xv8P/kD/9DupFn+KYlo06OpcrwfwJf+sKp+KnX7ZRwLLDg1AaEGAoRoaykXRY/gfrXlgDfK7laOTWyA==" }, "@primer/view-components": { - "version": "npm:@openproject/primer-view-components@0.45.0", - "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.45.0.tgz", - "integrity": "sha512-lvyFwL9d7RbEQt+IC+TMJWoafqeixBuaniMlhEtGXp6jGzrdaJiug1IIykLR0QC63w8lshRZ3Y2hdpnAeqqK9Q==", + "version": "npm:@openproject/primer-view-components@0.46.0", + "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.46.0.tgz", + "integrity": "sha512-gk0InEfiReZMS2pPvuV0wEXK9eFuJ1o6YxnEDKmlWDxEqnVu3Hr4FJ2VrgSvyoznrs1A7IZvm0cqwjsYMODOlw==", "requires": { "@github/auto-check-element": "^5.2.0", "@github/auto-complete-element": "^3.6.2", diff --git a/frontend/package.json b/frontend/package.json index ebd4cdcfca7b..91686a2b995c 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -99,7 +99,7 @@ "@ngneat/content-loader": "^7.0.0", "@ngx-formly/core": "^6.1.4", "@openproject/octicons-angular": "^19.18.0", - "@openproject/primer-view-components": "^0.45.0", + "@openproject/primer-view-components": "^0.46.0", "@openproject/reactivestates": "^3.0.1", "@primer/css": "^21.3.3", "@types/hotwired__turbo": "^8.0.1", @@ -176,6 +176,6 @@ "generate-typings": "tsc -d -p src/tsconfig.app.json" }, "overrides": { - "@primer/view-components": "npm:@openproject/primer-view-components@^0.45.0" + "@primer/view-components": "npm:@openproject/primer-view-components@^0.46.0" } } diff --git a/frontend/src/global_styles/primer/_overrides.sass b/frontend/src/global_styles/primer/_overrides.sass index cf3efc8b457b..5c29d24d138f 100644 --- a/frontend/src/global_styles/primer/_overrides.sass +++ b/frontend/src/global_styles/primer/_overrides.sass @@ -81,11 +81,6 @@ sub-header, flex-direction: column row-gap: 1rem -// Todo: Fix this as soon as possible in the primer repo! -.SubHeader-leftPane - [class*="FormControl-input-width--"]:not(.FormControl-input-width--auto) - width: 100vw - .Button.op-app-header--primer-button, .Button.op-app-header--primer-button .Button-visual color: var(--header-item-font-color)