4 commits

Author	SHA1	Message	Date
Daniel Schiavini	a1c252d3a2	Revert "Revert "fix merge conflict"" ... This reverts commit 4bffa6d90f.	2018-12-07 10:25:46 +01:00
Daniel Schiavini	4bffa6d90f	Revert "fix merge conflict" ... This reverts commit ec03b012a7, reversing changes made to 2af33738d1.	2018-12-07 10:22:32 +01:00
Ghostkeeper	c1bb1a9b98	Use normal font size for shorthand label ... This element had been designed when very_small was in the theme equal to default. I changed the entire application to use default instead of very_small and made very_small a smaller font, but didn't change that on the branch that this element was designed on. So now also change it here. Contributes to issue CURA-5876.	2018-11-27 15:12:44 +01:00
Ghostkeeper	55dd9be062	Move PrinterTypeLabel to a more central location ... So that we can re-use it in other places too. Contributes to issue CURA-5876.	2018-11-27 15:11:13 +01:00

Renamed from resources/qml/PrinterSelector/PrinterTypeLabel.qml (Browse further)