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 

 Conflicts:
	src/views/page-polls.pug
This commit is contained in:
Sylvain Lehmann 2021-06-14 15:08:53 +02:00
parent 75c0b15179 2929a61855
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

13
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 */
.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 {
@ -257,7 +257,8 @@ nav#main__menu {
padding-top: 5px;
button {
visibility: visible;
&::before {
font-size: 18px;
color: white;

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

@ -1,9 +1,10 @@
solid-poll(
data-src=component.endpoints.get
data-dest=component.endpoints.post
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
)
solid-poll(
data-src=component.endpoints.get
data-dest=component.endpoints.post
range-tags=component.endpoints.pollRangeTags
range-circles=component.endpoints.pollRangeCircles
upload-dir=component.endpoints.uploads
uniq=component.uniq
)&attributes({
"display-start-end-date": component.parameters ? component.parameters.displayStartEndDates : false
})