Merge branch 'master' of https://gitea.prod.resk-u.ch/CLERC/Reskreen
This commit is contained in:
@@ -9,7 +9,11 @@
|
|||||||
}
|
}
|
||||||
@frame footer_frame { /* Another static Frame */
|
@frame footer_frame { /* Another static Frame */
|
||||||
-pdf-frame-content: footer_content;
|
-pdf-frame-content: footer_content;
|
||||||
|
<<<<<<< HEAD
|
||||||
left: 50pt; top: 20pt; height: 20pt;
|
left: 50pt; top: 20pt; height: 20pt;
|
||||||
|
=======
|
||||||
|
left: 50pt; bottom: 20pt; height: 20pt;
|
||||||
|
>>>>>>> a286e0eaa8c391c4786993d1954e3028466c782a
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user