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,16 +220,16 @@ nav#main__menu {
|
||||
|
||||
/* The little cross icon on contacts' name appears or disapear + hover + styles */
|
||||
.sub-menu__contacts>div>solid-display {
|
||||
height: 28px;
|
||||
display: block;
|
||||
|
||||
hubl-menu-contact-removed {
|
||||
display: none;
|
||||
button {
|
||||
visibility: hidden;
|
||||
}
|
||||
}
|
||||
|
||||
.sub-menu__contacts>div>solid-display {
|
||||
height: 28px;
|
||||
display: block;
|
||||
|
||||
&:hover {
|
||||
|
||||
hubl-menu-fix-url-contact {
|
||||
@ -257,6 +257,7 @@ nav#main__menu {
|
||||
padding-top: 5px;
|
||||
|
||||
button {
|
||||
visibility: visible;
|
||||
|
||||
&::before {
|
||||
font-size: 18px;
|
||||
|
@ -4,6 +4,7 @@ solid-poll(
|
||||
range-tags=component.endpoints.pollRangeTags
|
||||
range-circles=component.endpoints.pollRangeCircles
|
||||
upload-dir=component.endpoints.uploads
|
||||
display-start-end-date=component.parameters.displayStartEndDates
|
||||
uniq=component.uniq
|
||||
)
|
||||
)&attributes({
|
||||
"display-start-end-date": component.parameters ? component.parameters.displayStartEndDates : false
|
||||
})
|
||||
|
Loading…
Reference in New Issue
Block a user