diff options
Diffstat (limited to 'resources/themes')
17 files changed, 73 insertions, 98 deletions
diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index 520f863972..296d4d7145 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -6,6 +6,7 @@ "colors": { "main_background": [39, 44, 48, 255], + "detail_background": [63, 63, 63, 255], "message_background": [39, 44, 48, 255], "wide_lining": [31, 36, 39, 255], "thick_lining": [255, 255, 255, 60], @@ -151,6 +152,7 @@ "checkbox_border": [255, 255, 255, 38], "checkbox_border_hover": [255, 255, 255, 38], "checkbox_mark": [255, 255, 255, 181], + "checkbox_square": [118, 118, 118, 255], "checkbox_text": [255, 255, 255, 181], "tooltip": [39, 44, 48, 255], @@ -175,10 +177,6 @@ "quality_slider_available": [255, 255, 255, 255], - "toolbox_header_button_text_active": [255, 255, 255, 255], - "toolbox_header_button_text_inactive": [128, 128, 128, 255], - "toolbox_premium_packages_background": [57, 57, 57, 255], - "monitor_printer_family_tag": [86, 86, 106, 255], "monitor_text_disabled": [102, 102, 102, 255], "monitor_icon_primary": [229, 229, 229, 255], diff --git a/resources/themes/cura-light/icons/default/ArrowDown.svg b/resources/themes/cura-light/icons/default/ArrowDown.svg new file mode 100644 index 0000000000..ab5ea8e076 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ArrowDown.svg @@ -0,0 +1,3 @@ +<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"> +<path d="M12 21L4.293 13.293L5.707 11.8789L11 17.1719V3H13V17.1719L18.293 11.8789L19.707 13.293L12 21Z" /> +</svg> diff --git a/resources/themes/cura-light/icons/default/ArrowLeft.svg b/resources/themes/cura-light/icons/default/ArrowLeft.svg new file mode 100644 index 0000000000..d722b8ae8d --- /dev/null +++ b/resources/themes/cura-light/icons/default/ArrowLeft.svg @@ -0,0 +1,3 @@ +<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"> +<path d="M10.707 4.293L12.1211 5.707L6.8281 11H21V13H6.8281L12.1211 18.293L10.707 19.707L3 12L10.707 4.293Z" /> +</svg> diff --git a/resources/themes/cura-light/icons/default/Certified.svg b/resources/themes/cura-light/icons/default/Certified.svg new file mode 100644 index 0000000000..031011213a --- /dev/null +++ b/resources/themes/cura-light/icons/default/Certified.svg @@ -0,0 +1,3 @@ +<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"> +<path d="M12.0005 22.0122H12C11.07 21.9324 10.1927 21.5466 9.50539 20.915C9.21375 20.6772 8.89653 20.4726 8.55959 20.305C8.20295 20.1856 7.83416 20.1061 7.45999 20.0679C6.5274 20.0285 5.63416 19.6811 4.91999 19.0801C4.33502 18.3806 3.9948 17.509 3.95119 16.5981C3.90897 16.2037 3.82297 15.8153 3.69479 15.44C3.52022 15.0837 3.3065 14.748 3.05759 14.4391C2.44454 13.7645 2.06886 12.9079 1.98779 12C2.06757 11.07 2.45344 10.1927 3.08499 9.5054C3.32281 9.21376 3.5274 8.89653 3.69499 8.5596C3.81442 8.20295 3.89394 7.83417 3.93209 7.46C3.97149 6.52741 4.31886 5.63417 4.91989 4.92C5.61927 4.33475 6.49098 3.99449 7.40189 3.9512C7.79626 3.90907 8.1847 3.82308 8.55999 3.6948C8.91626 3.52044 9.25197 3.30689 9.56089 3.0581C10.2354 2.44481 11.092 2.06894 12 1.9878H12.001C12.9306 2.0678 13.8076 2.45365 14.4946 3.085C14.7862 3.32281 15.1035 3.52741 15.4404 3.695C15.7969 3.81446 16.1656 3.89405 16.5396 3.9323C17.4722 3.97169 18.3654 4.31907 19.0796 4.9201C19.6646 5.61964 20.0048 6.49125 20.0484 7.4021C20.0908 7.7964 20.1769 8.18476 20.3052 8.56C20.4798 8.91626 20.6935 9.25196 20.9424 9.5609C21.5557 10.2357 21.9315 11.0926 22.0124 12.0009C21.9325 12.9307 21.5466 13.8078 20.9152 14.495C20.6774 14.7866 20.4728 15.1039 20.3052 15.4408C20.1857 15.7973 20.1061 16.166 20.0679 16.54C20.0285 17.4726 19.6811 18.3658 19.0801 19.08C18.3807 19.6653 17.509 20.0055 16.5981 20.0488C16.2038 20.0912 15.8155 20.1775 15.4404 20.3061C15.0841 20.4805 14.7484 20.694 14.4395 20.9428C13.7649 21.5557 12.9084 21.9313 12.0005 22.0122ZM12 3.9878C11.5315 4.1067 11.1003 4.34102 10.7456 4.6694C10.309 5.01634 9.83223 5.30948 9.32559 5.5425C8.80239 5.73609 8.25776 5.86593 7.70349 5.9292C7.22072 5.94798 6.7503 6.08713 6.33499 6.334C6.07267 6.76174 5.9264 7.25048 5.91059 7.752C5.8537 8.28949 5.73005 8.81779 5.54249 9.3247C5.31656 9.81621 5.03019 10.2776 4.68999 10.6982C4.34665 11.0638 4.10465 11.5127 3.98789 12.0005C4.10683 12.4686 4.34097 12.8994 4.66899 13.2539C5.01645 13.6907 5.30978 14.168 5.54259 14.6753C5.73618 15.1983 5.86602 15.7428 5.92929 16.2969C5.94811 16.7796 6.08744 17.2499 6.33459 17.665C6.76211 17.9274 7.25071 18.0737 7.75209 18.0894C8.28958 18.1463 8.81789 18.2699 9.32479 18.4575C9.81631 18.6835 10.2777 18.9699 10.6983 19.3101C11.0639 19.6534 11.5128 19.8954 12.0006 20.0122C12.4691 19.8933 12.9003 19.659 13.255 19.3306C13.6916 18.9837 14.1684 18.6905 14.675 18.4575C15.1982 18.2639 15.7428 18.1341 16.2971 18.0708C16.7797 18.052 17.25 17.9128 17.6652 17.666C17.9275 17.2383 18.0738 16.7495 18.0896 16.248C18.1465 15.7105 18.2701 15.1822 18.4577 14.6753C18.6837 14.1838 18.9701 13.7224 19.3103 13.3018C19.6535 12.9363 19.8954 12.4876 20.0122 12C19.8933 11.5319 19.6591 11.1011 19.3311 10.7466C18.9836 10.3098 18.6903 9.83249 18.4575 9.3252C18.2639 8.80217 18.1341 8.25771 18.0708 7.7036C18.052 7.22089 17.9126 6.75057 17.6655 6.3355C17.238 6.0731 16.7494 5.92681 16.248 5.9111C15.7105 5.85421 15.1822 5.73055 14.6753 5.543C14.1838 5.31692 13.7224 5.03037 13.3018 4.69C12.9363 4.3467 12.4876 4.10467 12 3.9878ZM15.5361 15.5361L14.1221 14.1211C13.7026 14.5407 13.168 14.8265 12.5861 14.9423C12.0041 15.0581 11.4009 14.9987 10.8526 14.7717C10.3044 14.5447 9.83586 14.1601 9.50619 13.6668C9.17652 13.1734 9.00055 12.5934 9.00055 12C9.00055 11.4066 9.17652 10.8266 9.50619 10.3332C9.83586 9.83986 10.3044 9.45535 10.8526 9.2283C11.4009 9.00126 12.0041 8.94188 12.5861 9.05769C13.168 9.1735 13.7026 9.45928 14.1221 9.8789L15.5361 8.4639C14.8368 7.7648 13.9458 7.28875 12.976 7.09596C12.0061 6.90316 11.0009 7.00227 10.0873 7.38076C9.1738 7.75924 8.393 8.4001 7.84367 9.22232C7.29433 10.0445 7.00113 11.0112 7.00113 12C7.00113 12.9888 7.29433 13.9555 7.84367 14.7777C8.393 15.5999 9.1738 16.2408 10.0873 16.6192C11.0009 16.9977 12.0061 17.0968 12.976 16.904C13.9458 16.7112 14.8368 16.2352 15.5361 15.5361Z" /> +</svg> diff --git a/resources/themes/cura-light/icons/default/DocumentFilled.svg b/resources/themes/cura-light/icons/default/DocumentFilled.svg new file mode 100644 index 0000000000..bb654fea33 --- /dev/null +++ b/resources/themes/cura-light/icons/default/DocumentFilled.svg @@ -0,0 +1,3 @@ +<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"> +<path d="M14 2H7C6.20435 2 5.44129 2.31607 4.87868 2.87868C4.31607 3.44129 4 4.20435 4 5V19C4 19.7956 4.31607 20.5587 4.87868 21.1213C5.44129 21.6839 6.20435 22 7 22H17C17.7956 22 18.5587 21.6839 19.1213 21.1213C19.6839 20.5587 20 19.7956 20 19V8L14 2ZM14 4.8284L17.1716 8H14V4.8284ZM18 20H6V4H12V10H18V20ZM16 14H8V12H16V14ZM13 18H8V16H13V18Z" /> +</svg> diff --git a/resources/themes/cura-light/icons/default/Download.svg b/resources/themes/cura-light/icons/default/Download.svg new file mode 100644 index 0000000000..cbe0da2a99 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Download.svg @@ -0,0 +1,3 @@ +<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M18.707 10.293L12 17L5.293 10.293L6.707 8.8789L11 13.1719V3H13V13.1719L17.293 8.8789L18.707 10.293ZM21 19H3V21H21V19Z" fill="#000E1A"/> +</svg> diff --git a/resources/themes/cura-light/icons/default/Globe.svg b/resources/themes/cura-light/icons/default/Globe.svg new file mode 100644 index 0000000000..4d955e9615 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Globe.svg @@ -0,0 +1,3 @@ +<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"> +<path d="M12 2C10.0222 2 8.08879 2.58649 6.4443 3.6853C4.79981 4.78412 3.51809 6.3459 2.76121 8.17317C2.00433 10.0004 1.8063 12.0111 2.19215 13.9509C2.578 15.8907 3.53041 17.6725 4.92894 19.0711C6.32746 20.4696 8.10929 21.422 10.0491 21.8079C11.9889 22.1937 13.9996 21.9957 15.8268 21.2388C17.6541 20.4819 19.2159 19.2002 20.3147 17.5557C21.4135 15.9112 22 13.9778 22 12C22 10.6868 21.7413 9.38642 21.2388 8.17317C20.7363 6.95991 19.9997 5.85752 19.0711 4.92893C18.1425 4.00035 17.0401 3.26375 15.8268 2.7612C14.6136 2.25866 13.3132 2 12 2ZM19.9309 11H16.9594C16.8101 8.655 16.0204 6.39588 14.6763 4.4685C16.0708 4.96434 17.3003 5.83742 18.228 6.99057C19.1557 8.14372 19.7452 9.5317 19.9309 11ZM9.06 13H14.94C14.7622 15.4921 13.7228 17.8448 12 19.6543C10.2772 17.8448 9.2378 15.4921 9.06 13ZM9.06 11C9.23776 8.50785 10.2772 6.15522 12 4.3457C13.7226 6.15537 14.762 8.50792 14.94 11H9.06ZM9.3241 4.4685C7.9799 6.39584 7.19008 8.65496 7.0406 11H4.0691C4.25479 9.5317 4.8443 8.14372 5.77201 6.99057C6.69972 5.83742 7.92924 4.96434 9.3237 4.4685H9.3241ZM4.0691 13H7.0406C7.18996 15.345 7.97964 17.6041 9.3237 19.5315C7.92924 19.0357 6.69972 18.1626 5.77201 17.0094C4.8443 15.8563 4.25479 14.4683 4.0691 13ZM14.6763 19.5315C16.0204 17.6041 16.8101 15.345 16.9594 13H19.9309C19.7452 14.4683 19.1557 15.8563 18.228 17.0094C17.3003 18.1626 16.0708 19.0357 14.6763 19.5315Z" /> +</svg>
\ No newline at end of file diff --git a/resources/themes/cura-light/icons/default/Settings.svg b/resources/themes/cura-light/icons/default/Settings.svg new file mode 100644 index 0000000000..feb0ab0cc8 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Settings.svg @@ -0,0 +1,3 @@ +<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M19 12C19 11.895 18.9888 11.7928 18.9843 11.6889L21.2354 9.9966L18.3525 5.0034L15.7525 6.1005C15.5837 5.9927 15.4112 5.8905 15.2325 5.7972L14.8828 3H9.1172L8.7672 5.7972C8.5855 5.8923 8.4096 5.9964 8.2372 6.1066L5.6472 5.0034L2.7646 9.9966L5.0152 11.7C5.0109 11.8 5 11.8988 5 12C5 12.105 5.0112 12.2072 5.0157 12.3111L2.7646 14.0034L5.6475 18.9966L8.2475 17.8994C8.4163 18.0072 8.5888 18.1094 8.7675 18.2028L9.1172 21H14.8828L15.2328 18.2028C15.4145 18.1077 15.5904 18.0036 15.7628 17.8934L18.3528 18.9966L21.2357 14.0034L18.9848 12.3C18.9891 12.2 19 12.1012 19 12ZM18.62 14.5327L17.5028 16.4673L15.4513 15.6018C14.8702 16.1531 14.1648 16.5564 13.3949 16.7773L13.1172 19H10.8828L10.605 16.7773C9.83505 16.5564 9.12968 16.1531 8.5486 15.6018L6.4971 16.4673L5.38 14.5327L7.1579 13.1865C6.94752 12.4095 6.94752 11.5905 7.1579 10.8135L5.38 9.4673L6.4971 7.5327L8.5486 8.3982C9.12968 7.84686 9.83505 7.44364 10.605 7.2227L10.8828 5H13.1172L13.395 7.2227C14.1649 7.44364 14.8703 7.84686 15.4514 8.3982L17.5029 7.5327L18.62 9.4673L16.8421 10.8135C17.0525 11.5905 17.0525 12.4095 16.8421 13.1865L18.62 14.5327ZM12 9C11.4067 9 10.8266 9.17595 10.3333 9.50559C9.83994 9.83524 9.45542 10.3038 9.22836 10.8519C9.0013 11.4001 8.94189 12.0033 9.05764 12.5853C9.1734 13.1672 9.45912 13.7018 9.87868 14.1213C10.2982 14.5409 10.8328 14.8266 11.4147 14.9424C11.9967 15.0581 12.5999 14.9987 13.148 14.7716C13.6962 14.5446 14.1648 14.1601 14.4944 13.6667C14.8241 13.1734 15 12.5933 15 12C14.9991 11.2046 14.6828 10.4421 14.1204 9.87964C13.5579 9.31722 12.7954 9.00087 12 9ZM12 13C11.8022 13 11.6089 12.9414 11.4444 12.8315C11.28 12.7216 11.1518 12.5654 11.0761 12.3827C11.0004 12.2 10.9806 11.9989 11.0192 11.8049C11.0578 11.6109 11.153 11.4327 11.2929 11.2929C11.4327 11.153 11.6109 11.0578 11.8049 11.0192C11.9989 10.9806 12.2 11.0004 12.3827 11.0761C12.5654 11.1518 12.7216 11.28 12.8315 11.4444C12.9413 11.6089 13 11.8022 13 12C12.9998 12.2651 12.8943 12.5194 12.7068 12.7068C12.5194 12.8943 12.2651 12.9998 12 13Z" fill="#000E1A"/> +</svg> diff --git a/resources/themes/cura-light/icons/default/ShoppingCart.svg b/resources/themes/cura-light/icons/default/ShoppingCart.svg new file mode 100644 index 0000000000..b3fece3fab --- /dev/null +++ b/resources/themes/cura-light/icons/default/ShoppingCart.svg @@ -0,0 +1,3 @@ +<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"> +<path d="M5.99631 13C5.99631 13.7956 6.31238 14.5587 6.87499 15.1213C7.4376 15.6839 8.20066 16 8.99631 16H17.9963C18.792 16 19.555 15.6839 20.1176 15.1213C20.6802 14.5587 20.9963 13.7956 20.9963 13V7H7.99631V4H1.99631V6H5.99631V13ZM18.9963 9V14H7.99631V9H18.9963ZM21.9963 19C21.9963 19.3956 21.879 19.7822 21.6592 20.1111C21.4395 20.44 21.1271 20.6964 20.7617 20.8478C20.3962 20.9991 19.9941 21.0387 19.6061 20.9616C19.2182 20.8844 18.8618 20.6939 18.5821 20.4142C18.3024 20.1345 18.1119 19.7781 18.0347 19.3902C17.9576 19.0022 17.9972 18.6001 18.1485 18.2346C18.2999 17.8692 18.5563 17.5568 18.8852 17.3371C19.2141 17.1173 19.6007 17 19.9963 17C20.5266 17.0006 21.0349 17.2115 21.4098 17.5865C21.7848 17.9614 21.9957 18.4698 21.9963 19ZM9.99631 19C9.99631 19.3956 9.87901 19.7822 9.65925 20.1111C9.43948 20.44 9.12713 20.6964 8.76167 20.8478C8.39622 20.9991 7.99409 21.0387 7.60613 20.9616C7.21816 20.8844 6.8618 20.6939 6.58209 20.4142C6.30239 20.1345 6.11191 19.7781 6.03474 19.3902C5.95757 19.0022 5.99717 18.6001 6.14855 18.2346C6.29992 17.8692 6.55627 17.5568 6.88517 17.3371C7.21407 17.1173 7.60074 17 7.99631 17C8.52655 17.0006 9.03491 17.2115 9.40985 17.5865C9.78479 17.9614 9.9957 18.4698 9.99631 19Z" /> +</svg> diff --git a/resources/themes/cura-light/icons/default/Spinner.svg b/resources/themes/cura-light/icons/default/Spinner.svg new file mode 100644 index 0000000000..22a8f4dfd9 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Spinner.svg @@ -0,0 +1,3 @@ +<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"> +<path d="M22 12C22 14.6522 20.9464 17.1957 19.0711 19.0711C17.1957 20.9464 14.6522 22 12 22C9.34784 22 6.8043 20.9464 4.92893 19.0711C3.05357 17.1957 2 14.6522 2 12H4C4 13.5823 4.46919 15.129 5.34824 16.4446C6.22729 17.7602 7.47672 18.7855 8.93853 19.391C10.4003 19.9965 12.0089 20.155 13.5607 19.8463C15.1126 19.5376 16.538 18.7757 17.6569 17.6569C18.7757 16.538 19.5376 15.1126 19.8463 13.5607C20.155 12.0089 19.9965 10.4003 19.391 8.93853C18.7855 7.47672 17.7602 6.22729 16.4446 5.34824C15.129 4.46919 13.5823 4 12 4V2C14.6508 2.00436 17.1918 3.05933 19.0662 4.93375C20.9407 6.80817 21.9956 9.34917 22 12Z"/> +</svg> diff --git a/resources/themes/cura-light/icons/high/Certificate.svg b/resources/themes/cura-light/icons/high/Certificate.svg new file mode 100644 index 0000000000..b588bddd8b --- /dev/null +++ b/resources/themes/cura-light/icons/high/Certificate.svg @@ -0,0 +1,3 @@ +<svg width="48" height="48" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"> +<path d="M39.0176 13.0001H9.01764V11.0001H39.0176V13.0001ZM24.0176 16.0001H9.01764V18.0001H24.0176V16.0001ZM20.0176 21.0001H9.01764V23.0001H20.0176V21.0001ZM12.0176 26.0001H9.01764V28.0001H12.0176V26.0001ZM43.9576 5.06006V36.9401H35.6976V43.3901L31.6976 42.0501L27.6976 43.3901V36.9401H4.07764V5.06006H43.9576ZM33.6976 33.1401L31.7276 33.6801L29.6976 33.1501V40.6101L31.6976 39.9501L33.6976 40.6101V33.1401ZM36.2876 28.9501L36.9776 26.3001L36.2576 23.6601L34.3176 21.7301L31.6676 21.0401L29.0276 21.7601L27.0976 23.7001L26.4076 26.3501L27.1276 28.9901L29.0676 30.9201L31.7176 31.6101L34.3576 30.8901L36.2876 28.9501ZM42.0776 6.94006H5.95764V35.0601H27.6976V32.3701L25.3376 30.0301L24.3376 26.3601L25.3076 22.6701L27.9876 19.9701L31.6576 18.9601L35.3476 19.9301L38.0476 22.6201L39.0576 26.2901L38.0876 29.9801L35.6976 32.3801V35.0601H42.0776V6.94006Z" fill="#000E1A"/> +</svg> diff --git a/resources/themes/cura-light/icons/high/Settings.svg b/resources/themes/cura-light/icons/high/Settings.svg new file mode 100644 index 0000000000..1cd2ff324e --- /dev/null +++ b/resources/themes/cura-light/icons/high/Settings.svg @@ -0,0 +1,3 @@ +<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M31.6058 21.5314C31.4745 21.131 31.3116 20.7417 31.1185 20.3671C30.3501 18.8691 29.131 17.6501 27.6331 16.8816C26.5097 16.3023 25.2641 16.0001 24.0001 16.0001C22.7361 16.0001 21.4905 16.3023 20.3671 16.8816C18.8691 17.6501 17.65 18.8692 16.8815 20.3672C16.3021 21.4906 15.9998 22.7362 15.9998 24.0002C15.9998 25.2642 16.3021 26.5098 16.8815 27.6332C17.65 29.1311 18.869 30.3502 20.367 31.1186C21.4904 31.698 22.736 32.0003 24 32.0003C25.264 32.0003 26.5096 31.698 27.633 31.1186C29.1309 30.3502 30.3499 29.1312 31.1183 27.6333C31.5999 26.6993 31.8911 25.6789 31.9747 24.6314C32.0584 23.5839 31.933 22.5302 31.6057 21.5316L31.6058 21.5314ZM28.3781 28.09C28.2852 28.1894 28.189 28.2855 28.0897 28.3784C27.0333 29.3689 25.6529 29.9417 24.2056 29.99C24.1367 29.9923 24.0694 30 24 30C23.9306 30 23.8633 29.9919 23.7944 29.99C22.3469 29.9416 20.9664 29.3688 19.91 28.3781C19.8106 28.2852 19.7145 28.189 19.6216 28.0897C18.6312 27.0335 18.0585 25.6533 18.01 24.2062C18.0081 24.1371 18 24.07 18 24C18 23.93 18.0081 23.8629 18.01 23.7938C18.0585 22.3466 18.6314 20.9663 19.6219 19.91C19.7148 19.8106 19.811 19.7145 19.9103 19.6216C20.9665 18.6312 22.3467 18.0585 23.7938 18.01C23.8629 18.0077 23.9304 18 24 18C24.0696 18 24.1371 18.0081 24.2062 18.01C25.6534 18.0585 27.0337 18.6314 28.09 19.6219C28.1894 19.7148 28.2855 19.811 28.3784 19.9103C29.3689 20.9667 29.9417 22.3471 29.99 23.7944C29.9923 23.8633 30 23.9306 30 24C30 24.0694 29.9919 24.1367 29.99 24.2056C29.9416 25.6531 29.3688 27.0336 28.3781 28.09ZM42 27.8467V20.1528L37.193 19.3516C37.0257 18.8773 36.8327 18.4124 36.6149 17.9591L39.4482 13.9927L34.0082 8.5518L30.0413 11.3851C29.5879 11.1673 29.1229 10.9742 28.6485 10.8069L27.8467 6H20.1528L19.3516 10.807C18.8774 10.9743 18.4126 11.1673 17.9593 11.385L13.9927 8.5518L8.5518 13.9927L11.385 17.9593C11.1673 18.4126 10.9743 18.8774 10.807 19.3516L6 20.1528V27.8467L10.8069 28.6481C10.9742 29.1225 11.1673 29.5875 11.3851 30.0409L8.5518 34.0078L13.9927 39.4478L17.9591 36.6145C18.4124 36.8323 18.8773 37.0253 19.3516 37.1926L20.1528 42H27.8467L28.6481 37.1931C29.1226 37.0257 29.5876 36.8327 30.0411 36.6149L34.0078 39.4482L39.4478 34.0082L36.6145 30.0415C36.8323 29.588 37.0253 29.123 37.1927 28.6485L42 27.8467ZM35.6375 26.88C35.5326 27.305 35.4043 27.7238 35.2532 28.1346C35.1409 28.4401 35.0184 28.7399 34.8824 29.0331C34.6981 29.4301 34.4921 29.8166 34.2654 30.191L35.52 31.947L36.8372 33.791L33.791 36.8369L31.947 35.52L30.1912 34.2657C29.8168 34.4924 29.4303 34.6984 29.0333 34.8827C28.74 35.0186 28.4403 35.1412 28.1348 35.2535C27.724 35.4046 27.3052 35.5329 26.8802 35.6378L26.5264 37.7609L26.1533 40H21.8472L21.474 37.7607L21.12 35.6376C20.695 35.5326 20.2761 35.4043 19.8652 35.2532C19.5594 35.1408 19.2597 35.0182 18.9662 34.8823C18.5692 34.6978 18.1825 34.4917 17.808 34.265L16.052 35.5191L14.2083 36.8359L11.1641 33.791L12.4808 31.9476L13.735 30.1918C13.5081 29.8173 13.302 29.4305 13.1176 29.0333C12.9816 28.7399 12.8591 28.4402 12.7467 28.1345C12.5956 27.7238 12.4674 27.3051 12.3625 26.8802L10.2394 26.5264L8 26.1533V21.8472L10.2393 21.474L12.3624 21.1202C12.4673 20.6953 12.5956 20.2764 12.7466 19.8656C12.8591 19.5598 12.9817 19.2599 13.1177 18.9664C13.3021 18.5693 13.5082 18.1825 13.735 17.808L12.481 16.0522L11.1641 14.2085L14.2085 11.1641L16.0522 12.481L17.808 13.735C18.1825 13.5082 18.5693 13.3021 18.9664 13.1177C19.2599 12.9817 19.5598 12.8591 19.8656 12.7466C20.2764 12.5956 20.6953 12.4673 21.1202 12.3624L21.474 10.2393L21.8472 8H26.1533L26.5264 10.2394L26.8802 12.3625C27.3051 12.4673 27.7238 12.5955 28.1345 12.7466C28.4401 12.859 28.7399 12.9816 29.0333 13.1176C29.4305 13.302 29.8173 13.5081 30.1918 13.735L31.9476 12.4808L33.791 11.1641L36.8359 14.2085L35.5191 16.0522L34.265 17.8082C34.4918 18.1827 34.6979 18.5693 34.8823 18.9664C35.0183 19.2599 35.1409 19.5597 35.2533 19.8654C35.4044 20.2763 35.5327 20.6952 35.6376 21.1202L37.7607 21.474L40 21.8472V26.1533L37.7606 26.5264L35.6375 26.88Z" fill="#000E1A"/> +</svg> diff --git a/resources/themes/cura-light/icons/low/Check.svg b/resources/themes/cura-light/icons/low/Check.svg index a20a9b1b70..9630b70052 100644 --- a/resources/themes/cura-light/icons/low/Check.svg +++ b/resources/themes/cura-light/icons/low/Check.svg @@ -1,3 +1,3 @@ -<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"> -<path d="M10.7 13.3L7.4 10L6 11.4L10.7 16.1L17.4 9.4L16 8L10.7 13.3Z"/> +<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M5 9.41397L2.293 6.70697L3.707 5.29297L5 6.58597L8.293 3.29297L9.707 4.70697L5 9.41397Z" fill="#000E1A"/> </svg> diff --git a/resources/themes/cura-light/icons/low/CheckBoxFill.svg b/resources/themes/cura-light/icons/low/CheckBoxFill.svg new file mode 100644 index 0000000000..bfbb6d87f2 --- /dev/null +++ b/resources/themes/cura-light/icons/low/CheckBoxFill.svg @@ -0,0 +1,4 @@ +<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg"> +<rect width="12" height="12" fill="white"/> +<rect x="1" y="1" width="10" height="10" fill="#B4B4B4"/> +</svg> diff --git a/resources/themes/cura-light/icons/low/CheckThin.svg b/resources/themes/cura-light/icons/low/CheckThin.svg new file mode 100644 index 0000000000..a20a9b1b70 --- /dev/null +++ b/resources/themes/cura-light/icons/low/CheckThin.svg @@ -0,0 +1,3 @@ +<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"> +<path d="M10.7 13.3L7.4 10L6 11.4L10.7 16.1L17.4 9.4L16 8L10.7 13.3Z"/> +</svg> diff --git a/resources/themes/cura-light/styles.qml b/resources/themes/cura-light/styles.qml index 1320b54f37..e497215c0c 100755 --- a/resources/themes/cura-light/styles.qml +++ b/resources/themes/cura-light/styles.qml @@ -408,7 +408,7 @@ QtObject color: (control.hovered || control._hovered) ? UM.Theme.getColor("checkbox_hover") : (control.enabled ? UM.Theme.getColor("checkbox") : UM.Theme.getColor("checkbox_disabled")) Behavior on color { ColorAnimation { duration: 50; } } - + anchors.verticalCenter: parent.verticalCenter radius: control.exclusiveGroup ? Math.round(UM.Theme.getSize("checkbox").width / 2) : UM.Theme.getSize("checkbox_radius").width border.width: UM.Theme.getSize("default_lining").width @@ -418,11 +418,11 @@ QtObject { anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter - width: Math.round(parent.width / 2.5) - height: Math.round(parent.height / 2.5) + height: UM.Theme.getSize("checkbox_mark").height + width: UM.Theme.getSize("checkbox_mark").width sourceSize.height: width color: UM.Theme.getColor("checkbox_mark") - source: control.exclusiveGroup ? UM.Theme.getIcon("Dot") : UM.Theme.getIcon("Check") + source: control.exclusiveGroup ? UM.Theme.getIcon("Dot") : UM.Theme.getIcon("Check", "low") opacity: control.checked Behavior on opacity { NumberAnimation { duration: 100; } } } @@ -460,8 +460,8 @@ QtObject { anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter - width: Math.round(parent.width / 2.5) - height: Math.round(parent.height / 2.5) + height: UM.Theme.getSize("checkbox_mark").height + width: UM.Theme.getSize("checkbox_mark").width sourceSize.height: width color: UM.Theme.getColor("checkbox_mark") source: @@ -472,7 +472,7 @@ QtObject } else { - return control.exclusiveGroup ? UM.Theme.getIcon("Dot", "low") : UM.Theme.getIcon("Check"); + return control.exclusiveGroup ? UM.Theme.getIcon("Dot", "low") : UM.Theme.getIcon("Check", "low"); } } opacity: control.checked @@ -602,62 +602,6 @@ QtObject } } - property Component toolbox_action_button: Component - { - ButtonStyle - { - background: Rectangle - { - implicitWidth: UM.Theme.getSize("toolbox_action_button").width - implicitHeight: UM.Theme.getSize("toolbox_action_button").height - color: - { - if (control.installed) - { - return UM.Theme.getColor("action_button_disabled"); - } - else - { - if (control.hovered) - { - return UM.Theme.getColor("primary_hover"); - } - else - { - return UM.Theme.getColor("primary"); - } - } - - } - } - label: Label - { - text: control.text - color: - { - if (control.installed) - { - return UM.Theme.getColor("action_button_disabled_text"); - } - else - { - if (control.hovered) - { - return UM.Theme.getColor("button_text_hover"); - } - else - { - return UM.Theme.getColor("button_text"); - } - } - } - verticalAlignment: Text.AlignVCenter - horizontalAlignment: Text.AlignHCenter - font: UM.Theme.getFont("default_bold") - } - } - } - property Component monitor_button_style: Component { ButtonStyle diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index f59231d960..8b686b83f0 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -173,12 +173,13 @@ "colors": { "main_background": [255, 255, 255, 255], + "detail_background": [243, 243, 243, 255], "wide_lining": [245, 245, 245, 255], "thick_lining": [180, 180, 180, 255], "lining": [192, 193, 194, 255], "viewport_overlay": [246, 246, 246, 255], - "primary": [50, 130, 255, 255], + "primary": [25, 110, 240, 255], "primary_shadow": [64, 47, 205, 255], "primary_hover": [48, 182, 231, 255], "primary_text": [255, 255, 255, 255], @@ -349,11 +350,12 @@ "checkbox": [255, 255, 255, 255], "checkbox_hover": [255, 255, 255, 255], - "checkbox_border": [199, 199, 199, 255], - "checkbox_border_hover": [50, 130, 255, 255], + "checkbox_border": [180, 180, 180, 255], + "checkbox_border_hover": [25, 110, 240, 255], "checkbox_mark": [35, 35, 35, 255], + "checkbox_square": [180, 180, 180, 255], "checkbox_disabled": [223, 223, 223, 255], - "checkbox_text": [35, 35, 35, 255], + "checkbox_text": [0, 12, 26, 255], "tooltip": [25, 25, 25, 255], "tooltip_text": [255, 255, 255, 255], @@ -427,9 +429,6 @@ "printer_config_matched": [50, 130, 255, 255], "printer_config_mismatch": [127, 127, 127, 255], - "toolbox_header_button_text_inactive": [0, 0, 0, 255], - "toolbox_premium_packages_background": [240, 240, 240, 255], - "favorites_header_bar": [245, 245, 245, 255], "favorites_header_hover": [245, 245, 245, 255], "favorites_header_text": [31, 36, 39, 255], @@ -556,12 +555,17 @@ "standard_list_lineheight": [1.5, 1.5], "standard_arrow": [1.0, 1.0], + "card": [25.0, 10], + "card_icon": [6.0, 6.0], + "card_tiny_icon": [1.5, 1.5], + "button": [4, 4], "button_icon": [2.5, 2.5], "button_lining": [0, 0], "action_button": [15.0, 2.5], - "action_button_icon": [1.0, 1.0], + "action_button_icon": [1.5, 1.5], + "action_button_icon_small": [1.0, 1.0], "action_button_radius": [0.15, 0.15], "dialog_primary_button_padding": [3.0, 0], @@ -604,8 +608,11 @@ "layerview_row": [11.0, 1.5], "layerview_row_spacing": [0.0, 0.5], - "checkbox": [1.5, 1.5], - "checkbox_radius": [0.08, 0.08], + "checkbox": [1.33, 1.33], + "checkbox_mark": [1, 1], + "checkbox_square": [0.83, 0.83], + "checkbox_radius": [0.25, 0.25], + "checkbox_label_padding": [0.5, 0.5], "tooltip": [20.0, 10.0], "tooltip_margins": [1.0, 1.0], @@ -641,24 +648,6 @@ "build_plate_selection_size": [15, 5], "objects_menu_button": [0.3, 2.7], - "toolbox_thumbnail_small": [6.0, 6.0], - "toolbox_thumbnail_medium": [8.0, 8.0], - "toolbox_thumbnail_large": [12.0, 10.0], - "toolbox_footer": [1.0, 4.5], - "toolbox_footer_button": [8.0, 2.5], - "toolbox_header_tab": [12.0, 4.0], - "toolbox_detail_header": [1.0, 14.0], - "toolbox_back_column": [6.0, 1.0], - "toolbox_back_button": [6.0, 2.0], - "toolbox_installed_tile": [1.0, 8.0], - "toolbox_property_label": [1.0, 2.0], - "toolbox_heading_label": [1.0, 3.8], - "toolbox_header": [1.0, 4.0], - "toolbox_header_highlight": [0.25, 0.25], - "toolbox_chart_row": [1.0, 2.0], - "toolbox_action_button": [8.0, 2.5], - "toolbox_loader": [2.0, 2.0], - "notification_icon": [1.5, 1.5], "avatar_image": [6.8, 6.8], @@ -681,6 +670,10 @@ "table_row": [2.0, 2.0], "welcome_wizard_content_image_big": [18, 15], - "welcome_wizard_cloud_content_image": [4, 4] + "welcome_wizard_cloud_content_image": [4, 4], + + "banner_icon_size": [2.0, 2.0], + + "marketplace_large_icon": [4.0, 4.0] } } |
