sass navbar

79ec7a7a · pabois · 2f9ba7a0 · 79ec7a7a · 79ec7a7a · 79ec7a7a
Commit 79ec7a7a authored 3 years ago by pabois
--- a/app/assets/stylesheets/admin/appstack.sass
+++ b/app/assets/stylesheets/admin/appstack.sass
 main.content
    padding-bottom: 65px

+.sidebar.collapsed + .footer.fixed
+    left: 0
+    transition: left .35s ease-in-out
+
 .footer.fixed
    bottom: 0
    left: 260px
    padding: .5rem
    position: fixed
    right: 0
+    z-index: 1

 table.table-striped
    tbody

--- a/app/controllers/server/application_controller.rb
+++ b/app/controllers/server/application_controller.rb
 class Server::ApplicationController < ApplicationController
-  layout 'server/layouts/application'
+  layout 'admin/layouts/application'

  before_action :authenticate_user!, :ensure_user_if_server_admin


--- a/app/views/admin/layouts/application.html.erb
+++ b/app/views/admin/layouts/application.html.erb
@@ -26,6 +26,7 @@
    </div>
    <div class="wrapper">
      <%= render 'admin/application/nav' %>
+      <%= render 'admin/application/footer' %>
      <div class="main">
        <%= render 'admin/application/top' %>
        <main class="content">
@@ -37,7 +38,6 @@
            <%= yield %>
          </div>
        </main>
-        <%= render 'admin/application/footer' %>
      </div>
    </div>
    <%= javascript_include_tag 'admin' %>

--- a/app/views/server/languages/_form.html.erb
+++ b/app/views/server/languages/_form.html.erb
@@ -8,7 +8,7 @@
    </div>
  </div>

-  <% content_for :buttons do %>
+  <% content_for :action_bar_right do %>
    <%= submit f %>
  <% end %>
 <% end %>
--- a/app/views/server/languages/show.html.erb
+++ b/app/views/server/languages/show.html.erb
@@ -5,6 +5,6 @@
  <%= @language.iso_code %>
 </p>

-<% content_for :buttons do %>
+<% content_for :action_bar_right do %>
  <%= link_to t('edit'), edit_server_language_path(@language), class: button_classes %>
 <% end %>
--- a/app/views/server/layouts/application.html.erb
+++ b/app/views/server/layouts/application.html.erb
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title><%= content_for?(:title) ? raw("#{yield(:title)} ∙ Osuny")
-                                    : 'Osuny' %></title>
-    <%= csrf_meta_tags %>
-    <%= csp_meta_tag %>
-  	<link href="https://fonts.googleapis.com/css2?family=Poppins:wght@300;400;500&display=swap" rel="stylesheet">
-    <%= stylesheet_link_tag 'admin', media: 'all' %>
-    <%= favicon_link_tag 'favicon.png' %>
-  </head>
-
-  <body data-theme="default" data-layout="fluid" data-sidebar-position="left" data-sidebar-behavior="sticky">
-    <div class="wrapper">
-      <nav id="sidebar" class="sidebar">
-        <div class="sidebar-content js-simplebar">
-          <%= link_to server_root_path, class: 'sidebar-brand' do %>
-            <%= image_tag 'osuny-white.svg', class: 'img-fluid' %>
-          <% end %>
-          <%= render_navigation context: :server %>
-        </div>
-      </nav>
-      <div class="main">
-        <%= render 'admin/application/top' %>
-        <main class="content">
-          <div class="container-fluid p-0">
-            <h1><%= yield :title %></h1>
-            <%= yield %>
-          </div>
-        </main>
-        <%= render 'admin/application/footer' %>
-      </div>
-    </div>
-    <%= javascript_include_tag 'admin' %>
-  </body>
-</html>