Merge branch 'feature/view-notice' into develop

# Conflicts: # app/views/layouts/application.html.erb
x1wins · Jun 12, 2021 · 41200ab · 41200ab
2 parents e7f5c41 + 36c3367
commit 41200ab
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/app/views/layouts/_notice.html.erb b/app/views/layouts/_notice.html.erb
@@ -0,0 +1,6 @@
+<% if notice.present? %>
+  <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,6 +17,11 @@
         </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 %>