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

Merge branch 'feature/solid_poll_show_date_option' of git.startinblox.com:applications/hubl into feature/solid_poll_show_date_option

Browse Source 
 Conflicts:
	src/views/page-polls.pug
This commit is contained in:
Sylvain Lehmann 2021-06-14 15:08:53 +02:00
commit 468b9ec33c
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/styles/left-nav/_index.scss
View File

@ -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,6 +257,7 @@ nav#main__menu {
padding-top: 5px; padding-top: 5px;
button { button {
visibility: visible;
&::before { &::before {
font-size: 18px; font-size: 18px;

5
src/views/page-polls.pug
View File

@ -4,6 +4,7 @@ solid-poll(
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
})