Merge remote-tracking branch 'origin/stable'

# Conflicts:
#	src/public/javascripts/desktop.js
#	src/public/stylesheets/style.css
#	src/views/details/image.ejs
#	src/views/details/relation_map.ejs
This commit is contained in:
zadam
2020-03-08 09:26:34 +01:00
2 changed files with 12 additions and 0 deletions

View File

@@ -64,4 +64,12 @@
border-radius: 10px;
padding: 5px;
margin-top: 5px;
}
.note-detail-image {
text-align: center;
}
.note-detail-image-view {
max-width: 100%;
}

View File

@@ -4,4 +4,8 @@
{
display: none !important;
}
.relation-map-wrapper {
height: 100vh !important;
}
}