Commit de6360f9 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Improve styling for new complex sidebar

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 03f2dd90
...@@ -63,7 +63,6 @@ ...@@ -63,7 +63,6 @@
.count { .count {
color: $color-light; color: $color-light;
background: $color-dark;
} }
} }
......
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
} }
a { a {
padding: 7px 15px; padding: 7px 12px;
font-size: $gl-font-size; font-size: $gl-font-size;
line-height: 24px; line-height: 24px;
color: $gray; color: $gray;
...@@ -169,10 +169,12 @@ ...@@ -169,10 +169,12 @@
} }
.count { .count {
float: right; &:before {
background: #eee; content: '(';
padding: 0 8px; }
@include border-radius(6px); &:after {
content: ')';
}
} }
&.back-link i { &.back-link i {
...@@ -288,17 +290,14 @@ ...@@ -288,17 +290,14 @@
} }
} }
.page-sidebar-expanded { .complex-sidebar {
.complex-sidebar {
display: inline-block; display: inline-block;
.nav-sidebar {
margin-bottom: 0;
}
.nav-primary { .nav-primary {
width: 60px; width: 61px;
float: left; float: left;
border-right: 1px solid rgba(255, 255, 255, 0.1);
height: 100vh;
.nav-sidebar { .nav-sidebar {
width: 60px; width: 60px;
...@@ -314,8 +313,6 @@ ...@@ -314,8 +313,6 @@
} }
.nav-secondary { .nav-secondary {
padding-bottom: 100px;
border-left: 1px solid rgba(255, 255, 255, 0.1);
float: left; float: left;
width: 168px; width: 168px;
...@@ -331,12 +328,4 @@ ...@@ -331,12 +328,4 @@
} }
} }
} }
}
}
.page-sidebar-collapsed {
.nav-secondary {
display: none;
transition-duration: .3s;
}
} }
.page-with-sidebar{ class: "#{page_sidebar_class} #{page_gutter_class}" } .page-with-sidebar{ class: "#{page_sidebar_class} #{page_gutter_class}" }
= render "layouts/broadcast" = render "layouts/broadcast"
.expand-nav .expand-nav
= link_to icon('bars'), '#', class: 'toggle-nav-collapse', title: "Open/Close" = link_to icon('bars'), '#', class: 'toggle-nav-collapse', title: "Open sidebar"
.sidebar-wrapper.nicescroll{ class: nav_sidebar_class } .sidebar-wrapper.nicescroll{ class: nav_sidebar_class }
.header-logo .header-logo
%a#logo %a#logo
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
= render "layouts/nav/#{primary_sidebar}" = render "layouts/nav/#{primary_sidebar}"
.collapse-nav .collapse-nav
= link_to icon('angle-left'), '#', class: 'toggle-nav-collapse', title: "Open/Close" = link_to icon('angle-left'), '#', class: 'toggle-nav-collapse', title: "Hide sidebar"
- if current_user - if current_user
= link_to current_user, class: 'sidebar-user', title: "Profile" do = link_to current_user, class: 'sidebar-user', title: "Profile" do
= image_tag avatar_icon(current_user, 60), alt: 'Profile', class: 'avatar avatar s36' = image_tag avatar_icon(current_user, 60), alt: 'Profile', class: 'avatar avatar s36'
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
= icon('dashboard fw') = icon('dashboard fw')
%span %span
Activity Activity
= nav_link(controller: :groups) do = nav_link(path: ['groups#index']) do
= link_to dashboard_groups_path, title: 'Groups' do = link_to dashboard_groups_path, title: 'Groups' do
= icon('group fw') = icon('group 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: 'groups#show', html_options: {class: 'home'}) do = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
= link_to group_path(@group), title: 'Home' do = link_to group_path(@group), title: 'Home' do
= icon('group fw') = icon('group fw')
...@@ -42,7 +34,7 @@ ...@@ -42,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: "separate-item" }) do = nav_link(html_options: { class: "" }) 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
......
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