6 files changed, 55 insertions, 70 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 25b3b5b49..868944a21 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -8,5 +8,4 @@
     = csrf_meta_tags
     = yield :header_tags
   %body
-    .container
-      = content_for?(:content) ? yield(:content) : yield
+    = content_for?(:content) ? yield(:content) : yield
diff --git a/app/views/layouts/auth.html.haml b/app/views/layouts/auth.html.haml
index 8a2c8fa74..bddba570a 100644
--- a/app/views/layouts/auth.html.haml
+++ b/app/views/layouts/auth.html.haml
@@ -1,11 +1,12 @@
 - content_for :content do
-  .logo-container
-    %h1
-      = link_to root_path do
-        = render partial: 'application/logo', locals: { dim: 200 }
-        %small= Rails.configuration.x.local_domain
+  .container
+    .logo-container
+      %h1
+        = link_to root_path do
+          = render partial: 'application/logo', locals: { dim: 200 }
+          %small= Rails.configuration.x.local_domain
 
-  .form-container
-    = yield
+    .form-container
+      = yield
 
 = render template: "layouts/application"
diff --git a/app/views/layouts/dashboard.html.haml b/app/views/layouts/dashboard.html.haml
new file mode 100644
index 000000000..128bf8db9
--- /dev/null
+++ b/app/views/layouts/dashboard.html.haml
@@ -0,0 +1,45 @@
+- content_for :content do
+  .dashboard-wrapper
+    .dashboard__sidebar
+      .dashboard__top-bar.alternate
+        &nbsp;
+      .dashboard__current-user
+        = link_to account_path(current_user.account) do
+          = image_tag current_user.account.avatar.url(:medium), class: 'dashboard__current-user__avatar'
+          %strong.dashboard__current-user__display-name= current_user.account.display_name
+          %span.dashboard__current-user__username= "@#{current_user.account.username}"
+      %ul
+        %li.active
+          = link_to root_path do
+            = fa_icon 'home'
+            Home
+        %li
+          = link_to mentions_path do
+            = fa_icon 'at'
+            Mentions
+        %li
+          = link_to root_path do
+            = fa_icon 'group'
+            Subscriptions
+        %li
+          = link_to oauth_authorized_applications_path do
+            = fa_icon 'shield'
+            Authorized apps
+        %li
+          = link_to root_path do
+            = fa_icon 'user'
+            Edit profile
+        %li
+          = link_to edit_registration_path(current_user) do
+            = fa_icon 'wrench'
+            Change password
+    .dashboard__content
+      .dashboard__top-bar
+        Home
+        %ul
+          %li= link_to fa_icon('sign-out'), destroy_user_session_path, method: :delete
+      .dashboard__content__content= yield
+  .footer
+    .domain= Rails.configuration.x.local_domain
+
+= render template: "layouts/application"
diff --git a/app/views/layouts/doorkeeper/admin.html.erb b/app/views/layouts/doorkeeper/admin.html.erb
deleted file mode 100644
index 1d1a688a2..000000000
--- a/app/views/layouts/doorkeeper/admin.html.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Doorkeeper</title>
-  <%= stylesheet_link_tag "doorkeeper/admin/application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-<div class="navbar navbar-inverse navbar-static-top" role="navigation">
-  <div class="container-fluid">
-    <div class="navbar-header">
-      <%= link_to t('doorkeeper.layouts.admin.nav.oauth2_provider'), oauth_applications_path, class: 'navbar-brand' %>
-    </div>
-    <ul class="nav navbar-nav">
-      <%= content_tag :li, class: "#{'active' if request.path == oauth_applications_path}" do %>
-        <%= link_to t('doorkeeper.layouts.admin.nav.applications'), oauth_applications_path %>
-      <% end %>
-      <%= content_tag :li do %>
-        <%= link_to 'Home', root_path %>
-      <% end %>
-    </ul>
-  </div>
-</div>
-<div class="container">
-  <%- if flash[:notice].present? %>
-    <div class="alert alert-info">
-      <%= flash[:notice] %>
-    </div>
-  <% end -%>
-
-  <%= yield %>
-</div>
-</body>
-</html>
diff --git a/app/views/layouts/doorkeeper/application.html.erb b/app/views/layouts/doorkeeper/application.html.erb
deleted file mode 100644
index 562005af0..000000000
--- a/app/views/layouts/doorkeeper/application.html.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title><%= t('doorkeeper.layouts.application.title') %></title>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-  <%= stylesheet_link_tag "doorkeeper/application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-<div id="container">
-  <%- if flash[:notice].present? %>
-    <div class="alert alert-info">
-      <%= flash[:notice] %>
-    </div>
-  <% end -%>
-
-  <%= yield %>
-</div>
-</body>
-</html>
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml
index eb3c54f9d..2234df225 100644
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@@ -1,5 +1,5 @@
 - content_for :content do
-  = yield
+  .container= yield
   .footer
     .domain= Rails.configuration.x.local_domain