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

Merge branch 'master' into release/firefox-fix

Browse Source
This commit is contained in:
Jean-Baptiste Pasquier 2020-10-19 10:49:19 +02:00
commit 608738dd4c
3 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.yml
View File

@ -100,6 +100,7 @@ test3:
script: script:
- echo "$APP_CONFIG_TEST3" > config.json - echo "$APP_CONFIG_TEST3" > config.json
- echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key
- sed -i -E 's/component-chat@([0-9]+).([0-9]+)/component-chat@beta/g' src/dependencies.pug
- npm run build - npm run build
- scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* test3@astral.startinblox.com:~/front/ - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* test3@astral.startinblox.com:~/front/
only: only:

50
src/menu-left.pug
View File

@ -21,31 +21,33 @@ solid-widget(name='hubl-create')
solid-widget(name='hubl-menu-fix-url-circle') solid-widget(name='hubl-menu-fix-url-circle')
template template
solid-display( solid-link(data-src="${value}" next="circle")
data-src='${value}' solid-display(
fields='status, name, jabberID, badge' data-src='${value}'
value-badge='${value}' fields='status, name, jabberID, badge'
widget-status='hubl-menu-publicprivate' value-badge='${value}'
widget-badge='hubl-counter' widget-status='hubl-menu-publicprivate'
widget-jabberID='hubl-menu-jabberid' widget-badge='hubl-counter'
widget-name='solid-display-div' widget-jabberID='hubl-menu-jabberid'
order-by="name" widget-name='solid-display-div'
) order-by="name"
)
solid-widget(name='hubl-menu-fix-url-project') solid-widget(name='hubl-menu-fix-url-project')
template template
solid-display( solid-link(data-src="${value}" next="project")
data-src='${value}' solid-display(
fields='status, project(customer.name, name, jabberID), badge' data-src='${value}'
class-name='project-name' fields='status, project(customer.name, name, jabberID), badge'
class-customer.name='project-customer' class-name='project-name'
value-badge='${value}' class-customer.name='project-customer'
widget-status='hubl-menu-publicprivate' value-badge='${value}'
widget-jabberID='hubl-menu-jabberid' widget-status='hubl-menu-publicprivate'
widget-badge='hubl-counter' widget-jabberID='hubl-menu-jabberid'
widget-name='solid-display-div' widget-badge='hubl-counter'
order-by="customer.name" widget-name='solid-display-div'
) order-by="customer.name"
)
solid-router#navbar-router(default-route='dashboard') solid-router#navbar-router(default-route='dashboard')
@ -94,8 +96,6 @@ solid-router#navbar-router(default-route='dashboard')
empty-widget='hubl-create' empty-widget='hubl-create'
empty-value='projet' empty-value='projet'
widget-project='hubl-menu-fix-url-project' widget-project='hubl-menu-fix-url-project'
order-by='project.customer.name'
next='project'
) )
div.divider div.divider
if endpoints.circles || (endpoints.get && endpoints.get.circles) if endpoints.circles || (endpoints.get && endpoints.get.circles)
@ -123,8 +123,6 @@ solid-router#navbar-router(default-route='dashboard')
empty-widget='hubl-create' empty-widget='hubl-create'
empty-value='cercle' empty-value='cercle'
widget-circle='hubl-menu-fix-url-circle' widget-circle='hubl-menu-fix-url-circle'
order-by='circle.name'
next='circle'
) )
div.divider div.divider
if endpoints.users || (endpoints.get && endpoints.get.users) if endpoints.users || (endpoints.get && endpoints.get.users)

12
src/styles/base/menu-left.scss
View File

@ -238,8 +238,8 @@
color: var(--color-white); color: var(--color-white);
cursor: pointer; cursor: pointer;
>hubl-menu-fix-url-circle>solid-display>div, >hubl-menu-fix-url-circle>solid-link>solid-display>div,
>hubl-menu-fix-url-project>solid-display>div { >hubl-menu-fix-url-project>solid-link>solid-display>div {
padding: 1rem 1rem 1rem 3rem; padding: 1rem 1rem 1rem 3rem;
} }
} }
@ -250,8 +250,8 @@
} }
&>solid-display[active]>div, &>solid-display[active]>div,
&>solid-display>div>hubl-menu-fix-url-circle>solid-display[active]>div, &>solid-display>div>hubl-menu-fix-url-circle>solid-link>solid-display[active]>div,
&>solid-display>div>hubl-menu-fix-url-project>solid-display[active]>div { &>solid-display>div>hubl-menu-fix-url-project>solid-link>solid-display[active]>div {
background-color: var(--color-menu-highlight-primary); background-color: var(--color-menu-highlight-primary);
color: var(--color-menu-text-active); color: var(--color-menu-text-active);
font-weight: bold; font-weight: bold;
@ -266,8 +266,8 @@
} }
>solid-display>div>solid-display>div, >solid-display>div>solid-display>div,
>solid-display>div>solid-display>div>hubl-menu-fix-url-circle>solid-display>div, >solid-display>div>solid-display>div>hubl-menu-fix-url-circle>solid-link>solid-display>div,
>solid-display>div>solid-display>div>hubl-menu-fix-url-project>solid-display>div { >solid-display>div>solid-display>div>hubl-menu-fix-url-project>solid-link>solid-display>div {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }