Skip to content
This repository was archived by the owner on Feb 7, 2025. It is now read-only.

Commit faed499

Browse files
committed
Update bootstrap to 4.2 and fix js dropdown error
twbs/bootstrap#27903
1 parent 4506eb3 commit faed499

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

app/views/shared/_navbar.html.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
</li>
2929

3030
<li class="nav-item dropdown">
31-
<%= link_to "#", id: "navbar-dropdown", class: "nav-link dropdown-toggle", data: { toggle: "dropdown" }, aria: { haspopup: true, expanded: false } do %>
31+
<%= link_to "#", id: "navbar-dropdown", class: "nav-link dropdown-toggle", data: { target: "nav-account-dropdown", toggle: "dropdown" }, aria: { haspopup: true, expanded: false } do %>
3232
<%= image_tag gravatar_image_url(current_user.email, size: 40), height: 20, width: 20, class: "rounded" %>
3333
<% end %>
34-
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbar-dropdown">
34+
<div id="nav-account-dropdown" class="dropdown-menu dropdown-menu-right" aria-labelledby="navbar-dropdown">
3535
<% if current_user.admin? %>
3636
<%= link_to "Admin Area", admin_root_path, class: "dropdown-item" %>
3737
<% end %>

template.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ def add_template_repository_to_source_path
2727

2828
def add_gems
2929
gem 'administrate', '~> 0.10.0'
30-
gem 'bootstrap', '~> 4.1', '>= 4.1.1'
30+
gem 'bootstrap', '~> 4.2', '>= 4.2.1'
3131
gem 'data-confirm-modal', '~> 1.6', '>= 1.6.2'
3232
gem 'devise', '~> 4.4', '>= 4.4.3'
3333
gem 'devise-bootstrapped', github: 'excid3/devise-bootstrapped', branch: 'bootstrap4'
3434
gem 'devise_masquerade', '~> 0.6.2'
35-
gem 'font-awesome-sass', '~> 5.5', '>= 5.5.0.1'
35+
gem 'font-awesome-sass', '~> 5.5', '>= 5.5.0.1'
3636
gem 'foreman', '~> 0.84.0'
3737
gem 'friendly_id', '~> 5.2', '>= 5.2.4'
3838
gem 'gravatar_image_tag', github: 'mdeering/gravatar_image_tag'

0 commit comments

Comments
 (0)