diff --git a/Gemfile b/Gemfile index b20184f64c22..235aa53c4176 100644 --- a/Gemfile +++ b/Gemfile @@ -390,6 +390,6 @@ gemfiles.each do |file| send(:eval_gemfile, file) if File.readable?(file) end -gem "openproject-octicons", "~>19.15.0" -gem "openproject-octicons_helper", "~>19.15.0" +gem "openproject-octicons", "~>19.16.0" +gem "openproject-octicons_helper", "~>19.16.0" gem "openproject-primer_view_components", "~>0.37.1" diff --git a/Gemfile.lock b/Gemfile.lock index e671a310e54d..c133138429a3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -772,10 +772,10 @@ GEM validate_email validate_url webfinger (~> 2.0) - openproject-octicons (19.15.0) - openproject-octicons_helper (19.15.0) + openproject-octicons (19.16.0) + openproject-octicons_helper (19.16.0) actionview - openproject-octicons (= 19.15.0) + openproject-octicons (= 19.16.0) railties openproject-primer_view_components (0.37.1) actionview (>= 5.0.0) @@ -1264,8 +1264,8 @@ DEPENDENCIES openproject-job_status! openproject-ldap_groups! openproject-meeting! - openproject-octicons (~> 19.15.0) - openproject-octicons_helper (~> 19.15.0) + openproject-octicons (~> 19.16.0) + openproject-octicons_helper (~> 19.16.0) openproject-openid_connect! openproject-primer_view_components (~> 0.37.1) openproject-recaptcha! diff --git a/config/initializers/menus.rb b/config/initializers/menus.rb index b3d128a4e06e..ca7eceaa24ba 100644 --- a/config/initializers/menus.rb +++ b/config/initializers/menus.rb @@ -49,7 +49,7 @@ { controller: "/work_packages", project_id: nil, state: nil, action: "index" }, context: :modules, caption: I18n.t("label_work_package_plural"), - icon: "op-work-packages", + icon: "op-view-list", if: Proc.new { (User.current.logged? || !Setting.login_required?) && User.current.allowed_in_any_work_package?(:view_work_packages) @@ -529,7 +529,7 @@ { controller: "/admin/settings", action: "show_plugin", id: :costs }, if: Proc.new { User.current.admin? }, caption: :project_module_costs, - icon: "op-budget" + icon: "op-cost-reports" menu.push :costs_setting, { controller: "/admin/settings", action: "show_plugin", id: :costs }, @@ -565,7 +565,7 @@ menu.push :roadmap, { controller: "/versions", action: "index" }, if: Proc.new { |p| p.shared_versions.any? }, - icon: "project-roadmap" + icon: "milestone" menu.push :work_packages, { controller: "/work_packages", action: "index" }, diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 832e00af8a22..0efd337d6fde 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -46,7 +46,7 @@ "@ng-select/ng-select": "^13.2.0", "@ngneat/content-loader": "^7.0.0", "@ngx-formly/core": "^6.1.4", - "@openproject/octicons-angular": "^19.15.0", + "@openproject/octicons-angular": "^19.16.0", "@openproject/primer-view-components": "^0.37.1", "@openproject/reactivestates": "^3.0.1", "@primer/css": "^21.3.3", @@ -4802,9 +4802,9 @@ "integrity": "sha512-jrqoTI8lk5UziDsDPJ2Y+nmXYCcRhmr6uMARr3v/W6AMxRgsnRLWJyWKYr6FjaGMgbyxXG+OkCUPQY4Xl3toGg==" }, "node_modules/@openproject/octicons-angular": { - "version": "19.15.0", - "resolved": "https://registry.npmjs.org/@openproject/octicons-angular/-/octicons-angular-19.15.0.tgz", - "integrity": "sha512-prW3KwqdIw9A95m7t0Mxh6WAnxDZ18DdfV/bZ5VqQFlwPdcVSxtLgv17ukmIIPQxPIRwhx6Ci2MODcoWjjDfKA==", + "version": "19.16.0", + "resolved": "https://registry.npmjs.org/@openproject/octicons-angular/-/octicons-angular-19.16.0.tgz", + "integrity": "sha512-714l3hIewPEq4OO8X0OruCw+SsIAJHeh/PO17WsAhO/o23O8QWpsbbaYAUnksIUf0XfA6rBdqIBcPIZtwwU42g==", "dependencies": { "tslib": "^2.3.0" }, @@ -25344,9 +25344,9 @@ "integrity": "sha512-jrqoTI8lk5UziDsDPJ2Y+nmXYCcRhmr6uMARr3v/W6AMxRgsnRLWJyWKYr6FjaGMgbyxXG+OkCUPQY4Xl3toGg==" }, "@openproject/octicons-angular": { - "version": "19.15.0", - "resolved": "https://registry.npmjs.org/@openproject/octicons-angular/-/octicons-angular-19.15.0.tgz", - "integrity": "sha512-prW3KwqdIw9A95m7t0Mxh6WAnxDZ18DdfV/bZ5VqQFlwPdcVSxtLgv17ukmIIPQxPIRwhx6Ci2MODcoWjjDfKA==", + "version": "19.16.0", + "resolved": "https://registry.npmjs.org/@openproject/octicons-angular/-/octicons-angular-19.16.0.tgz", + "integrity": "sha512-714l3hIewPEq4OO8X0OruCw+SsIAJHeh/PO17WsAhO/o23O8QWpsbbaYAUnksIUf0XfA6rBdqIBcPIZtwwU42g==", "requires": { "tslib": "^2.3.0" } diff --git a/frontend/package.json b/frontend/package.json index 970c0aaece4f..ecb5722d15e8 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -97,7 +97,7 @@ "@ng-select/ng-select": "^13.2.0", "@ngneat/content-loader": "^7.0.0", "@ngx-formly/core": "^6.1.4", - "@openproject/octicons-angular": "^19.15.0", + "@openproject/octicons-angular": "^19.16.0", "@openproject/primer-view-components": "^0.37.1", "@openproject/reactivestates": "^3.0.1", "@primer/css": "^21.3.3",