Skip to content

Commit

Permalink
Merge pull request #16183 from opf/bug/56337-small-octicon-changes-re…
Browse files Browse the repository at this point in the history
…quired

[56337] Small Octicon changes required
  • Loading branch information
aaron-contreras authored Jul 18, 2024
2 parents d88c6f5 + 02cba5a commit 5049c84
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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!
Expand Down
6 changes: 3 additions & 3 deletions config/initializers/menus.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 },
Expand Down Expand Up @@ -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" },
Expand Down
14 changes: 7 additions & 7 deletions frontend/package-lock.json

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

2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 5049c84

Please sign in to comment.