Commit 4a8bd9fa authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Some tweaks to new sidebar

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 22479fd0
...@@ -33,11 +33,15 @@ ...@@ -33,11 +33,15 @@
background: $color; background: $color;
} }
.complex-sidebar .nav-primary {
border-right: 1px solid lighten($color, 3%);
}
.sidebar-wrapper { .sidebar-wrapper {
background: $color-darker; background: $color-darker;
.sidebar-user { .sidebar-user {
border-top: 1px solid $color; border-top: 1px solid lighten($color, 3%);
background: $color-darker; background: $color-darker;
color: $color-light; color: $color-light;
......
...@@ -296,7 +296,6 @@ ...@@ -296,7 +296,6 @@
.nav-primary { .nav-primary {
width: 61px; width: 61px;
float: left; float: left;
border-right: 1px solid rgba(255, 255, 255, 0.1);
height: 100vh; height: 100vh;
.nav-sidebar { .nav-sidebar {
...@@ -313,17 +312,23 @@ ...@@ -313,17 +312,23 @@
} }
.nav-secondary { .nav-secondary {
$nav-secondary-width: 168px;
float: left; float: left;
width: 168px; width: $nav-secondary-width;
.nav-sidebar { .nav-sidebar {
width: 168px; width: $nav-secondary-width;
li a { li {
width: 168px; width: $nav-secondary-width;
i { a {
display: none; width: $nav-secondary-width;
i {
display: none;
}
} }
} }
} }
......
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
Spam Logs Spam Logs
%span.count= number_with_delimiter(SpamLog.count(:all)) %span.count= number_with_delimiter(SpamLog.count(:all))
= nav_link(controller: :application_settings, html_options: { class: 'separate-item'}) do = nav_link(controller: :application_settings) do
= link_to admin_application_settings_path, title: 'Settings' do = link_to admin_application_settings_path, title: 'Settings' do
= icon('cogs fw') = icon('cogs fw')
%span %span
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
%span %span
Members Members
- if can?(current_user, :admin_group, @group) - if can?(current_user, :admin_group, @group)
= nav_link(html_options: { class: "" }) do = nav_link do
= link_to edit_group_path(@group), title: 'Settings' do = link_to edit_group_path(@group), title: 'Settings' do
= icon ('cogs fw') = icon ('cogs fw')
%span %span
......
%ul.nav.nav-sidebar %ul.nav.nav-sidebar
= nav_link do
= link_to root_path, title: 'Go to dashboard', class: 'back-link' do
= icon('caret-square-o-left fw')
%span
Go to dashboard
%li.separate-item
= nav_link(path: 'profiles#show', html_options: {class: 'home'}) do = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
= link_to profile_path, title: 'Profile Settings' do = link_to profile_path, title: 'Profile Settings' do
= icon('user fw') = icon('user fw')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment