diff --git a/resources/qml/Widgets/Menu.qml b/resources/qml/Widgets/Menu.qml index 1a6aeff602..45af36d3fb 100644 --- a/resources/qml/Widgets/Menu.qml +++ b/resources/qml/Widgets/Menu.qml @@ -14,7 +14,7 @@ UM.Menu id: menu padding: 0 - implicitWidth: UM.Theme.getSize("setting_control").width + implicitWidth: UM.Theme.getSize("menu").width delegate: Cura.MenuItem {} background: Rectangle diff --git a/resources/qml/Widgets/MenuItem.qml b/resources/qml/Widgets/MenuItem.qml index f072c029ce..755f0717e2 100644 --- a/resources/qml/Widgets/MenuItem.qml +++ b/resources/qml/Widgets/MenuItem.qml @@ -13,7 +13,8 @@ UM.MenuItem { id: menuItem - implicitHeight: UM.Theme.getSize("setting_control").height + UM.Theme.getSize("narrow_margin").height + implicitHeight: UM.Theme.getSize("menu").height + UM.Theme.getSize("narrow_margin").height + implicitWidth: UM.Theme.getSize("menu").width opacity: enabled ? 1.0 : 0.5 arrow: UM.RecolorImage diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 293c5edf9e..d79a69dc9f 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -184,10 +184,12 @@ "primary_hover": [48, 182, 231, 255], "primary_text": [255, 255, 255, 255], "border": [127, 127, 127, 255], - "text_selection": [156,195, 255, 127], + "text_selection": [156, 195, 255, 127], "secondary": [240, 240, 240, 255], "secondary_shadow": [216, 216, 216, 255], + "text_lighter": [108, 108, 108, 255], + "icon": [8, 7, 63, 255], "primary_button": [25, 110, 240, 255], @@ -639,6 +641,7 @@ "message_action_button": [0, 2.5], "message_image": [15.0, 10.0], "message_type_icon": [2, 2], + "menu": [18, 2], "infill_button_margin": [0.5, 0.5],