diff --git a/app/qml/components/MMButton.qml b/app/qml/components/MMButton.qml index 99ad85947..57ac94bb2 100644 --- a/app/qml/components/MMButton.qml +++ b/app/qml/components/MMButton.qml @@ -166,8 +166,8 @@ Button { implicitWidth: { let margin = __style.margin20 - if ( root.type === MMButton.Types.Tertiary ) margin = 0 - else if ( root.size === MMButton.Sizes.ExtraSmall ) margin = __style.margin8 + if ( root.size === MMButton.Sizes.ExtraSmall ) margin = __style.margin8 + else if ( root.type === MMButton.Types.Tertiary ) margin = 0 else if ( root.size === MMButton.Sizes.Small ) margin = __style.margin16 return row.paintedChildrenWidth + 2 * margin } @@ -214,9 +214,9 @@ Button { property real paintedChildrenWidth: buttonIconLeft.paintedWidth + buttonContent.implicitWidth + buttonIconRight.paintedWidth + spacing property real maxWidth: { - let margin = __style.margin20 - if ( root.type === MMButton.Types.Tertiary ) margin = 0 - else if ( root.size === MMButton.Sizes.ExtraSmall ) margin = __style.margin8 + let margin = __style.margin20 + if ( root.size === MMButton.Sizes.ExtraSmall ) margin = __style.margin8 + else if ( root.type === MMButton.Types.Tertiary ) margin = 0 else if ( root.size === MMButton.Sizes.Small ) margin = __style.margin16 return parent.width - 2 * margin } diff --git a/app/qml/filters/components/MMFilterBanner.qml b/app/qml/filters/components/MMFilterBanner.qml index f0030748f..86dd6a6e9 100644 --- a/app/qml/filters/components/MMFilterBanner.qml +++ b/app/qml/filters/components/MMFilterBanner.qml @@ -59,6 +59,8 @@ Rectangle { text: root.actionText fontColor: __style.skyColor bgndColor: __style.deepOceanColor + bgndColorHover: __style.deepOceanColor + fontColorHover: __style.skyColor onClicked: root.actionClicked() }