Skip to content

Commit e741c28

Browse files
MAKOMOMAKOMO
committed
- fixed DMR15 MODBUS setup
- optimized icons in scale widget - fixed events editor icon path on Windows
1 parent e51dcec commit e741c28

4 files changed

Lines changed: 34 additions & 29 deletions

File tree

‎src/artisanlib/events_editor_style.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
min-width: 80px;
7272
}}
7373
QComboBox:hover {{
74-
background-color: '#F5F5F5';
74+
background-color: #F5F5F5;
7575
}}
7676
QComboBox::drop-down {{
7777
subcontrol-origin: padding;
@@ -89,15 +89,15 @@
8989
width: 30px;
9090
}}
9191
QComboBox::drop-down:button {{
92-
background-color: '#E9E9E9';
92+
background-color: #E9E9E9;
9393
width: 30px;
9494
}}
9595
QComboBox::drop-down:pressed {{
96-
background-color: '#A9A9A9';
96+
background-color: #A9A9A9;
9797
width: 30px;
9898
}}
9999
QComboBox::drop-down:hover {{
100-
background-color: '#F5F5F5';
100+
background-color: #F5F5F5;
101101
width: 30px;
102102
}}
103103
QComboBox QAbstractItemView {{

‎src/artisanlib/main.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6086,7 +6086,8 @@ def updateCanvasColors(self, checkColors:bool=True) -> None:
60866086
self.EventsGroupLayout.setStyleSheet(artisan_events_editor_style.format(
60876087
background_color = rgba_colorname2argb_colorname(self.qmc.palette['background']),
60886088
line_edit_color = line_edit_color,
6089-
down_arrow_icon_path = os.path.join(getResourcePath(),'Icons','arrow-down-01-stroke-rounded.svg')))
6089+
# path in style sheets needs always to use forward slashes, also on Windows
6090+
down_arrow_icon_path = Path.as_posix(Path(os.path.join(getResourcePath(),'Icons','arrow-down-01-stroke-rounded.svg')))))
60906091

60916092

60926093
if current_background_color is None or current_background_color != str(canvas_color) or (whitep and self.qmc.palette['messages'] != '#ffffff'): # canvas color did not change, we do not need to redo the navigation bar

‎src/includes/Machines/Dutch Master Roaster/DMR15-A.aset‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ extraeventsvisibility=1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1
6060
marklastbuttonpressed=true
6161
showextrabuttontooltips=false
6262

63-
6463
[Modbus]
6564
IP_retries=1
6665
IP_timeout=0.3
@@ -166,6 +165,30 @@ input8Signed=false
166165
input8bcd=false
167166
input8code=3
168167
input8deviceId=1
168+
input8div=0
169+
input8float=false
170+
input8mode=
171+
input8register=32790
172+
input9BCDsAsInt=false
173+
input9FloatsAsInt=false
174+
input9Signed=false
175+
input9bcd=false
176+
input9code=3
177+
input9deviceId=1
178+
input9div=1
179+
input9float=false
180+
input9mode=
181+
input9register=32772
182+
modbus_serial_connect_delay=0.5
183+
optimizer=false
184+
parity=N
185+
port=502
186+
serial_readRetries=1
187+
stopbits=1
188+
timeout=0.4
189+
type=3
190+
wordorderLittle=true
191+
169192

170193
[Sliders]
171194
ModeTempSliders=C

‎src/includes/scale_widget.tpl‎

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,29 +1374,10 @@ Receives data in the shape of
13741374
</div>
13751375
<div class="scale-icon" id="scale_icon_initial">
13761376
<div style="padding: 10%;">
1377-
<svg id="coffee_svg" xmlns="http://www.w3.org/2000/svg" height="100%" width="100%" viewBox="0 0 24 24" version="1.1">
1378-
<path d="m 18.058268,1.3537015 -0.21609,2.2832667 c -0.350574,3.7082256 -2.763274,6.9876308 -5.839799,9.2243758 l -0.01822,0.01306 -0.01562,0.01306 C 9.2104639,15.051029 6.6207441,18.291377 6.7147194,22.2626 l 0.015621,0.656081 0.5779685,0.309812 c 2.076787,1.113254 4.4964181,0.917066 6.4774981,0.0755 l 0.0052,-0.0027 0.0052,-0.0027 c 4.438967,-1.934291 7.322209,-6.276217 8.284223,-10.796629 l 0.0027,-0.0052 v -0.0052 C 22.73096,9.3217298 22.420375,5.4379502 19.731748,2.9204784 Z m 1.327771,5.5220153 c 0.601562,1.61051 0.850323,3.3997742 0.492058,5.1574452 -0.830702,3.903108 -3.362184,7.623064 -6.982566,9.200649 -1.238328,0.523622 -2.61278,0.549269 -3.8115311,0.169222 0.280726,-2.617579 2.0719881,-5.014949 4.2748761,-6.743028 l -0.03124,0.02343 c 2.660501,-1.934292 4.936436,-4.619453 6.058275,-7.8078152 z M 12.966393,0.01818579 c -0.925104,0.067731 -1.829386,0.2994813 -2.660768,0.637859 l -0.0079,0.0026 -0.0079,0.0026 C 5.8899855,2.5298191 3.0096757,6.7805688 1.9799463,11.215137 l -0.0026,0.0027 v 0.0052 c -0.7172515,3.202891 -0.4800738,7.145722 2.1868921,9.755303 l 1.7131498,1.676626 0.197868,-2.387373 c 0.2431628,-2.956689 2.2018207,-5.63092 4.6081218,-7.581341 l -0.04426,0.03644 c 2.697958,-1.967483 5.161311,-4.6391812 6.137054,-8.0912075 l 0.02343,-0.088518 0.0104,-0.088518 c 0.02,-0.178251 0.2826,-0.8864649 0.393237,-1.6766572 0.05465,-0.3950962 0.08931,-0.8748368 -0.161291,-1.4033646 C 16.798013,0.85936199 16.2115,0.47213049 15.640983,0.34869619 14.757216,0.06263809 13.85212,-0.04679981 12.967019,0.01811639 Z m 0.151,2.25207481 c 0.639112,-0.047574 1.26772,0.025272 1.848448,0.2160899 -0.05467,0.3603986 -0.307026,0.9563754 -0.393124,1.7104839 l 0.03384,-0.1770335 C 13.821408,6.8004038 11.748646,9.1257928 9.3110199,10.903459 l -0.02343,0.01562 -0.02343,0.01822 c -1.947221,1.578252 -3.699161,3.649708 -4.6706391,6.0896 -0.5950036,-1.664229 -0.8216107,-3.509611 -0.4191565,-5.308472 1.894e-4,-8.46e-4 -1.897e-4,-0.0017 0,-0.0027 0.8913924,-3.8295272 3.4173686,-7.4559072 6.9929627,-8.9768409 0.0017,-7.611e-4 0.0035,-0.00184 0.0052,-0.0026 0.629168,-0.2535333 1.290328,-0.4166905 1.944823,-0.4653444 z"
1379-
style="stroke-width:1.33298" />
1380-
</svg>
1381-
<svg id="coffee_svg_dark" xmlns="http://www.w3.org/2000/svg" height="100%" width="100%" viewBox="0 0 24 24" version="1.1">
1382-
<path d="m 13.029677,0.03317241 c -0.923629,0.06770452 -1.826471,0.29936172 -2.656529,0.63760445 l -0.0079,0.0026 -0.0079,0.0026 C 5.964477,2.5438037 3.0887537,6.7928576 2.0606635,11.225656 l -0.00261,0.0027 v 0.0052 c -0.7161051,3.201616 -0.4793049,7.142872 2.1834152,9.751412 l 1.2108023,1.300795 0.1350989,-2.761582 c 0.2427759,-2.955454 2.0916797,-5.467134 4.4941481,-7.416777 v 0 c 2.693664,-1.966733 5.241247,-4.1860974 6.215437,-7.6367467 0.464003,-1.5651538 0.550527,-1.668068 0.217505,-0.9527232 0,0 0.258352,-0.3525437 0.183175,-0.9763056 C 16.752195,2.1466589 16.685955,1.8691394 16.474153,1.2638468 16.288365,0.90293534 16.070465,0.53238355 15.700013,0.36359792 14.93301,-0.03784328 13.913996,-0.03174027 13.030305,0.03315 Z"
1383-
style="stroke-width:1.35914" />
1384-
<path d="m 17.968345,1.7142133 -0.216522,2.2469151 c -0.351277,3.6491875 -2.76882,6.8763806 -5.851519,9.0775156 l -0.01825,0.01286 -0.01567,0.01286 c -2.7636114,2.129121 -5.3585289,5.317878 -5.2643653,9.225877 l 0.015655,0.645635 0.5791291,0.304879 c 2.0809561,1.095532 4.5054432,0.902465 6.4905002,0.0743 l 0.0052,-0.0027 0.0052,-0.0027 c 4.447879,-1.903497 7.336905,-6.176293 8.30085,-10.624738 l 0.0027,-0.0051 v -0.0051 C 22.65044,9.5552666 22.33923,5.7333203 19.645207,3.2559287 Z"
1385-
style="stroke-width:1.36845" />
1386-
</svg>
1387-
<svg id="roast_svg" xmlns="http://www.w3.org/2000/svg" height="100%" width="100%" viewBox="0 0 24 24" version="1.1">
1388-
<path d="m 6.0641245,0 3.092364,3.1753912 C 7.8803075,3.5122648 6.7207514,4.0668126 5.7523523,4.8096853 4.1032548,6.0744096 2.9861783,7.931656 2.9868219,10.021637 v 0.03017 c 0.00147,0.05842 0.00431,0.117629 0.00754,0.175993 -5.468e-4,0.01658 -0.00503,0.01017 -0.00503,0.02765 v 8.915244 H 21.010849 V 10.25545 c 0,-0.259793 7.7e-5,-0.04599 -0.005,-0.05279 0.0027,-0.04342 0.0058,-0.08728 0.0076,-0.130734 l 0.0026,-0.02514 v -0.02514 c 0,-2.087921 -1.118622,-3.9470978 -2.768878,-5.2119508 C 17.293267,4.0781533 16.150188,3.5309428 14.896406,3.1930394 l 3.104978,-3.190452 z m 5.9364165,5.3803237 c 1.866514,-2.574e-4 3.533505,0.5908483 4.680446,1.4708133 1.144301,0.877403 1.754137,1.97902 1.757354,3.157756 -0.0018,0.0346 -0.0046,0.06848 -0.0076,0.103083 l -0.0076,0.088 0.005,0.088 c 0.0072,0.137131 0.0061,0.146463 0.0076,0.198623 v 6.109422 h -3.233188 c 0.09321,-0.05975 0.196139,-0.10836 0.284097,-0.17347 0.924311,-0.684276 1.56388,-1.703676 1.566326,-2.858598 v -0.005 c 3.32e-4,-0.08643 -0.0032,-0.172775 -0.01004,-0.258957 l -0.05531,-0.711515 H 7.0474943 l -0.080453,0.683852 c -0.010259,0.08768 -0.017298,0.173316 -0.020113,0.261467 v 0.02523 c 6.086e-4,1.157007 0.6406642,2.178415 1.5663272,2.863619 0.08796,0.06512 0.190899,0.113715 0.284096,0.17347 H 5.5640339 v -6.298005 c 9.183e-4,-0.01443 0.00448,-0.0075 0.00503,-0.02263 l 0.00251,-0.0704 -0.00503,-0.06789 c -0.00283,-0.03971 -0.00366,-0.07845 -0.00503,-0.118169 C 5.5612564,8.838615 6.1717997,7.733639 7.3189979,6.853674 8.4661935,5.9736821 10.133055,5.3830913 12.000857,5.3828339 Z M 8.8246345,14.13183 h 6.3507835 c -0.144391,0.364588 -0.205356,0.750004 -0.608434,1.048401 -0.62375,0.461763 -1.539552,0.776831 -2.566907,0.776882 -1.027394,-4e-5 -1.943235,-0.315119 -2.5669075,-0.776882 -0.402652,-0.297355 -0.463539,-0.68353 -0.607968,-1.047822 z m -8.377173,4.993247 v 2.524171 c 0,0.857335 0.5532863,1.498617 1.1112582,1.845403 C 2.1166916,23.841385 2.7581932,24 3.4468597,24 H 20.55314 c 0.688667,0 1.330117,-0.158602 1.88814,-0.505349 0.557972,-0.346747 1.111258,-0.988055 1.111258,-1.845403 v -2.524171 h -2.574501 v 2.204932 c -0.09469,0.04024 -0.222707,0.09554 -0.424897,0.09554 H 3.4468597 c -0.2020984,0 -0.3300512,-0.05535 -0.4247929,-0.09526 V 19.125231 Z M 8.7215255,8.19374 c -0.920886,0 -1.7071521,0.720835 -1.7071521,1.63674 0,0.915892 0.7862271,1.639185 1.7071521,1.639185 0.920887,0 1.7095995,-0.723345 1.7095995,-1.639185 0,-0.915892 -0.7887385,-1.63674 -1.7095995,-1.63674 z m 0,1.028295 c 0.397079,0 0.678819,0.283864 0.678819,0.608432 0,0.324555 -0.28174,0.608432 -0.678819,0.608432 -0.397078,0 -0.676309,-0.283865 -0.676309,-0.608432 0,-0.324555 0.279231,-0.608432 0.676309,-0.608432 z" />
1389-
</svg>
1390-
<svg id="roast_svg_dark" xmlns="http://www.w3.org/2000/svg" height="100%" width="100%" viewBox="0 0 24 24" version="1.1">
1391-
<path d="M 6.0640892,2e-7 9.156515,3.1753931 C 7.880332,3.5122675 6.7207331,4.0667278 5.7523326,4.8096018 4.103232,6.0743284 2.9861052,7.9314838 2.9867487,10.021471 v 0.03017 c 0.00147,0.05842 0.00431,0.117629 0.00754,0.175992 -5.468e-4,0.01658 -0.00503,0.01017 -0.00503,0.02765 v 8.915236 H 21.010812 v -8.915233 c 0,-0.2597932 7.1e-5,-0.04601 -0.005,-0.05279 0.0027,-0.04342 0.0058,-0.08728 0.0076,-0.130737 l 0.0026,-0.02514 v -0.02514 c 0,-2.0879272 -1.117839,-3.9470141 -2.768098,-5.2118695 C 17.294008,4.0780633 16.150262,3.5309041 14.896477,3.1930001 l 3.104998,-3.190478 z m 5.9359478,5.3803176 c 1.866518,-3.167e-4 3.534437,0.7269375 4.68138,1.807686 1.144304,1.077602 1.754184,2.429153 1.757402,3.8768462 -0.0018,0.04249 -0.0046,0.08322 -0.0076,0.125714 l -0.0076,0.110626 0.005,0.105594 c 0.0073,0.168429 0.006,0.179808 0.0076,0.243875 v 7.504788 H 15.203087 5.56377 v -7.736092 c 9.269e-4,-0.01774 0.00448,-0.009 0.00503,-0.02765 l 0.00251,-0.08549 -0.00503,-0.08296 C 5.56345,11.174485 5.56262,11.126225 5.56125,11.077433 5.5609896,9.6276868 6.1714495,8.2712798 7.3186499,7.1905308 8.46585,6.1097825 10.132223,5.3831614 12.000028,5.3828448 Z"
1392-
style="opacity:0.8" />
1393-
<path d=" m 0.44744,19.125068 v 2.524176 c 0,0.857336 0.5532873,1.49862 1.1112602,1.845406 C 2.1166732,23.841385 2.758176,24 3.4468437,24 H 20.553156 c 0.688668,0 1.330119,-0.158602 1.888144,-0.50535 0.557973,-0.346747 1.11126,-0.988057 1.11126,-1.845406 v -2.524176 h -2.574507 c -2.541687,0.03043 -15.414223,0.03043 -17.9560029,1.55e-4 z" />
1394-
<path d="M 7.0403371,13.377146 H 17.066091 c -0.227943,0.924259 -0.324186,1.901319 -0.960509,2.657783 -0.984695,1.170606 -2.430439,1.969326 -4.052288,1.969458 C 10.431386,18.004284 8.98558,17.205535 8.00101,16.034929 7.3653572,15.281109 7.2692373,14.302123 7.0412314,13.378614 Z"
1395-
style="opacity:0.2" />
1396-
<path d=" m 8.662057,8.4412488 c -0.728578,0 -1.3506479,0.59482 -1.3506479,1.350608 0,0.7557772 0.6220399,1.3526252 1.3506479,1.3526252 0.728579,0 1.352586,-0.59689 1.352586,-1.3526252 0,-0.755777 -0.624027,-1.350608 -1.352586,-1.350608 z"
1397-
style="opacity:0.2" />
1398-
<path d=" m 12.000037,5.3803179 v 0.00257 c -1.867805,3.167e-4 -3.534178,0.7269378 -4.6813779,1.8076859 -1.1472003,1.080748 -1.757661,2.437156 -1.7574036,3.8869032 0.00142,0.04879 0.00219,0.09705 0.00502,0.145821 l 0.00502,0.08296 -0.00245,0.08549 c -5.535e-4,0.01868 -0.00412,0.0099 -0.00502,0.02765 v 7.736092 h 9.6393185 3.233218 v -7.504784 c -0.0015,-0.06407 -2.81e-4,-0.07545 -0.0076,-0.243875 l -0.005,-0.105593 0.0076,-0.110627 c 0.003,-0.04249 0.0058,-0.08322 0.0076,-0.125713 C 18.435762,9.6172048 17.825864,8.2656538 16.68156,7.1880518 15.534617,6.1073033 13.866698,5.3800489 12.00018,5.3803655 Z M 8.661223,8.4400588 c 0.728559,0 1.352623,0.596844 1.352623,1.352622 0,0.7557352 -0.624044,1.3526232 -1.352623,1.3526232 -0.728608,0 -1.3501072,-0.596846 -1.3501072,-1.3526232 0,-0.755788 0.6215302,-1.352622 1.3501072,-1.352622 z M 7.0421004,13.377883 H 17.066084 c -0.227943,0.924259 -0.324088,1.901012 -0.960412,2.657476 -0.984695,1.170606 -2.430987,1.968461 -4.052837,1.968591 C 10.430928,18.003847 8.984569,17.205965 7.999999,16.035359 7.364345,15.281539 7.2701065,14.301392 7.0421004,13.377883 Z" />
1399-
</svg>
1377+
<svg id="coffee_svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="m18.058 1.354-.216 2.283c-.35 3.708-2.763 6.988-5.84 9.224l-.018.013-.015.013c-2.759 2.164-5.348 5.404-5.254 9.376l.015.656.578.31c2.077 1.113 4.497.917 6.478.075l.005-.003.005-.002c4.44-1.935 7.322-6.277 8.284-10.797l.003-.005v-.005c.648-3.17.337-7.054-2.351-9.572Zm1.328 5.522c.602 1.61.85 3.4.492 5.157-.83 3.903-3.362 7.623-6.982 9.2a5.55 5.55 0 0 1-3.812.17c.28-2.618 2.072-5.015 4.275-6.743l-.031.023c2.66-1.934 4.936-4.619 6.058-7.807zM12.966.018c-.925.068-1.829.3-2.66.638l-.008.003-.008.002c-4.4 1.869-7.28 6.12-8.31 10.554l-.003.003v.005c-.717 3.203-.48 7.146 2.187 9.755l1.713 1.677.198-2.387c.243-2.957 2.202-5.631 4.608-7.582l-.044.037c2.698-1.968 5.161-4.64 6.137-8.092l.024-.088.01-.089c.02-.178.283-.886.393-1.676.055-.395.09-.875-.161-1.404C16.798.86 16.212.472 15.64.35a7 7 0 0 0-2.674-.33Zm.151 2.252a4.8 4.8 0 0 1 1.849.216c-.055.36-.307.957-.393 1.71l.034-.176c-.786 2.78-2.858 5.106-5.296 6.883l-.023.016-.024.018c-1.947 1.579-3.699 3.65-4.67 6.09-.595-1.664-.822-3.51-.42-5.309v-.002c.892-3.83 3.418-7.456 6.993-8.977l.006-.003a6.5 6.5 0 0 1 1.944-.465z" style="stroke-width:1.33298"/></svg>
1378+
<svg id="coffee_svg_dark" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M13.03.033c-.924.068-1.827.3-2.657.638l-.008.002-.008.003C5.964 2.544 3.09 6.793 2.061 11.226l-.003.002v.006c-.716 3.201-.48 7.142 2.183 9.751l1.211 1.3.135-2.76c.243-2.956 2.092-5.468 4.495-7.418 2.693-1.966 5.24-4.186 6.215-7.636.464-1.565.55-1.668.217-.953 0 0 .259-.353.184-.976.054-.395-.012-.673-.224-1.278-.186-.361-.404-.732-.774-.9-.767-.402-1.786-.396-2.67-.33Z" style="stroke-width:1.35914"/><path d="m17.968 1.714-.216 2.247c-.351 3.65-2.769 6.877-5.852 9.078l-.018.013-.016.012c-2.763 2.13-5.358 5.318-5.264 9.226l.016.646.579.305c2.08 1.095 4.505.902 6.49.074l.006-.003.005-.002c4.448-1.904 7.337-6.177 8.3-10.625l.003-.005v-.005c.65-3.12.338-6.942-2.356-9.42Z" style="stroke-width:1.36845"/></svg>
1379+
<svg id="roast_svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="m6.064 0 3.092 3.175c-1.276.337-2.435.892-3.404 1.635-1.649 1.264-2.766 3.122-2.765 5.212v.03q.002.087.007.176c0 .016-.005.01-.005.027v8.916h18.022v-8.916c0-.26 0-.046-.005-.052q.005-.066.007-.131l.003-.025v-.025c0-2.088-1.119-3.947-2.769-5.212-.954-.732-2.097-1.28-3.35-1.617L18 .003zm5.937 5.38c1.866 0 3.533.591 4.68 1.471 1.144.878 1.754 1.98 1.757 3.158l-.007.103-.008.088.005.088c.007.137.006.146.008.199v6.109h-3.233c.093-.06.196-.108.284-.173.924-.685 1.564-1.704 1.566-2.859v-.005a3 3 0 0 0-.01-.259l-.055-.712h-9.94l-.081.684q-.015.131-.02.262v.025c0 1.157.64 2.178 1.566 2.864.088.065.191.113.284.173H5.564v-6.298c.001-.014.005-.007.005-.023l.003-.07-.005-.068q-.004-.059-.005-.118c0-1.18.61-2.285 1.757-3.165s2.814-1.47 4.682-1.471Zm-3.176 8.752h6.35c-.144.364-.205.75-.608 1.048-.624.462-1.54.777-2.567.777s-1.943-.315-2.567-.777c-.402-.297-.463-.683-.608-1.048zM.447 19.125v2.524c0 .858.554 1.499 1.112 1.846.558.346 1.2.505 1.888.505h17.106c.689 0 1.33-.159 1.888-.505.558-.347 1.112-.988 1.112-1.846v-2.524h-2.575v2.205c-.095.04-.223.096-.425.096H3.447c-.202 0-.33-.056-.425-.096v-2.205ZM8.722 8.194c-.921 0-1.708.72-1.708 1.636s.787 1.64 1.708 1.64 1.71-.724 1.71-1.64-.79-1.636-1.71-1.636m0 1.028c.397 0 .678.284.678.608 0 .325-.281.609-.678.609-.398 0-.677-.284-.677-.609 0-.324.28-.608.677-.608"/></svg>
1380+
<svg id="roast_svg_dark" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="m6.064 0 3.093 3.175c-1.277.337-2.436.892-3.405 1.635C4.103 6.074 2.986 7.93 2.987 10.02v.03q.002.09.007.177c0 .016-.005.01-.005.027v8.916h18.022v-8.916c0-.26 0-.046-.005-.053q.005-.065.007-.13l.003-.025v-.026c0-2.087-1.118-3.947-2.768-5.211-.954-.732-2.098-1.28-3.352-1.617l3.105-3.19zM12 5.38c1.867 0 3.534.727 4.681 1.808 1.145 1.078 1.755 2.43 1.758 3.877l-.008.126-.007.11.005.106c.007.168.006.18.007.244v7.504H5.563V11.42c.002-.017.005-.009.006-.027l.002-.086-.005-.083q-.003-.073-.005-.146c0-1.45.61-2.806 1.758-3.886C8.466 6.11 10.132 5.383 12 5.383Z" style="opacity:.8"/><path d="M.447 19.125v2.524c0 .858.554 1.499 1.112 1.846.558.346 1.2.505 1.888.505h17.106c.689 0 1.33-.159 1.888-.505.558-.347 1.112-.988 1.112-1.846v-2.524h-2.575c-2.542.03-15.414.03-17.956 0z"/><path d="M7.04 13.377h10.026c-.228.924-.324 1.901-.96 2.658-.985 1.17-2.43 1.97-4.053 1.97s-3.067-.8-4.052-1.97c-.636-.754-.732-1.733-.96-2.656ZM8.662 8.441c-.729 0-1.35.595-1.35 1.35 0 .757.621 1.353 1.35 1.353s1.353-.596 1.353-1.352-.624-1.35-1.353-1.35" style="opacity:.2"/><path d="M12 5.38v.003c-1.868 0-3.534.727-4.681 1.808S5.56 9.628 5.56 11.077q.002.075.005.146l.005.083-.002.086c0 .018-.004.01-.005.027v7.736h12.872v-7.504c-.001-.064 0-.076-.007-.244l-.005-.106.007-.11.008-.126c-.003-1.448-.613-2.8-1.757-3.877C15.535 6.108 13.867 5.38 12 5.38ZM8.661 8.44c.729 0 1.353.597 1.353 1.353 0 .755-.624 1.352-1.353 1.352-.728 0-1.35-.597-1.35-1.352s.622-1.353 1.35-1.353m-1.619 4.938h10.024c-.228.924-.324 1.9-.96 2.657-.985 1.171-2.431 1.969-4.053 1.969S8.985 17.206 8 16.035c-.636-.753-.73-1.734-.958-2.657"/></svg>
14001381
</div>
14011382
</div>
14021383
</div>

0 commit comments

Comments
 (0)