3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-10-10 15:27:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 19

Move mode-toggle out of header

Browse source 
Tweak tool-buttons and fonts
This commit is contained in:
fieldOfView 2015-11-11 16:04:54 +01:00
parent 1ba1009b60
commit 64bd41e611
4 changed files with 117 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

7
resources/themes/cura/styles.qml
View file

@ -77,7 +77,8 @@ QtObject {
}
Rectangle {
anchors.fill: parent;
color: control.hovered ? UM.Theme.colors.button_hover : UM.Theme.colors.button
color: control.pressed ? UM.Theme.colors.button_active :
control.hovered ? UM.Theme.colors.button_hover : UM.Theme.colors.button
Behavior on color { ColorAnimation { duration: 50; } }
}
}
@ -156,7 +157,7 @@ QtObject {
Label {
id: tool_button_arrow
opacity: !control.enabled ? 0.4 : 1.0
opacity: !control.enabled ? 0.2 : 1.0
anchors.right: parent.right;
anchors.rightMargin: (UM.Theme.sizes.button.width - UM.Theme.sizes.button_icon.width - tool_button_arrow.width) / 2
anchors.verticalCenter: parent.verticalCenter;
@ -171,7 +172,7 @@ QtObject {
label: Item {
Image {
anchors.centerIn: parent;
opacity: !control.enabled ? 0.4 : 1.0
opacity: !control.enabled ? 0.2 : 1.0
source: control.iconSource;
width: UM.Theme.sizes.button_icon.width;
height: UM.Theme.sizes.button_icon.height;

24
resources/themes/cura/theme.json
View file

@ -1,12 +1,12 @@
{
"fonts": {
"large": {
"size": 1.5,
"size": 1.25,
"bold": true,
"family": "Proxima Nova Rg"
},
"default": {
"size": 1,
"size": 1.15,
"family": "Proxima Nova Rg"
},
"default_allcaps": {
@ -60,14 +60,14 @@
"border": [205, 202, 201, 255],
"secondary": [205, 202, 201, 255],
"text": [140, 144, 154, 255],
"text": [24, 41, 77, 255],
"text_inactive": [174, 174, 174, 255],
"text_white": [255, 255, 255, 255],
"text_hover": [35, 35, 35, 255],
"text_pressed": [12, 169, 227, 255],
"error": [255, 140, 0, 255],
"sidebar_header_bar": [12, 169, 227, 255],
"sidebar_header_bar": [24, 41, 77, 255],
"button": [24, 41, 77, 255],
"button_hover": [70, 84, 113, 255],
@ -78,10 +78,18 @@
"button_disabled_text": [70, 84, 113, 255],
"button_tooltip_text": [35, 35, 35, 255],
"toggle_active": [255, 255, 255, 255],
"toggle_active_text": [77, 184, 226, 255],
"toggle_disabled": [77, 184, 226, 255],
"toggle_disabled_text": [255, 255, 255, 255],
"toggle_checked": [24, 41, 77, 255],
"toggle_checked_border": [24, 41, 77, 255],
"toggle_checked_text": [255, 255, 255, 255],
"toggle_unchecked": [255, 255, 255, 255],
"toggle_unchecked_border": [127, 127, 127, 255],
"toggle_unchecked_text": [24, 41, 77, 255],
"toggle_hovered": [255, 255, 255, 255],
"toggle_hovered_border": [32, 166, 219, 255],
"toggle_hovered_text": [24, 41, 77, 255],
"toggle_active": [32, 166, 219, 255],
"toggle_active_border": [32, 166, 219, 255],
"toggle_active_text": [255, 255, 255, 255],
"load_save_button": [0, 0, 0, 255],
"load_save_button_text": [255, 255, 255, 255],