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

Merge branch 'jbpasquier/fix-demo' into 'master'

Browse Source 
Fix for demo

See merge request startinblox/applications/sib-app!19
This commit is contained in:
Gaëlle Morin 2019-04-17 15:16:35 +00:00
commit f6cd936b66
6 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -7,8 +7,4 @@
/www/scripts/ /www/scripts/
/www/lib/ /www/lib/
/www/oidc-client-config.json /www/oidc-client-config.json
!/www/lib/sib-core
!/www/lib/sib-router
!/www/lib/sib-chat
!/www/lib/sib-oidc
*.iml *.iml

5
src/dependencies.pug
View File

@ -3,10 +3,7 @@
//script(src="/lib/webcomponentsjs/webcomponents-loader.js") //script(src="/lib/webcomponentsjs/webcomponents-loader.js")
//- script(src="lib/html-imports.js") //- script(src="lib/html-imports.js")
script( script(type="module" src="https://unpkg.com/@startinblox/oidc@0.5")
type="module"
src="https://unpkg.com/@startinblox/oidc@0.5"
)
script(src="/scripts/index.js") script(src="/scripts/index.js")

6
src/header.pug
View File

@ -12,11 +12,15 @@ sib-notifications(
bind-user bind-user
) )
sib-widget(name="user-picture")
template
img(name="${name}",src="\${value || '/images/user.jpg'}",style="max-width:100%; max-height: 100%;")
details#user-controls details#user-controls
summary(tabindex='0' role='button') summary(tabindex='0' role='button')
sib-display#user-controls__profile( sib-display#user-controls__profile(
data-fields='first_name, account.picture', data-fields='first_name, account.picture',
widget-account.picture='sib-display-img', widget-account.picture='user-picture',
bind-user bind-user
) )
#user-controls__panel #user-controls__panel

6
src/scripts/index.js
View File

@ -6,12 +6,6 @@ document.addEventListener('DOMContentLoaded', function (event) {
if (!navBar || !btnToggle) return; if (!navBar || !btnToggle) return;
document.querySelectorAll('img[name$="account.picture"]').forEach(function (e) {
if (!e.src || e.src == window.location) {
e.src = '/images/user.jpg';
}
});
btnToggle.addEventListener('click', e => { btnToggle.addEventListener('click', e => {
navBar.classList.toggle('open'); navBar.classList.toggle('open');
e.stopPropagation(); e.stopPropagation();

6
src/styles/main.scss
View File

@ -127,11 +127,7 @@ li {
overflow-x: hidden; overflow-x: hidden;
> div { > div {
//display: flex; transition: all 0.5s;
//margin: 2.6em;
//padding:2.6em;
//flex: 1 1 0;
flex-grow: 1;
} }
} }
} }

4
src/styles/menu-right.scss
View File

@ -4,6 +4,8 @@
nav { nav {
transition: all 0.5s;
> sib-router { > sib-router {
background-color: $color-222-52-90; background-color: $color-222-52-90;
color: $color-purple-dark; color: $color-purple-dark;
@ -80,7 +82,7 @@
} }
& ~ #views-container { & ~ #views-container {
flex-basis: 95%; margin-left: -15.5rem;
transform: translate(15.5rem); transform: translate(15.5rem);
} }
} }