Compare commits

..

No commits in common. "661529f1f430eab8ab5f09b7b73cb0535bb9b8bc" and "bdbd5d295eb6037f3593cb4edabece86e6dad0ea" have entirely different histories.

2 changed files with 1 additions and 13 deletions

View File

@ -37,7 +37,6 @@ Button {
return Qt.rgba(0,0,0,1)
}
}
property color textColor: FluTheme.fontPrimaryColor
Accessible.role: Accessible.Button
Accessible.name: control.text
Accessible.description: contentDescription
@ -48,7 +47,6 @@ Button {
verticalPadding: 8
horizontalPadding: 8
enabled: !disabled
font:FluTextStyle.Caption
background: Rectangle{
implicitWidth: 30
implicitHeight: 30
@ -82,8 +80,6 @@ Button {
text:control.text
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
visible: display !== Button.IconOnly
color: control.textColor
font: control.font
}
}
}
@ -99,12 +95,10 @@ Button {
text:control.text
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
visible: display !== Button.IconOnly
color: control.textColor
font: control.font
}
}
}
contentItem:FluLoader{
contentItem:Loader{
sourceComponent: {
if(display === Button.TextUnderIcon){
return com_column

View File

@ -38,7 +38,6 @@ Button {
return Qt.rgba(0,0,0,1)
}
}
property color textColor: FluTheme.fontPrimaryColor
Accessible.role: Accessible.Button
Accessible.name: control.text
Accessible.description: contentDescription
@ -49,7 +48,6 @@ Button {
verticalPadding: 8
horizontalPadding: 8
enabled: !disabled
font:FluTextStyle.Caption
background: Rectangle{
implicitWidth: 30
implicitHeight: 30
@ -83,8 +81,6 @@ Button {
text:control.text
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
visible: display !== Button.IconOnly
color: control.textColor
font: control.font
}
}
}
@ -100,8 +96,6 @@ Button {
text:control.text
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
visible: display !== Button.IconOnly
color: control.textColor
font: control.font
}
}
}