Merge branch 'staging' of git.happy-dev.fr:startinblox/applications/sib-app into staging

This commit is contained in:
Gaëlle Morin 2019-05-21 17:34:27 +02:00
commit 0422bc5dee
7 changed files with 50 additions and 55 deletions

View File

@ -2,10 +2,10 @@
sib-link(next='members')
img(src='/images/logo.png' width=111 height=32)
#search-bar
input#search-input(type='search')
i#search-icon.icon-magnifier(aria-hidden='true')
i#close-search-icon.icon-close(aria-hidden='true')
//- #search-bar
//- input#search-input(type='search')
//- i#search-icon.icon-magnifier(aria-hidden='true')
//- i#close-search-icon.icon-close(aria-hidden='true')
sib-notifications(
id-suffix="inbox",
@ -21,12 +21,9 @@ details#user-controls
widget-account.picture='hd-user-avatar',
bind-user
)
#user-controls__panel
include page-user-panel.pug
button(role='log in' onclick="document.querySelector('sib-auth').login();") Login
sib-auth
sib-auth-provider(
class="sib-auth-provider"

View File

@ -33,9 +33,3 @@ html(lang="en")
#member-chat(hidden).with-sidebar
include page-member-chat.pug
#user-profile(hidden)
#user-settings(hidden)
#user-admin(hidden)

View File

@ -19,8 +19,8 @@ nav.jsRightMenu(role='navigation')
li
a Information
sib-route(name='circle-edit')
li
a Edit
//- li
//- a Edit
sib-route(name='circle-create')
li
a Add new
//- li
//- a Add new

View File

@ -19,8 +19,8 @@ nav.jsRightMenu(role='navigation')
li
a Information
sib-route(name='project-edit', use-id)
li
a Edit
//- li
//- a Edit
sib-route(name='project-create', use-id)
li
a Add new
//- li
//- a Add new

View File

@ -1,13 +1,13 @@
nav(role="user's functionalities menu")
sib-router
ul
sib-route(name='user-profile')
li
a(href='#') My profile
sib-route(name='user-settings')
li
a(href='#') Settings
sib-route(name='user-admin')
li
a Admin
button(role='log out' onclick="document.querySelector('sib-auth').logout();") Log out
//- nav(role="user's functionalities menu")
//- sib-router
//- ul
//- sib-route(name='user-profile')
//- li
//- a(href='#') My profile
//- sib-route(name='user-settings')
//- li
//- a(href='#') Settings
//- sib-route(name='user-admin')
//- li
//- a Admin
//- button(role='log out' onclick="document.querySelector('sib-auth').logout();") Log out

View File

@ -3,6 +3,10 @@ document.addEventListener('DOMContentLoaded', function (event) {
const rightMenus = Array.from(document.querySelectorAll('nav.jsRightMenu'));
const viewsContainer = Array.from(document.querySelectorAll('.views-container'));
window.addEventListener('navigate', (event) => {
//- View change event
});
//- Toggle sub-menus
menuWrappers.forEach(menuWrapper => {
const menu = menuWrapper.querySelector('.menu');

View File

@ -61,7 +61,7 @@
}
details {
cursor: pointer;
// cursor: pointer;
summary {
@ -106,11 +106,11 @@ details {
details#user-controls {
summary:focus {
background-color: $color-233-18-29;
color: $color-0-0-100;
outline: none;
}
// summary:focus {
// background-color: $color-233-18-29;
// color: $color-0-0-100;
// outline: none;
// }
#user-controls__profile {
div {
@ -131,7 +131,7 @@ details#user-controls {
}
sib-display-value[name='first_name'] {
@include icon('arrow-down');
// @include icon('arrow-down');
align-items: center;
display: flex;
flex-direction: row-reverse;
@ -185,23 +185,23 @@ details#user-controls {
}
}
&[open] {
background-color: $color-233-18-29;
color: $color-0-0-100;
// &[open] {
// background-color: $color-233-18-29;
// color: $color-0-0-100;
#user-controls__profile {
// #user-controls__profile {
div {
// div {
sib-display-value[name='first_name'] {
@include icon('close');
// sib-display-value[name='first_name'] {
// @include icon('close');
&::before {
margin-left: 1.5rem;
}
}
}
}
}
// &::before {
// margin-left: 1.5rem;
// }
// }
// }
// }
// }
}