Merge branch 'master' into develop

# Conflicts:
#	public/css/monpas/main.css

public/css/monpas/main.css

@@ -1674,6 +1674,35 @@ z-index: 50;
 	box-shadow: none;
 
 }
+.blokjescontainer{
+	display: grid;
+	grid-template-columns: 1fr 1fr 1fr 1fr;
+	grid-gap: 4px;
+}
+.blokjesitempdf{
+	background-color:#f5f0f2 !important;
+	padding: 5px;
+	padding-left: 10px;
+	border-radius: 2px;
+}
+.blokjesitem{
+	background-color:#f5f0f2 !important;
+	padding: 5px;
+	padding-left: 10px;
+	border-radius: 2px;
+}
+.blokjesitempdf{
+	background-color:#f5f0f2 !important;
+	padding: 5px;
+	padding-left: 10px;
+	border-radius: 2px;
+}
+.tabelcontainer{
+	display: grid;
+	grid-template-columns: 400px 150px 150px 150px 150px;
+	grid-gap: 0;
+	margin-left: 20px;
+
 
 .draggable {
 	display: inline-block;
@@ -1689,3 +1718,24 @@ z-index: 50;
 	border-style: dashed;
 	background-color: #f8f8f8;
 }
+
+}
+.tabelitem{
+
+}
+.h4koppdf{
+
+}
+.ijkpuntthdiv{
+	height: 50px;
+	overflow:hidden;
+	font-size: 10px;
+}
+.ijkpuntth {
+	vertical-align:top;
+	padding: 2px;
+}
+.ijkpuntkopje{
+	font-weight: bold!important;
+	margin-bottom: 10px;
+}