ChrisTerBeke a6114d39e4 Fix merge conflicts with 4.0

2019-01-08 11:49:36 +01:00

..

fonts

CURA-4790 Change font to Noto Sans

2018-02-08 17:23:14 +01:00

icons

Fix merge conflicts with 4.0

2019-01-08 11:49:36 +01:00

images

Add a placeholder for a pattern in the header, if the theme wants to add one.

2018-12-18 10:29:44 +01:00

styles.qml

Use native rendering for text fields

2019-01-03 16:04:27 +01:00

theme.json

Merge branch '4.0' into unify_font_types

2019-01-03 10:46:49 +01:00