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

Merge branch 'gm-fixbug' into 'staging'

Browse Source 
Gm fixbug

See merge request startinblox/applications/sib-app!94
This commit is contained in:
Jean-Baptiste Pasquier
2019-12-19 13:10:09 +00:00
parent e9a56086cb 68335ab8d8
commit d441ebc80a
8 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/page-admin-circles.pug
View File

@ -50,7 +50,7 @@
sib-widget(name='admin-circle-join-button')
template
button.button.btn-margin-left.text-bold.text-uppercase.reversed.button-blue.bordered.with-icon.icon-arrow-right-circle.test
button.button.text-bold.text-uppercase.reversed.button-blue.bordered.with-icon.icon-arrow-right-circle.test
sib-form(
data-src=''
nested-field='members'

2
src/page-circle-profile.pug
View File

@ -11,6 +11,8 @@ sib-router(default-route='circle-profile', hidden)
bind-resources
fields='creationDateSet(title, creationDate)'
class-title='word-spacing-right'
value-title='Creation date: '
widget-creationDate='sib-display-date'

2
src/page-project-profile.pug
View File

@ -15,6 +15,8 @@ sib-router(default-route='project-profile', hidden)
bind-resources
fields='creationDateSet(title, creationDate)'
class-title='word-spacing-right'
value-title='Creation date: '
widget-creationDate='sib-display-date'

2
src/page-project.pug
View File

@ -7,7 +7,7 @@
fields='const-title1, number, customer.name, name'
class-const-title1='h1-like'
class-number='h1-like'
class-number='h1-like word-spacing-right'
class-customer.name='h1-like'
class-name='h1-aside name'

11
src/styles/base/main.scss
View File

@ -135,10 +135,9 @@ h5 {
&:not(:empty)::before {
color: $color-233-18-29;
content: '- ';
content: ' - ';
font-size: 2rem;
font-weight: bold;
margin-left: 0.60rem;
}
}
@ -224,6 +223,14 @@ h5 {
padding: 4.5rem;
}
.word-spacing-left {
margin-left: 0.60rem;
}
.word-spacing-right {
margin-right: 0.60rem;
}
// Compatibility layer for non-updated components
@import 'compat';
// Other base components

4
src/styles/layout/project-profile/project-profile.scss
View File

@ -27,10 +27,6 @@
margin-top: 0.8rem;
}
}
span {
margin-right: 0.6rem;
}
}
&:last-child {

4
src/templates/hd-business-provider.pug
View File

@ -1,6 +1,6 @@
sib-widget(name='hd-business-provider')
template
ul
li #[span Happy Dev Paris:] 5%
li #[span Business provider:] ${await value.name ? await value.name : ""} ${await value.name ? "," : ""} ${await value.fee ? await value.fee:0}%
li #[span Happy Dev Paris: ] 5%
li #[span Business provider: ] ${await value.name ? await value.name : ""}${await value.name ? "," : ""} ${await value.fee ? await value.fee:0}%

4
src/templates/hd-customer.pug
View File

@ -4,8 +4,8 @@ sib-widget(name='hd-customer')
div
h3 Client:
ul
li #[span Business name:]${await value.name}
li #[span Company register:]${await value.companyRegister}
li #[span Business name: ]${await value.name}
li #[span Company register: ]${await value.companyRegister}
li
span Address:
br