Remove JS flicker on page load; UI tweaks
This commit is contained in:
parent
b12107a0b9
commit
625b0bcfba
|
@ -45,8 +45,10 @@ export default class NewNavSidebar {
|
|||
|
||||
toggleCollapsedSidebar(collapsed) {
|
||||
this.$sidebar.toggleClass('sidebar-icons-only', collapsed);
|
||||
this.$page.toggleClass('page-with-new-sidebar', !collapsed);
|
||||
this.$page.toggleClass('page-with-icon-sidebar', collapsed);
|
||||
if (this.$sidebar.length) {
|
||||
this.$page.toggleClass('page-with-new-sidebar', !collapsed);
|
||||
this.$page.toggleClass('page-with-icon-sidebar', collapsed);
|
||||
}
|
||||
NewNavSidebar.setCollapsedCookie(collapsed);
|
||||
}
|
||||
|
||||
|
|
|
@ -400,6 +400,7 @@ $new-sidebar-collapsed-width: 50px;
|
|||
|
||||
.toggle-sidebar-button {
|
||||
width: $new-sidebar-collapsed-width - 2px;
|
||||
padding: 16px 18px;
|
||||
|
||||
.collapse-text,
|
||||
.fa-angle-double-left {
|
||||
|
|
|
@ -305,4 +305,8 @@ module ApplicationHelper
|
|||
def show_new_nav?
|
||||
cookies["new_nav"] == "true"
|
||||
end
|
||||
|
||||
def collapsed_sidebar?
|
||||
cookies["sidebar_collapsed"] == "true"
|
||||
end
|
||||
end
|
||||
|
|
|
@ -2,6 +2,7 @@ module NavHelper
|
|||
def page_with_sidebar_class
|
||||
class_name = page_gutter_class
|
||||
class_name << 'page-with-new-sidebar' if defined?(@new_sidebar) && @new_sidebar
|
||||
class_name << 'page-with-icon-sidebar' if collapsed_sidebar?
|
||||
|
||||
class_name
|
||||
end
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
.nav-sidebar
|
||||
.nav-sidebar{ class: ("sidebar-icons-only" if collapsed_sidebar?) }
|
||||
- can_edit = can?(current_user, :admin_project, @project)
|
||||
.context-header
|
||||
= link_to project_path(@project), title: @project.name do
|
||||
|
@ -219,7 +219,7 @@
|
|||
= link_to project_settings_members_path(@project), title: 'Members', class: 'shortcuts-tree' do
|
||||
.nav-icon-container
|
||||
= custom_icon('members')
|
||||
%span
|
||||
%span.nav-item-name
|
||||
Members
|
||||
|
||||
= render 'shared/sidebar_toggle_button'
|
||||
|
|
Loading…
Reference in New Issue