From 2a409ace646df956204daf32f25fa2529cfd4f83 Mon Sep 17 00:00:00 2001 From: Joseph Cohen Date: Sun, 22 Feb 2015 21:54:52 -0600 Subject: [PATCH] Added dropdown account settings and fix jumping active --- app/assets/sass/partials/_sidebar.scss | 19 +++++++++++----- .../partials/dashboard/sidebar.blade.php | 22 +++++++++++-------- .../{all-3929b4f6.css => all-f4dd3c69.css} | 2 +- public/build/dist/js/all-38248441.js | 11 ++++++++++ public/build/dist/js/all-3f815dae.js | 13 ----------- public/build/rev-manifest.json | 4 ++-- 6 files changed, 41 insertions(+), 30 deletions(-) rename public/build/dist/css/{all-3929b4f6.css => all-f4dd3c69.css} (92%) create mode 100644 public/build/dist/js/all-38248441.js delete mode 100644 public/build/dist/js/all-3f815dae.js diff --git a/app/assets/sass/partials/_sidebar.scss b/app/assets/sass/partials/_sidebar.scss index 365b74d0..9e0cf5b2 100644 --- a/app/assets/sass/partials/_sidebar.scss +++ b/app/assets/sass/partials/_sidebar.scss @@ -23,13 +23,20 @@ body.dashboard { list-style: none; .profile { - padding: 20px; + padding: 20px 10px; margin-bottom: 0; + .dropdown-toggle { + text-decoration: none; + } + .dropdown-menu { + top: 108%; + } .avatar { - width: 70px; + width: 60px; + margin-right: 10px; img { border-radius: 50%; - width: 60px; + width: 50px; } } .profile { @@ -56,9 +63,11 @@ body.dashboard { } &.active { background: lighten($sidebar-background-color, 2%); - border-top: 1px solid #BED3EA; - border-bottom: 1px solid #BED3EA; a { + padding-top: 14px; + padding-bottom: 14px; + border-top: 1px solid #BED3EA; + border-bottom: 1px solid #BED3EA; color: $sidebar-text-active-color; } } diff --git a/app/views/partials/dashboard/sidebar.blade.php b/app/views/partials/dashboard/sidebar.blade.php index dc222a2b..e1f92a52 100644 --- a/app/views/partials/dashboard/sidebar.blade.php +++ b/app/views/partials/dashboard/sidebar.blade.php @@ -3,16 +3,20 @@