diff --git a/plugins/LayerView/LayerView.qml b/plugins/LayerView/LayerView.qml index 9c35b9337c..8e6a535b3d 100644 --- a/plugins/LayerView/LayerView.qml +++ b/plugins/LayerView/LayerView.qml @@ -18,8 +18,8 @@ Item id: slider width: 10 height: 250 - anchors.right : parent.right - anchors.rightMargin: UM.Theme.sizes.slider_layerview_margin.width/2 + anchors.left: parent.left + anchors.leftMargin: UM.Theme.sizes.slider_layerview_margin.width/2 orientation: Qt.Vertical minimumValue: 0; maximumValue: UM.LayerView.numLayers; @@ -31,7 +31,7 @@ Item style: UM.Theme.styles.layerViewSlider } Rectangle { - anchors.right: parent.right + anchors.left: parent.left y: -UM.Theme.sizes.slider_layerview_background_extension.height z: slider.z - 1 width: UM.Theme.sizes.button.width @@ -39,7 +39,7 @@ Item color: UM.Theme.colors.slider_text_background } Rectangle { - anchors.right : parent.right + anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter z: slider.z - 1 width: UM.Theme.sizes.slider_layerview_background.width diff --git a/resources/images/cura.png b/resources/images/cura.png index 0bf87af165..c61f6584f7 100644 Binary files a/resources/images/cura.png and b/resources/images/cura.png differ diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index a4e81efcce..1396a5bd9b 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -330,8 +330,7 @@ UM.MainWindow //anchors.bottom: parent.bottom anchors.top: viewModeButton.bottom anchors.topMargin: UM.Theme.sizes.default_margin.height; - anchors.right: sidebar.left; - anchors.rightMargin: UM.Theme.sizes.window_margin.width; + anchors.left: viewModeButton.left; //anchors.bottom: buttons.top; //anchors.bottomMargin: UM.Theme.sizes.default_margin.height; @@ -386,8 +385,8 @@ UM.MainWindow anchors { top: parent.top; - right: sidebar.left; - rightMargin: UM.Theme.sizes.window_margin.width; + left: toolbar.right; + leftMargin: UM.Theme.sizes.window_margin.width; } text: catalog.i18nc("@action:button","View Mode"); iconSource: UM.Theme.icons.viewmode; diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml index 206fb69261..cdceec6f59 100644 --- a/resources/qml/Toolbar.qml +++ b/resources/qml/Toolbar.qml @@ -20,7 +20,7 @@ Item { anchors.bottom: parent.bottom; anchors.left: parent.left; - spacing: UM.Theme.sizes.default_lining.width + spacing: UM.Theme.sizes.button_lining.width Repeater { id: repeat diff --git a/resources/themes/cura/styles.qml b/resources/themes/cura/styles.qml index 027ef72050..7417d901ba 100644 --- a/resources/themes/cura/styles.qml +++ b/resources/themes/cura/styles.qml @@ -77,7 +77,7 @@ QtObject { } Rectangle { anchors.fill: parent; - color: control.hovered ? UM.Theme.colors.load_save_button_hover : UM.Theme.colors.load_save_button + color: control.hovered ? UM.Theme.colors.button_hover : UM.Theme.colors.button Behavior on color { ColorAnimation { duration: 50; } } } } diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json index f4660e4f0f..ee859d6318 100644 --- a/resources/themes/cura/theme.json +++ b/resources/themes/cura/theme.json @@ -3,49 +3,49 @@ "large": { "size": 1.5, "bold": true, - "family": "Roboto" + "family": "Proxima Nova Rg" }, "default": { "size": 1, - "family": "Roboto" + "family": "Proxima Nova Rg" }, "default_allcaps": { "size": 1, "capitalize": true, - "family": "Roboto" + "family": "Proxima Nova Rg" }, "small": { "size": 0.75, - "family": "Roboto" + "family": "Proxima Nova Rg" }, "tiny": { "size": 0.5, - "family": "Roboto" + "family": "Proxima Nova Rg" }, "caption": { "size": 0.75, "italic": true, - "family": "Roboto" + "family": "Proxima Nova Rg" }, "sidebar_header": { "size": 0.75, "capitalize": true, - "family": "Roboto" + "family": "Proxima Nova Rg" }, "default_header": { "size": 1.0, "bold": true, - "family": "Roboto", + "family": "Proxima Nova Rg", "letterSpacing": 2.0 }, "button_tooltip": { "size": 0.75, "capitalize": true, - "family": "Roboto" + "family": "Proxima Nova Rg" }, "setting_category": { "size": 1.0, - "family": "Roboto" + "family": "Proxima Nova Rg" } }, @@ -69,12 +69,13 @@ "error": [255, 140, 0, 255], "sidebar_header_bar": [12, 169, 227, 255], - "button": [139, 143, 153, 255], - "button_hover": [77, 184, 226, 255], + "button": [24, 41, 77, 255], + "button_hover": [70, 84, 113, 255], "button_active": [32, 166, 219, 255], - "button_active_hover": [77, 184, 226, 255], + "button_active_hover": [12, 169, 227, 255], "button_text": [255, 255, 255, 255], - "button_disabled": [0, 0, 0, 255], + "button_disabled": [24, 41, 77, 255], + "button_disabled_text": [70, 84, 113, 255], "button_tooltip_text": [35, 35, 35, 255], "toggle_active": [255, 255, 255, 255], @@ -142,13 +143,13 @@ }, "sizes": { - "window_margin": [1.5, 1.5], + "window_margin": [1.0, 1.0], "default_margin": [1.0, 1.0], "default_lining": [0.1, 0.1], "logo": [9.5, 2.0], - "sidebar": [26.0, 10.0], - "sidebar_header": [0.0, 3.8], + "sidebar": [30.0, 10.0], + "sidebar_header": [0.0, 4.0], "sidebar_header_mode_toggle": [0.0, 2.4], "sidebar_setup": [0.0, 2.6], "sidebar_subParts": [0.0, 2.4], @@ -161,8 +162,8 @@ "section_icon": [1.6, 1.6], "section_icon_column": [2.8, 0.0], - "setting": [21.0, 1.8], - "setting_control": [7.0, 2.0], + "setting": [19.0, 1.8], + "setting_control": [10.0, 2.0], "setting_control_depth_margin": [1.4, 0.0], "setting_preferences_button_margin": [3.3, 0.0], "setting_control_margin": [0.0, 0.0], @@ -173,8 +174,9 @@ "standard_list_input": [20.0, 25.0], "standard_arrow": [0.6, 0.6], - "button": [3.8, 3.8], - "button_icon": [2.6, 2.6], + "button": [4, 4], + "button_icon": [3, 3], + "button_lining": [0, 0], "progressbar": [26.0, 0.8], "progressbar_control": [8.0, 0.8],