Merge remote-tracking branch 'origin/4.0'

This commit is contained in:
Lipu Fei 2019-02-01 11:08:33 +01:00
commit efa26c8323
11 changed files with 333 additions and 75 deletions

View file

@ -9,7 +9,7 @@
"wide_lining": [31, 36, 39, 255],
"thick_lining": [255, 255, 255, 30],
"lining": [64, 69, 72, 255],
"viewport_overlay": [0, 6, 9, 222],
"viewport_overlay": [30, 36, 39, 255],
"primary": [12, 169, 227, 255],
"primary_hover": [48, 182, 231, 255],

View file

@ -146,7 +146,7 @@
"wide_lining": [245, 245, 245, 255],
"thick_lining": [127, 127, 127, 255],
"lining": [192, 193, 194, 255],
"viewport_overlay": [0, 0, 0, 192],
"viewport_overlay": [246, 246, 246, 255],
"primary": [50, 130, 255, 255],
"primary_shadow": [64, 47, 205, 255],
@ -598,10 +598,14 @@
"monitor_config_override_box": [1.0, 14.0],
"monitor_extruder_circle": [2.75, 2.75],
"monitor_text_line": [1.16, 1.16],
"monitor_text_line": [1.5, 1.5],
"monitor_text_line_large": [2.33, 2.33],
"monitor_thick_lining": [0.16, 0.16],
"monitor_corner_radius": [0.3, 0.3],
"monitor_shadow_radius": [0.4, 0.4],
"monitor_shadow_offset": [0.15, 0.15]
"monitor_shadow_offset": [0.15, 0.15],
"monitor_empty_state_offset": [5.6, 5.6],
"monitor_empty_state_size": [35.0, 25.0],
"monitor_external_link_icon": [1.16, 1.16]
}
}