Skip to content

Commit

Permalink
Merge pull request #848 from momocus/pr/markuplint-4.11.4
Browse files Browse the repository at this point in the history
Markuplintを4.11.4にアップデートした
  • Loading branch information
momocus authored Jan 19, 2025
2 parents cf84d5c + 00a81b2 commit ac3dd38
Show file tree
Hide file tree
Showing 3 changed files with 216 additions and 504 deletions.
11 changes: 9 additions & 2 deletions app/views/layouts/_header.html.erb
Original file line number Diff line number Diff line change
@@ -1,31 +1,37 @@
<header>
<nav class="navbar navbar-dark bg-dark">
<nav class="navbar bg-dark" data-bs-theme="dark">
<div class="container-xxl">
<%# ロゴ %>
<%= link_to(
sanitize("#{image_tag('choko.svg', class: 'sakazuki-header-logo')}SAKAZUKI", tag: %w[img]),
root_path,
{ class: "navbar-brand d-flex align-items-center" },
) %>

<%# ハンバーガーメニューボタン %>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav" data-testid="navigation_list">
<%# お品書き %>
<li class="nav-item">
<%= link_to(t(".sake_menu"), menu_sakes_path, class: "nav-link", data: { testid: "sake-menu" }) %>
</li>
<span class="border-bottom border-secondary"></span>
<% if user_signed_in? %>
<%# ユーザーリンク %>
<li class="nav-item" data-testid="user-edit">
<%= link_to(current_user.email, edit_user_registration_path, class: "nav-link", data: { testid: "edit_user" }) %>
</li>
<% if current_user.admin %>
<%# 招待メール %>
<li class="nav-item">
<%= link_to(t(".invitation"), new_user_invitation_path, class: "nav-link", data: { testid: "invitation" }) %>
</li>
<% end %>
<%# ログアウト %>
<li class="nav-item">
<%= link_to(
t(".sign_out"),
Expand All @@ -38,6 +44,7 @@
) %>
</li>
<% else %>
<%# ログイン %>
<li class="nav-item">
<%= link_to(t(".sign_in"), new_user_session_path, class: "nav-link", data: { testid: "sign_in" }) %>
</li>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"eslint-plugin-jsdoc": ">=46.10.1 <47",
"eslint-plugin-tsdoc": ">=0.2.17 <1",
"markdownlint-cli": ">=0.38.0 <1",
"markuplint": ">=4.1.1 <5",
"markuplint": ">=4.11.4 <5",
"prettier": ">=3.1.1 <4",
"stylelint": ">=16.10.0 <17",
"stylelint-config-standard": ">=36.0.0 <37",
Expand Down
Loading

0 comments on commit ac3dd38

Please sign in to comment.