Merge branch 'feature/view-column' into develop

x1wins · Jun 12, 2021 · 780333b · 780333b
2 parents 41200ab + 15e4c0e
commit 780333b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 30 deletions.
diff --git a/app/views/layouts/_breadcrumb.html.erb b/app/views/layouts/_breadcrumb.html.erb
@@ -5,9 +5,13 @@
  controller_index_path = '#'
  end
 %>
- <nav class="breadcrumb is-large" aria-label="breadcrumbs">
- <ul>
- <li><%= link_to controller_name.classify, controller_index_path %> </li>
- <li class="is-active"><a href="#" aria-current="page"><%= action_name %></a></li>
- </ul>
- </nav>
+<div class="columns">
+ <div class="column">
+ <nav class="breadcrumb is-large" aria-label="breadcrumbs">
+ <ul>
+ <li><%= link_to controller_name.classify, controller_index_path %> </li>
+ <li class="is-active"><a href="#" aria-current="page"><%= action_name %></a></li>
+ </ul>
+ </nav>
+ </div>
+</div>
diff --git a/app/views/layouts/_notice.html.erb b/app/views/layouts/_notice.html.erb
@@ -1,6 +1,6 @@
 <% if notice.present? %>
- <p class="notification is-success">
-  <button class="delete"></button>
-  <%= notice %>
- </p>
+<p class="notification is-success">
+ <button class="delete"></button>
+ <%= notice %>
+</p>
 <% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -17,26 +17,8 @@
  </div>
  </header>
  <div class="section">
- <div class="columns">
- <div class="column">
- <%= render "layouts/notice" %>
- </div>
- </div>
- <div class="columns">
- <div class="column">
- <%= render "layouts/breadcrumb", controller_name: controller_name, action_name: controller.action_name.capitalize %>
- </div>
- </div>
- <% if notice.present? %>
- <div class="columns">
- <div class="column is-full">
- <p class="notification">
- <button class="delete"></button>
- <%= notice %>
- </p>
- </div>
- </div>
- <% end %>
+ <%= render "layouts/notice" %>
+ <%= render "layouts/breadcrumb", controller_name: controller_name, action_name: controller.action_name.capitalize %>
  <div class="columns">
  <div class="column is-full">
  <%= yield %>