diff --git a/src/menu-left.pug b/src/menu-left.pug index 44880da..52bbfcb 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -19,31 +19,31 @@ nav#main__menu //- sib-route(name='job-offer-create', hidden) //- sib-route(name='job-offer-edit', use-id, hidden) //- div.divider - //- div.menu-wrapper - //- div.menu - //- div.menu-chevron - //- div.menu-icon.icon-arrow-up - //- div.menu-label Projects - //- div.menu-icon.icon-folder-alt - //- sib-route(name='project', rdf-type='hd:project', use-id='', hidden) - //- div.sub-menu.menu-notification - //- sib-display.project-tab( - //- data-src=`${endpoints.projects}` - //- fields='project(customer.name, name), badge' - //- class-customer.name='project-customer' - //- class-name='project-name' - //- empty-widget='hd-create' - //- empty-value='project' - //- search-fields='team' - //- search-widget-team='sib-form-hidden' - //- search-value-team='-' - //- hd-inherit-user-id='search-value-team' - //- hd-inherit-widgets - //- widget-badge='hd-counter' - //- action-badge='badge' - //- order-by='customer.name' - //- next='project' - //- ) + div.menu-wrapper + div.menu + div.menu-chevron + div.menu-icon.icon-arrow-up + div.menu-label Projects + div.menu-icon.icon-folder-alt + sib-route(name='project', rdf-type='hd:project', use-id='', hidden) + div.sub-menu.menu-notification + sib-display.project-tab( + data-src=`${endpoints.projects}` + fields='project(customer.name, name), badge' + class-customer.name='project-customer' + class-name='project-name' + empty-widget='hd-create' + empty-value='project' + search-fields='team' + search-widget-team='sib-form-hidden' + search-value-team='-' + hd-inherit-user-id='search-value-team' + hd-inherit-widgets + widget-badge='hd-counter' + action-badge='badge' + order-by='customer.name' + next='project' + ) div.divider div div.menu diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index 4afff70..4d4a0ba 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -22,16 +22,28 @@ $breakpoints: (phone: 480px, font-size: 1.6rem; min-height: 100vh; overflow-wrap: break-word; + overflow-x: hidden; /* To stop getting horizontal scrolling if anything overflows the width */ } main { display: flex; - flex-direction: row; - max-width: 100%; + overflow: hidden; + height: calc(100vh - 83px); /* 83px = height of the header */ + position: relative; + width: 100%; + + backface-visibility: hidden; + /*will-change: overflow;*/ } } - +/* Add scrollbar to the left and right menu, and to the content */ +nav, .views-container { + overflow: auto; + height: auto; + -webkit-overflow-scrolling: touch; + -ms-overflow-style: none; +} /* Quick fix. Will be removed later */ #admin-circles, diff --git a/src/styles/base/menu-left.scss b/src/styles/base/menu-left.scss index 9848525..35a6246 100644 --- a/src/styles/base/menu-left.scss +++ b/src/styles/base/menu-left.scss @@ -121,32 +121,6 @@ hd-counter { margin-top: 16px; - margin-left: 8px; - } - - &:hover { - background-color: $color-233-20-17; - box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.26); - - sib-set-default[name='project'] { - background-color: $color-233-20-17; - color: $color-218-100-98; - /* transition: all 0.6s cubic-bezier(0.39, 0.575, 0.565, 1); Need better animation */ - z-index: 1000; - - .project-customer, - .project-name { - width: auto; - } - - .project-name { - font-weight: normal; - } - } - - hd-counter { - display: none; - } } } /* End of specific styles of "Projects" tab */ diff --git a/src/styles/components/sidebar.scss b/src/styles/components/sidebar.scss index 1e93db5..d1d12ef 100644 --- a/src/styles/components/sidebar.scss +++ b/src/styles/components/sidebar.scss @@ -12,7 +12,7 @@ .views-container { flex: 1 0 0; - -webkit-backface-visibility: hidden; + /*-webkit-backface-visibility: hidden;*/ &.sidebar-is-closed { margin-left: -15.5rem; @@ -27,6 +27,7 @@ nav { background: $color-210-25-95; transition: all 0.5s; + width: 25rem; >sib-router { background-color: $color-222-52-90; @@ -49,13 +50,13 @@ margin: 0; padding: 2.15rem 2.55rem; position: relative; - width: 12em; + /*width: 12em;*/ &::before { float: left; font-size: 4rem; margin-left: 0; - margin-right: 2.55rem; + margin-right: 2.85rem; } }