From 8bfb91cf54b9849f966ebebc06c6df04f162bded Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Thu, 27 Feb 2020 18:19:58 +0300 Subject: [PATCH] [styles] Regenerated drules. --- data/colors.txt | 6 +- data/drules_proto.bin | Bin 210235 -> 210235 bytes data/drules_proto.txt | 178 ++++++++++++++++++------------------ data/drules_proto_clear.bin | Bin 210847 -> 210847 bytes data/drules_proto_clear.txt | 178 ++++++++++++++++++------------------ data/drules_proto_dark.bin | Bin 209773 -> 209773 bytes data/drules_proto_dark.txt | 178 ++++++++++++++++++------------------ 7 files changed, 277 insertions(+), 263 deletions(-) diff --git a/data/colors.txt b/data/colors.txt index 4f0c5ef4a7..49150afc4c 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -333,6 +333,8 @@ 1296845900 1297438037 1298359132 +1298950496 +1299871334 1301911961 1308576652 1308604747 @@ -363,13 +365,13 @@ 2163800312 2164214668 2566914048 +2574018912 +2574939750 2583691263 2787649562 -2793043558 2801593470 3003121664 3003473869 -3010226528 3019898879 3258727484 3422763904 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index c25a4d509511505080627fea2385a1457c099b45..5f06ae7ba9cbee09e441c60d8651374171385388 100644 GIT binary patch delta 857 zcmdn}if8vLo`x-qGVzS1(`Dls<+wlC3p{)C@-(Nye6Hz@NsPkWuUUXhD;_R(4$kTG zlNhC4kOV+VnI*Q@bG0#X31k-M=Va!k>K2!z7Q`DG7zjyl@Cu1=rh&mTdw~a+HiC_{ zU=)&=uAj&#G5vNtBd;aULZA%TPzy$gJs<&)u|g^w0zyKZ3}Aqy4(b}k1V(8T=N(K$ z6UaqZF*$+J&=PEy0V9TO8XP=AVwkoeR8Ch&W|TI??o>4nKA>kYoC>pKdI3K6~6eB)C;WPbq e0;3|(j3E+01}ThcGzg&frzwovpQbQ{T>t=XnBjf^ delta 875 zcmdn}if8vLo`x-qGVzR&(`DlsTXFc6aB;1Lo-81mrK#@XCJLkt)#7=CjfPWonXOe#lywU!448&me^h|q{1P9>?D{vh^py|35?R*V2x0L zgNbMYx#%h;Comd{gSCKMifY^Re@TprjO^1Dk{P8ZD1nZzhPJuiuo3+T=HNbI9Yj4I~v j6oC?%8W<6c7JP#+ybMwp)o2-B?N3t}w?9o`3cCORlnc^) diff --git a/data/drules_proto.txt b/data/drules_proto.txt index eed2e86d7e..b983e4c223 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -30078,45 +30078,49 @@ cont { element { scale: 17 lines { - width: 0.5 - color: 2793043558 + width: 1.0 + color: 2574939750 priority: 1311 } } element { scale: 18 lines { - width: 0.5 - color: 2155509350 + width: 1.0 + color: 1299871334 priority: 1311 } + path_text { + primary { + height: 9 + color: 8025702 + } + priority: 16311 + } } element { scale: 19 lines { - width: 0.5 - color: 2155509350 + width: 1.0 + color: 1299871334 priority: 1311 } + path_text { + primary { + height: 9 + color: 8025702 + } + priority: 16311 + } } } cont { name: "isoline-step_100" - element { - scale: 12 - lines { - width: 0.5 - color: 3010226528 - priority: 1311 - join: BEVELJOIN - cap: BUTTCAP - } - } element { scale: 13 lines { - width: 0.5 - color: 3010226528 + width: 0.7 + color: 2574018912 priority: 1311 cap: BUTTCAP } @@ -30124,7 +30128,7 @@ cont { element { scale: 14 lines { - width: 0.5 + width: 1.0 color: 2154588512 priority: 1311 cap: BUTTCAP @@ -30133,14 +30137,14 @@ cont { element { scale: 15 lines { - width: 0.5 - color: 2154588512 + width: 1.0 + color: 1298950496 priority: 1311 cap: BUTTCAP } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30149,13 +30153,13 @@ cont { element { scale: 16 lines { - width: 0.5 - color: 2154588512 + width: 1.0 + color: 1298950496 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30165,12 +30169,12 @@ cont { scale: 17 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30180,12 +30184,12 @@ cont { scale: 18 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30195,12 +30199,12 @@ cont { scale: 19 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30213,14 +30217,14 @@ cont { scale: 11 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 join: BEVELJOIN cap: BUTTCAP } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30230,14 +30234,14 @@ cont { scale: 12 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 join: BEVELJOIN cap: BUTTCAP } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30247,13 +30251,13 @@ cont { scale: 13 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 cap: BUTTCAP } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30263,13 +30267,13 @@ cont { scale: 14 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 cap: BUTTCAP } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30279,13 +30283,13 @@ cont { scale: 15 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 cap: BUTTCAP } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30295,12 +30299,12 @@ cont { scale: 16 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30310,12 +30314,12 @@ cont { scale: 17 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30325,12 +30329,12 @@ cont { scale: 18 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30340,12 +30344,12 @@ cont { scale: 19 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30357,8 +30361,8 @@ cont { element { scale: 15 lines { - width: 0.5 - color: 2793043558 + width: 1.0 + color: 2574939750 priority: 1311 cap: BUTTCAP } @@ -30366,21 +30370,21 @@ cont { element { scale: 16 lines { - width: 0.5 - color: 2793043558 + width: 1.0 + color: 2574939750 priority: 1311 } } element { scale: 17 lines { - width: 0.5 + width: 1.0 color: 2155509350 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 8025702 } priority: 16311 @@ -30390,12 +30394,12 @@ cont { scale: 18 lines { width: 1.0 - color: 2155509350 + color: 1299871334 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 8025702 } priority: 16311 @@ -30405,12 +30409,12 @@ cont { scale: 19 lines { width: 1.0 - color: 2155509350 + color: 1299871334 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 8025702 } priority: 16311 @@ -30422,8 +30426,8 @@ cont { element { scale: 11 lines { - width: 0.5 - color: 3010226528 + width: 0.7 + color: 2574018912 priority: 1311 join: BEVELJOIN cap: BUTTCAP @@ -30432,7 +30436,7 @@ cont { element { scale: 12 lines { - width: 0.5 + width: 1.0 color: 2154588512 priority: 1311 join: BEVELJOIN @@ -30440,7 +30444,7 @@ cont { } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30450,13 +30454,13 @@ cont { scale: 13 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 cap: BUTTCAP } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30466,13 +30470,13 @@ cont { scale: 14 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 cap: BUTTCAP } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30482,13 +30486,13 @@ cont { scale: 15 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 cap: BUTTCAP } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30498,12 +30502,12 @@ cont { scale: 16 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30513,12 +30517,12 @@ cont { scale: 17 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30528,12 +30532,12 @@ cont { scale: 18 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30543,12 +30547,12 @@ cont { scale: 19 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30560,8 +30564,8 @@ cont { element { scale: 15 lines { - width: 0.5 - color: 2793043558 + width: 1.0 + color: 2574939750 priority: 1311 cap: BUTTCAP } @@ -30569,21 +30573,21 @@ cont { element { scale: 16 lines { - width: 0.5 - color: 2793043558 + width: 1.0 + color: 2574939750 priority: 1311 } } element { scale: 17 lines { - width: 0.5 + width: 1.0 color: 2155509350 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 8025702 } priority: 16311 @@ -30593,12 +30597,12 @@ cont { scale: 18 lines { width: 1.0 - color: 2155509350 + color: 1299871334 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 8025702 } priority: 16311 @@ -30608,12 +30612,12 @@ cont { scale: 19 lines { width: 1.0 - color: 2155509350 + color: 1299871334 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 8025702 } priority: 16311 diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 091d3399253287a0020985d4a75a3b3526a8efdb..ccf5802cc304e722d0f38c5e79a4c2995b2f6c4d 100644 GIT binary patch delta 791 zcmbRLo@f4ho`x-q*J2n;r(cg@l+*lRFYxTm%hQ|+^SOjnID~|RI2phIBL12MC~n2W z#m>PwJu-n&+674fq>ou*dp%bh6PG|{aehu_UaD?!Noqm7p@D&r1P8B>2xl4?JhK;g zaA_mh4hu#hiRnCvj1me$Y8?DP6>!^tD!_(YFhcFqk7tzTMzU}E?N~Gc#yB*Ah3Hy* z;}{M3!DbjR!VT^PYQqq`1@s*+ssru=)u9P#C1MCs!GlbXlIonW@FybLP=c{Ofl-AIHDac3Okfn5UJ=JA!pJ#&KttkHBBL6;LZW?s665mu HNlaG(^uEh+ delta 860 zcmbRLo@f4ho`x-q*J2nWr(cg@l&gPWFYxTm%gtO0^SOk?ID~|RI2phIBHqja5f{cL z&b5e%OCYm2KPNLURkye#wIJTmz(7cfgGWdVVaS6^8)tI^4KZM}U=)(z;1v=sM+^HlE?yDiD&{qN1@tIhI5X`Giqic#Sbtn z#5e@dVgeF#Djb4n;z&LRMKH6(_Ie=|r1<>+j&~$g)8)_utUiHJg%6$@z!5opV*;ay gC{kd9q7@n_0~AWH5*gJ7FqGQoCowLcpTu+(0B~{AaR2}S diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index e87c5077d1..87fbd194ab 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -29870,45 +29870,49 @@ cont { element { scale: 17 lines { - width: 0.5 - color: 2793043558 + width: 1.0 + color: 2574939750 priority: 1311 } } element { scale: 18 lines { - width: 0.5 - color: 2155509350 + width: 1.0 + color: 1299871334 priority: 1311 } + path_text { + primary { + height: 9 + color: 8025702 + } + priority: 16311 + } } element { scale: 19 lines { - width: 0.5 - color: 2155509350 + width: 1.0 + color: 1299871334 priority: 1311 } + path_text { + primary { + height: 9 + color: 8025702 + } + priority: 16311 + } } } cont { name: "isoline-step_100" - element { - scale: 12 - lines { - width: 0.5 - color: 3010226528 - priority: 1311 - join: BEVELJOIN - cap: BUTTCAP - } - } element { scale: 13 lines { - width: 0.5 - color: 3010226528 + width: 0.7 + color: 2574018912 priority: 1311 cap: BUTTCAP } @@ -29916,7 +29920,7 @@ cont { element { scale: 14 lines { - width: 0.5 + width: 1.0 color: 2154588512 priority: 1311 cap: BUTTCAP @@ -29925,14 +29929,14 @@ cont { element { scale: 15 lines { - width: 0.5 - color: 2154588512 + width: 1.0 + color: 1298950496 priority: 1311 cap: BUTTCAP } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -29941,13 +29945,13 @@ cont { element { scale: 16 lines { - width: 0.5 - color: 2154588512 + width: 1.0 + color: 1298950496 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -29957,12 +29961,12 @@ cont { scale: 17 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -29972,12 +29976,12 @@ cont { scale: 18 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -29987,12 +29991,12 @@ cont { scale: 19 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30005,14 +30009,14 @@ cont { scale: 11 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 join: BEVELJOIN cap: BUTTCAP } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30022,14 +30026,14 @@ cont { scale: 12 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 join: BEVELJOIN cap: BUTTCAP } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30039,13 +30043,13 @@ cont { scale: 13 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 cap: BUTTCAP } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30055,13 +30059,13 @@ cont { scale: 14 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 cap: BUTTCAP } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30071,13 +30075,13 @@ cont { scale: 15 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 cap: BUTTCAP } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30087,12 +30091,12 @@ cont { scale: 16 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30102,12 +30106,12 @@ cont { scale: 17 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30117,12 +30121,12 @@ cont { scale: 18 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30132,12 +30136,12 @@ cont { scale: 19 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30149,8 +30153,8 @@ cont { element { scale: 15 lines { - width: 0.5 - color: 2793043558 + width: 1.0 + color: 2574939750 priority: 1311 cap: BUTTCAP } @@ -30158,21 +30162,21 @@ cont { element { scale: 16 lines { - width: 0.5 - color: 2793043558 + width: 1.0 + color: 2574939750 priority: 1311 } } element { scale: 17 lines { - width: 0.5 + width: 1.0 color: 2155509350 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 8025702 } priority: 16311 @@ -30182,12 +30186,12 @@ cont { scale: 18 lines { width: 1.0 - color: 2155509350 + color: 1299871334 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 8025702 } priority: 16311 @@ -30197,12 +30201,12 @@ cont { scale: 19 lines { width: 1.0 - color: 2155509350 + color: 1299871334 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 8025702 } priority: 16311 @@ -30214,8 +30218,8 @@ cont { element { scale: 11 lines { - width: 0.5 - color: 3010226528 + width: 0.7 + color: 2574018912 priority: 1311 join: BEVELJOIN cap: BUTTCAP @@ -30224,7 +30228,7 @@ cont { element { scale: 12 lines { - width: 0.5 + width: 1.0 color: 2154588512 priority: 1311 join: BEVELJOIN @@ -30232,7 +30236,7 @@ cont { } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30242,13 +30246,13 @@ cont { scale: 13 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 cap: BUTTCAP } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30258,13 +30262,13 @@ cont { scale: 14 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 cap: BUTTCAP } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30274,13 +30278,13 @@ cont { scale: 15 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 cap: BUTTCAP } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30290,12 +30294,12 @@ cont { scale: 16 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30305,12 +30309,12 @@ cont { scale: 17 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30320,12 +30324,12 @@ cont { scale: 18 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30335,12 +30339,12 @@ cont { scale: 19 lines { width: 1.0 - color: 2154588512 + color: 1298950496 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 7104864 } priority: 16311 @@ -30352,8 +30356,8 @@ cont { element { scale: 15 lines { - width: 0.5 - color: 2793043558 + width: 1.0 + color: 2574939750 priority: 1311 cap: BUTTCAP } @@ -30361,21 +30365,21 @@ cont { element { scale: 16 lines { - width: 0.5 - color: 2793043558 + width: 1.0 + color: 2574939750 priority: 1311 } } element { scale: 17 lines { - width: 0.5 + width: 1.0 color: 2155509350 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 8025702 } priority: 16311 @@ -30385,12 +30389,12 @@ cont { scale: 18 lines { width: 1.0 - color: 2155509350 + color: 1299871334 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 8025702 } priority: 16311 @@ -30400,12 +30404,12 @@ cont { scale: 19 lines { width: 1.0 - color: 2155509350 + color: 1299871334 priority: 1311 } path_text { primary { - height: 7 + height: 9 color: 8025702 } priority: 16311 diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index d560b38297a36d9ba848166f06be84c0630d00f3..6ab69d8866bf3e6a4cc614482a91d532958309cc 100644 GIT binary patch delta 875 zcmaF+jOXn$o`x-q2Jwug(+%SpOlrc+euLr6UCaj99jfqPjvp7E|GcQ%QxFoe8-q656NP>e`NQ5&D44&BwJh-%x z8*H-$BT$NOxwn`n*I&Hf|)>O<$kLD9w)~ z05W{~#3V)$K9~Ve?TrbH(kMEYComdXf^`}&!Yl#l276Y6gGWdV(=iB@(*=PR^P;*i zCK*F05mObl{h^q|sHuq*oxng9;}AfLDp*7dPT!xzD9OkGUvHn1O6sD4M06pOBbpQYW delta 947 zcmaF+jOXn$o`x-q2JwuM(+%SpTXFc6aB;1Lo-81mrK#@XCJLkt)#7=@rq7T1LMLUN5A96FOA#uk3j!_X1#5?Co*t8oA(V)z z3g{73hmh|D#Uw^eXQZeF2BR2<09qtMB3*?;5KSC8EP9g|r45k;K#2t$4k{doGyx0; vpfHlE={J)YRm|ZD2^e;WG=Lm{NU=7^0?;LeQEdPNu>EHW