From 1583018e75391e253bb044597e65c6db758eb96a Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Thu, 17 Mar 2016 21:09:18 +0100
Subject: [PATCH] Clean up theme: tweak colors, remove unused styles

Contributes to CURA-1143
---
 resources/qml/JobSpecs.qml       |  6 ++---
 resources/themes/cura/theme.json | 43 +++-----------------------------
 2 files changed, 7 insertions(+), 42 deletions(-)

diff --git a/resources/qml/JobSpecs.qml b/resources/qml/JobSpecs.qml
index f27b046355..fac4fd841d 100644
--- a/resources/qml/JobSpecs.qml
+++ b/resources/qml/JobSpecs.qml
@@ -158,7 +158,7 @@ Rectangle {
         anchors.right: parent.right
         height: UM.Theme.getSize("jobspecs_line").height
         verticalAlignment: Text.AlignVCenter
-        font: UM.Theme.getFont("small_bold")
+        font: UM.Theme.getFont("small")
         color: UM.Theme.getColor("text_subtext")
         text: Printer.getSceneBoundingBoxString
     }
@@ -190,7 +190,7 @@ Rectangle {
                 anchors.right: lengthIcon.left
                 anchors.rightMargin: UM.Theme.getSize("default_margin").width
                 anchors.verticalCenter: parent.verticalCenter
-                font: UM.Theme.getFont("small_bold")
+                font: UM.Theme.getFont("small")
                 color: UM.Theme.getColor("text_subtext")
                 text: (!base.printDuration || !base.printDuration.valid) ? catalog.i18nc("@label", "00h 00min") : base.printDuration.getDisplayString(UM.DurationFormat.Short)
             }
@@ -210,7 +210,7 @@ Rectangle {
                 id: lengthSpec
                 anchors.right: parent.right
                 anchors.verticalCenter: parent.verticalCenter
-                font: UM.Theme.getFont("small_bold")
+                font: UM.Theme.getFont("small")
                 color: UM.Theme.getColor("text_subtext")
                 text: base.printMaterialAmount <= 0 ? catalog.i18nc("@label", "0.0 m") : catalog.i18nc("@label", "%1 m").arg(base.printMaterialAmount)
             }
diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json
index e1dc40c2d6..edc63fbab0 100644
--- a/resources/themes/cura/theme.json
+++ b/resources/themes/cura/theme.json
@@ -15,33 +15,9 @@
             "family": "Open Sans"
         },
         "small": {
-            "size": 1.0,
-            "family": "Open Sans"
-        },
-        "small_bold":
-        {
-            "size": 1.0,
-            "family": "Open Sans",
-            "bold": true
-        },
-        "very_small": {
-            "size": 0.75,
-            "family": "Open Sans"
-        },
-        "caption": {
-            "size": 1.0,
-            "family": "Open Sans"
-        },
-        "sidebar_header": {
-            "size": 0.75,
-            "capitalize": true,
-            "family": "Open Sans"
-        },
-        "default_header": {
             "size": 1.0,
             "bold": true,
-            "family": "Open Sans",
-            "letterSpacing": 2.0
+            "family": "Open Sans"
         },
         "button_tooltip": {
             "size": 1.0,
@@ -49,6 +25,7 @@
         },
         "setting_category": {
             "size": 1.15,
+            "bold": true,
             "family": "Open Sans"
         },
         "action_button": {
@@ -74,7 +51,7 @@
         "text_hover": [70, 84, 113, 255],
         "text_pressed": [12, 169, 227, 255],
         "text_white": [255, 255, 255, 255],
-        "text_subtext": [100, 100, 100, 255],
+        "text_subtext": [70, 84, 113, 255],
 
         "error": [255, 140, 0, 255],
         "sidebar_header_bar": [24, 41, 77, 255],
@@ -176,10 +153,7 @@
         "message_text": [32, 166, 219, 255],
         "message_dismiss": [127, 127, 127, 255],
 
-        "tool_panel_background": [255, 255, 255, 255],
-
-        "per_object_settings_panel_background": [255, 255, 255, 255],
-        "per_object_settings_panel_border": [127, 127, 127, 255]
+        "tool_panel_background": [255, 255, 255, 255]
     },
 
     "sizes": {
@@ -224,7 +198,6 @@
         "progressbar": [26.0, 0.8],
         "progressbar_radius": [0.4, 0.4],
         "progressbar_control": [8.0, 0.8],
-        "progressbar_padding": [0.0, 1.0],
 
         "scrollbar": [0.75, 0.5],
 
@@ -232,7 +205,6 @@
         "slider_handle": [1.5, 1.5],
         "slider_layerview_size": [1.0, 16.0],
         "slider_layerview_background": [4.0, 0.0],
-        "slider_layerview_smalltext_margin": [0.3, 0.00],
         "slider_layerview_margin": [3.0, 3.0],
 
         "checkbox": [2.0, 2.0],
@@ -242,8 +214,6 @@
         "tooltip_arrow_margins": [2.0, 2.0],
 
         "save_button_text_margin": [0.3, 0.6],
-        "save_button_slicing_bar": [0.0, 2.2],
-        "save_button_label_margin": [0.5, 0.5],
         "save_button_save_to_button": [0.3, 2.7],
         "save_button_specs_icons": [1.4, 1.4],
 
@@ -256,11 +226,6 @@
 
         "infill_button_margin": [0.5, 0.5],
 
-        "per_object_settings_button": [2.0, 2.0],
-        "per_object_settings_panel": [24.0, 10.0],
-        "per_object_settings_panel_border": [0.1, 0.1], 
-
-        "jobspecs": [20, 0],
         "jobspecs_line": [2.0, 2.0]
     }
 }