Merge branch 'feature/solid_poll_show_date_option' of git.startinblox.com:applications/hubl into feature/solid_poll_show_date_option
Conflicts: src/views/page-polls.pug
This commit is contained in:
commit
468b9ec33c
|
@ -220,15 +220,15 @@ nav#main__menu {
|
||||||
|
|
||||||
/* The little cross icon on contacts' name appears or disapear + hover + styles */
|
/* The little cross icon on contacts' name appears or disapear + hover + styles */
|
||||||
.sub-menu__contacts>div>solid-display {
|
.sub-menu__contacts>div>solid-display {
|
||||||
|
height: 28px;
|
||||||
|
display: block;
|
||||||
|
|
||||||
hubl-menu-contact-removed {
|
hubl-menu-contact-removed {
|
||||||
display: none;
|
display: none;
|
||||||
|
button {
|
||||||
|
visibility: hidden;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
.sub-menu__contacts>div>solid-display {
|
|
||||||
height: 28px;
|
|
||||||
display: block;
|
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
|
|
||||||
|
@ -257,7 +257,8 @@ nav#main__menu {
|
||||||
padding-top: 5px;
|
padding-top: 5px;
|
||||||
|
|
||||||
button {
|
button {
|
||||||
|
visibility: visible;
|
||||||
|
|
||||||
&::before {
|
&::before {
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
color: white;
|
color: white;
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
solid-poll(
|
solid-poll(
|
||||||
data-src=component.endpoints.get
|
data-src=component.endpoints.get
|
||||||
data-dest=component.endpoints.post
|
data-dest=component.endpoints.post
|
||||||
range-tags=component.endpoints.pollRangeTags
|
range-tags=component.endpoints.pollRangeTags
|
||||||
range-circles=component.endpoints.pollRangeCircles
|
range-circles=component.endpoints.pollRangeCircles
|
||||||
upload-dir=component.endpoints.uploads
|
upload-dir=component.endpoints.uploads
|
||||||
display-start-end-date=component.parameters.displayStartEndDates
|
uniq=component.uniq
|
||||||
uniq=component.uniq
|
)&attributes({
|
||||||
)
|
"display-start-end-date": component.parameters ? component.parameters.displayStartEndDates : false
|
||||||
|
})
|
||||||
|
|
Loading…
Reference in New Issue