Merge remote-tracking branch 'origin/master' into CURA-6447_fix_start_onboarding

This commit is contained in:
Lipu Fei 2019-04-10 10:40:42 +02:00
commit 0d437e7e96
2 changed files with 18 additions and 14 deletions

View file

@ -15,6 +15,14 @@ ScrollView
{
property alias textArea: _textArea
clip: true
background: Rectangle // Border
{
border.color: UM.Theme.getColor("lining")
border.width: UM.Theme.getSize("default_lining").width
}
TextArea
{
id: _textArea
@ -22,11 +30,5 @@ ScrollView
textFormat: TextEdit.PlainText
renderType: Text.NativeRendering
selectByMouse: true
background: Rectangle // Border
{
border.color: UM.Theme.getColor("lining")
border.width: UM.Theme.getSize("default_lining").width
}
}
}