autonomic-cooperative/hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/header.pug
View File

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

6
src/index.pug
View File

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

8
src/page-circle.pug
View File

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

8
src/page-project.pug
View File

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

26
src/page-user-panel.pug
View File

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

4
src/scripts/index.js
View File

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

42
src/styles/base/header.scss
View File

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