Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime van Kessel <nallath@gmail.com>2022-03-15 12:25:56 +0300
committerJaime van Kessel <nallath@gmail.com>2022-03-15 12:25:56 +0300
commitf760ca146d960c0a8704b7477d059e5606dda024 (patch)
treecd6329db55c7f0e3823bdf21a5f2cd2c715d51f4
parent93405bdb933650f5f6c764d6418a077ca22b0a28 (diff)
Fix sizing of materialBrandSelection
This also cleans up some stuff from the theme. Huzzah CURA-8979
-rw-r--r--resources/qml/Preferences/Materials/MaterialsBrandSection.qml3
-rw-r--r--resources/qml/Preferences/Materials/MaterialsSlot.qml2
-rw-r--r--resources/qml/Preferences/Materials/MaterialsTypeSection.qml2
-rw-r--r--resources/themes/cura-light/theme.json8
4 files changed, 4 insertions, 11 deletions
diff --git a/resources/qml/Preferences/Materials/MaterialsBrandSection.qml b/resources/qml/Preferences/Materials/MaterialsBrandSection.qml
index d9b0a66f15..5ffce9b750 100644
--- a/resources/qml/Preferences/Materials/MaterialsBrandSection.qml
+++ b/resources/qml/Preferences/Materials/MaterialsBrandSection.qml
@@ -23,9 +23,8 @@ Column
Cura.CategoryButton
{
width: parent.width
- height: UM.Theme.getSize("favorites_row").height
labelText: sectionName
- labelFont: UM.Theme.getFont("default_bold")
+ labelFont: UM.Theme.getFont("medium_bold")
expanded: brand_section.expanded
onClicked:
{
diff --git a/resources/qml/Preferences/Materials/MaterialsSlot.qml b/resources/qml/Preferences/Materials/MaterialsSlot.qml
index 232e8bbdf8..0c50d6b2f3 100644
--- a/resources/qml/Preferences/Materials/MaterialsSlot.qml
+++ b/resources/qml/Preferences/Materials/MaterialsSlot.qml
@@ -17,7 +17,7 @@ Rectangle
property var material: null
property bool hovered: false
- height: UM.Theme.getSize("favorites_row").height
+ height: UM.Theme.getSize("preferences_page_list_item").height
width: parent.width
color: UM.Theme.getColor("main_background")
diff --git a/resources/qml/Preferences/Materials/MaterialsTypeSection.qml b/resources/qml/Preferences/Materials/MaterialsTypeSection.qml
index fa3130b801..d781218027 100644
--- a/resources/qml/Preferences/Materials/MaterialsTypeSection.qml
+++ b/resources/qml/Preferences/Materials/MaterialsTypeSection.qml
@@ -23,7 +23,7 @@ Column
{
id: categoryButton
width: parent.width
- height: UM.Theme.getSize("favorites_row").height
+ height: UM.Theme.getSize("preferences_page_list_item").height
labelText: materialName
labelFont: UM.Theme.getFont("default")
expanded: material_type_section.expanded
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index 5583053ea2..6895e382fa 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -431,8 +431,6 @@
"layerview_nozzle": [224, 192, 16, 64],
"layerview_starts": [255, 255, 255, 255],
- "favorites_header_bar": [245, 245, 245, 255],
- "favorites_row_selected": [196, 239, 255, 255],
"monitor_printer_family_tag": [228, 228, 242, 255],
"monitor_text_disabled": [238, 238, 238, 255],
@@ -561,11 +559,7 @@
"medium_button_icon": [2, 2],
"context_menu": [20, 2],
-
- "favorites_row": [2, 2],
- "favorites_button": [2, 2],
- "favorites_button_icon": [1.2, 1.2],
-
+
"icon_indicator": [1, 1],
"printer_status_icon": [1.0, 1.0],