diff --git a/data/drules_proto.bin b/data/drules_proto.bin index f17c09632b..05a8adbe5c 100644 Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ diff --git a/data/drules_proto.txt b/data/drules_proto.txt index db7d0ba09e..d8ef0cbdc2 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -70725,7 +70725,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 5750 @@ -70736,7 +70736,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 5750 @@ -70747,7 +70747,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 5750 @@ -70758,7 +70758,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 5750 @@ -70769,7 +70769,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 5750 @@ -70780,7 +70780,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 5750 @@ -70791,7 +70791,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 5750 @@ -70802,7 +70802,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 5750 @@ -72118,7 +72118,6 @@ cont { } priority: 7100 } - apply_if: "population>=0" } element { scale: 11 @@ -72136,13 +72135,12 @@ cont { } priority: 7100 } - apply_if: "population>=0" } element { scale: 12 caption { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -72154,151 +72152,142 @@ cont { } priority: 7100 } - apply_if: "population<20000" } element { scale: 13 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 14 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 15 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 16 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 17 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 18 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 19 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 20 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } } cont { @@ -72343,12 +72332,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 6900 @@ -72360,12 +72349,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 6900 @@ -72377,12 +72366,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 6900 @@ -72394,12 +72383,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 6900 @@ -72411,12 +72400,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 6900 @@ -72428,12 +72417,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 6900 @@ -72445,12 +72434,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 6900 @@ -72462,12 +72451,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 6900 diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 33f618ddba..804218b65e 100644 Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 763090777f..012d49dc96 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -67130,7 +67130,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 5750 @@ -67141,7 +67141,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 5750 @@ -67152,7 +67152,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 5750 @@ -67163,7 +67163,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 5750 @@ -67174,7 +67174,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 5750 @@ -67185,7 +67185,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 5750 @@ -67196,7 +67196,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 5750 @@ -67207,7 +67207,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 5750 @@ -68523,7 +68523,6 @@ cont { } priority: 7100 } - apply_if: "population>=0" } element { scale: 11 @@ -68541,13 +68540,12 @@ cont { } priority: 7100 } - apply_if: "population>=0" } element { scale: 12 caption { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -68559,151 +68557,142 @@ cont { } priority: 7100 } - apply_if: "population<20000" } element { scale: 13 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 14 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 15 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 16 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 17 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 18 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 19 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 20 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } } cont { @@ -68748,12 +68737,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 6900 @@ -68765,12 +68754,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 6900 @@ -68782,12 +68771,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 6900 @@ -68799,12 +68788,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 6900 @@ -68816,12 +68805,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 6900 @@ -68833,12 +68822,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 6900 @@ -68850,12 +68839,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 6900 @@ -68867,12 +68856,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 6900 diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 719c53f769..c20fbfb75e 100644 Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 26bf2fb934..2397424333 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -67356,7 +67356,7 @@ cont { caption { primary { height: 11 - color: 6710886 + color: 10066329 stroke_color: 1712394496 } priority: 5750 @@ -67367,7 +67367,7 @@ cont { caption { primary { height: 11 - color: 6710886 + color: 10066329 stroke_color: 1712394496 } priority: 5750 @@ -67378,7 +67378,7 @@ cont { caption { primary { height: 11 - color: 6710886 + color: 10066329 stroke_color: 1712394496 } priority: 5750 @@ -67389,7 +67389,7 @@ cont { caption { primary { height: 11 - color: 6710886 + color: 10066329 stroke_color: 1712394496 } priority: 5750 @@ -67400,7 +67400,7 @@ cont { caption { primary { height: 11 - color: 6710886 + color: 10066329 stroke_color: 1712394496 } priority: 5750 @@ -67411,7 +67411,7 @@ cont { caption { primary { height: 11 - color: 6710886 + color: 10066329 stroke_color: 1712394496 } priority: 5750 @@ -67422,7 +67422,7 @@ cont { caption { primary { height: 11 - color: 6710886 + color: 10066329 stroke_color: 1712394496 } priority: 5750 @@ -67433,7 +67433,7 @@ cont { caption { primary { height: 11 - color: 6710886 + color: 10066329 stroke_color: 1712394496 } priority: 5750 @@ -68738,7 +68738,6 @@ cont { } priority: 7100 } - apply_if: "population>=0" } element { scale: 11 @@ -68756,13 +68755,12 @@ cont { } priority: 7100 } - apply_if: "population>=0" } element { scale: 12 caption { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -68774,151 +68772,142 @@ cont { } priority: 7100 } - apply_if: "population<20000" } element { scale: 13 caption { primary { - height: 10 + height: 14 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 } secondary { - height: 10 + height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 14 caption { primary { - height: 10 + height: 14 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 } secondary { - height: 10 + height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 15 caption { primary { - height: 10 + height: 14 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 } secondary { - height: 10 + height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 16 caption { primary { - height: 10 + height: 14 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 } secondary { - height: 10 + height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 17 caption { primary { - height: 10 + height: 14 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 } secondary { - height: 10 + height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 18 caption { primary { - height: 10 + height: 14 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 } secondary { - height: 10 + height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 19 caption { primary { - height: 10 + height: 14 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 } secondary { - height: 10 + height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 20 caption { primary { - height: 10 + height: 14 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 } secondary { - height: 10 + height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } } cont { @@ -68963,12 +68952,12 @@ cont { primary { height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 } secondary { height: 10 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 offset_y: 1 } priority: 6900 @@ -68980,12 +68969,12 @@ cont { primary { height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 } secondary { height: 10 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 offset_y: 1 } priority: 6900 @@ -68997,12 +68986,12 @@ cont { primary { height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 } secondary { height: 10 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 offset_y: 1 } priority: 6900 @@ -69014,12 +69003,12 @@ cont { primary { height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 } secondary { height: 10 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 offset_y: 1 } priority: 6900 @@ -69031,12 +69020,12 @@ cont { primary { height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 } secondary { height: 10 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 offset_y: 1 } priority: 6900 @@ -69048,12 +69037,12 @@ cont { primary { height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 } secondary { height: 10 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 offset_y: 1 } priority: 6900 @@ -69065,12 +69054,12 @@ cont { primary { height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 } secondary { height: 10 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 offset_y: 1 } priority: 6900 @@ -69082,12 +69071,12 @@ cont { primary { height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 } secondary { height: 10 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 offset_y: 1 } priority: 6900 diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin index d95de931e0..68b9f60c17 100644 Binary files a/data/drules_proto_outdoors_clear.bin and b/data/drules_proto_outdoors_clear.bin differ diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt index 14e8c4481d..ab8d5ab53e 100644 --- a/data/drules_proto_outdoors_clear.txt +++ b/data/drules_proto_outdoors_clear.txt @@ -71506,7 +71506,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 5750 @@ -71517,7 +71517,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 5750 @@ -71528,7 +71528,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 5750 @@ -71539,7 +71539,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 5750 @@ -71550,7 +71550,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 5750 @@ -71561,7 +71561,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 5750 @@ -71572,7 +71572,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 5750 @@ -71583,7 +71583,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 5750 @@ -72899,7 +72899,6 @@ cont { } priority: 7100 } - apply_if: "population>=0" } element { scale: 11 @@ -72917,13 +72916,12 @@ cont { } priority: 7100 } - apply_if: "population>=0" } element { scale: 12 caption { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -72935,151 +72933,142 @@ cont { } priority: 7100 } - apply_if: "population<20000" } element { scale: 13 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 14 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 15 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 16 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 17 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 18 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 19 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 20 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } } cont { @@ -73124,12 +73113,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 6900 @@ -73141,12 +73130,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 6900 @@ -73158,12 +73147,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 6900 @@ -73175,12 +73164,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 6900 @@ -73192,12 +73181,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 6900 @@ -73209,12 +73198,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 6900 @@ -73226,12 +73215,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 6900 @@ -73243,12 +73232,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 6900 diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index a48b40cedb..df0e8e8a77 100644 Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt index 2d52ce9d82..88502778d5 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -71732,7 +71732,7 @@ cont { caption { primary { height: 11 - color: 6710886 + color: 10066329 stroke_color: 1712394496 } priority: 5750 @@ -71743,7 +71743,7 @@ cont { caption { primary { height: 11 - color: 6710886 + color: 10066329 stroke_color: 1712394496 } priority: 5750 @@ -71754,7 +71754,7 @@ cont { caption { primary { height: 11 - color: 6710886 + color: 10066329 stroke_color: 1712394496 } priority: 5750 @@ -71765,7 +71765,7 @@ cont { caption { primary { height: 11 - color: 6710886 + color: 10066329 stroke_color: 1712394496 } priority: 5750 @@ -71776,7 +71776,7 @@ cont { caption { primary { height: 11 - color: 6710886 + color: 10066329 stroke_color: 1712394496 } priority: 5750 @@ -71787,7 +71787,7 @@ cont { caption { primary { height: 11 - color: 6710886 + color: 10066329 stroke_color: 1712394496 } priority: 5750 @@ -71798,7 +71798,7 @@ cont { caption { primary { height: 11 - color: 6710886 + color: 10066329 stroke_color: 1712394496 } priority: 5750 @@ -71809,7 +71809,7 @@ cont { caption { primary { height: 11 - color: 6710886 + color: 10066329 stroke_color: 1712394496 } priority: 5750 @@ -73114,7 +73114,6 @@ cont { } priority: 7100 } - apply_if: "population>=0" } element { scale: 11 @@ -73132,13 +73131,12 @@ cont { } priority: 7100 } - apply_if: "population>=0" } element { scale: 12 caption { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -73150,151 +73148,142 @@ cont { } priority: 7100 } - apply_if: "population<20000" } element { scale: 13 caption { primary { - height: 10 + height: 14 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 } secondary { - height: 10 + height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 14 caption { primary { - height: 10 + height: 14 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 } secondary { - height: 10 + height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 15 caption { primary { - height: 10 + height: 14 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 } secondary { - height: 10 + height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 16 caption { primary { - height: 10 + height: 14 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 } secondary { - height: 10 + height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 17 caption { primary { - height: 10 + height: 14 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 } secondary { - height: 10 + height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 18 caption { primary { - height: 10 + height: 14 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 } secondary { - height: 10 + height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 19 caption { primary { - height: 10 + height: 14 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 } secondary { - height: 10 + height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } element { scale: 20 caption { primary { - height: 10 + height: 14 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 } secondary { - height: 10 + height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 } priority: 7100 } - apply_if: "population<20000" } } cont { @@ -73339,12 +73328,12 @@ cont { primary { height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 } secondary { height: 10 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 offset_y: 1 } priority: 6900 @@ -73356,12 +73345,12 @@ cont { primary { height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 } secondary { height: 10 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 offset_y: 1 } priority: 6900 @@ -73373,12 +73362,12 @@ cont { primary { height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 } secondary { height: 10 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 offset_y: 1 } priority: 6900 @@ -73390,12 +73379,12 @@ cont { primary { height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 } secondary { height: 10 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 offset_y: 1 } priority: 6900 @@ -73407,12 +73396,12 @@ cont { primary { height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 } secondary { height: 10 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 offset_y: 1 } priority: 6900 @@ -73424,12 +73413,12 @@ cont { primary { height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 } secondary { height: 10 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 offset_y: 1 } priority: 6900 @@ -73441,12 +73430,12 @@ cont { primary { height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 } secondary { height: 10 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 offset_y: 1 } priority: 6900 @@ -73458,12 +73447,12 @@ cont { primary { height: 12 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 } secondary { height: 10 color: 7829367 - stroke_color: 856756480 + stroke_color: 1292964096 offset_y: 1 } priority: 6900 diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index af66f3320c..910524a5ea 100644 Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index 287896148c..12d510ced8 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -41426,7 +41426,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 1900 @@ -41437,7 +41437,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 1900 @@ -41448,7 +41448,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 1900 @@ -41459,7 +41459,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 1900 @@ -41470,7 +41470,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 1900 @@ -41481,7 +41481,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 1900 @@ -41492,7 +41492,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 1900 @@ -41503,7 +41503,7 @@ cont { caption { primary { height: 11 - color: 4473924 + color: 6710886 stroke_color: 1728053247 } priority: 1900 @@ -42465,7 +42465,7 @@ cont { color: 6710886 } secondary { - height: 9 + height: 10 color: 6710886 offset_y: 1 } @@ -42489,7 +42489,6 @@ cont { } priority: 3250 } - apply_if: "population>=0" } element { scale: 11 @@ -42507,13 +42506,12 @@ cont { } priority: 3250 } - apply_if: "population>=0" } element { scale: 12 caption { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -42525,151 +42523,142 @@ cont { } priority: 3250 } - apply_if: "population<20000" } element { scale: 13 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 3250 } - apply_if: "population<20000" } element { scale: 14 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 3250 } - apply_if: "population<20000" } element { scale: 15 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 3250 } - apply_if: "population<20000" } element { scale: 16 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 3250 } - apply_if: "population<20000" } element { scale: 17 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 3250 } - apply_if: "population<20000" } element { scale: 18 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 3250 } - apply_if: "population<20000" } element { scale: 19 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 3250 } - apply_if: "population<20000" } element { scale: 20 caption { primary { - height: 10 + height: 14 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 } secondary { - height: 10 + height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 } priority: 3250 } - apply_if: "population<20000" } } cont { @@ -42714,12 +42703,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 3050 @@ -42731,12 +42720,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 3050 @@ -42748,12 +42737,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 3050 @@ -42765,12 +42754,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 3050 @@ -42782,12 +42771,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 3050 @@ -42799,12 +42788,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 3050 @@ -42816,12 +42805,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 3050 @@ -42833,12 +42822,12 @@ cont { primary { height: 12 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 } secondary { height: 10 color: 3355443 - stroke_color: 872415231 + stroke_color: 1308622847 offset_y: 1 } priority: 3050 diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index 55e9595ae1..014917bf8c 100644 Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index fe886b4b14..e8e878bf7e 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -41966,7 +41966,7 @@ cont { caption { primary { height: 11 - color: 6710886 + color: 10066329 stroke_color: 1712394496 } priority: 1900 @@ -41977,7 +41977,7 @@ cont { caption { primary { height: 11 - color: 6710886 + color: 10066329 stroke_color: 1712394496 } priority: 1900 @@ -41988,7 +41988,7 @@ cont { caption { primary { height: 11 - color: 6710886 + color: 10066329 stroke_color: 1712394496 } priority: 1900 @@ -41999,7 +41999,7 @@ cont { caption { primary { height: 11 - color: 6710886 + color: 10066329 stroke_color: 1712394496 } priority: 1900 @@ -42010,7 +42010,7 @@ cont { caption { primary { height: 11 - color: 6710886 + color: 10066329 stroke_color: 1712394496 } priority: 1900 @@ -42021,7 +42021,7 @@ cont { caption { primary { height: 11 - color: 6710886 + color: 10066329 stroke_color: 1712394496 } priority: 1900 @@ -42032,7 +42032,7 @@ cont { caption { primary { height: 11 - color: 6710886 + color: 10066329 stroke_color: 1712394496 } priority: 1900 @@ -42043,7 +42043,7 @@ cont { caption { primary { height: 11 - color: 6710886 + color: 10066329 stroke_color: 1712394496 } priority: 1900 @@ -43005,7 +43005,7 @@ cont { color: 10066329 } secondary { - height: 9 + height: 10 color: 10066329 offset_y: 1 } @@ -43029,7 +43029,6 @@ cont { } priority: 3250 } - apply_if: "population>=0" } element { scale: 11 @@ -43047,13 +43046,12 @@ cont { } priority: 3250 } - apply_if: "population>=0" } element { scale: 12 caption { primary { - height: 10 + height: 12 color: 9211020 stroke_color: 856756480 } @@ -43065,151 +43063,142 @@ cont { } priority: 3250 } - apply_if: "population<20000" } element { scale: 13 caption { primary { - height: 10 + height: 14 color: 9211020 - stroke_color: 856756480 + stroke_color: 1118464 } secondary { - height: 10 + height: 12 color: 9211020 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 } priority: 3250 } - apply_if: "population<20000" } element { scale: 14 caption { primary { - height: 10 + height: 14 color: 9211020 - stroke_color: 856756480 + stroke_color: 1118464 } secondary { - height: 10 + height: 12 color: 9211020 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 } priority: 3250 } - apply_if: "population<20000" } element { scale: 15 caption { primary { - height: 10 + height: 14 color: 9211020 - stroke_color: 856756480 + stroke_color: 1118464 } secondary { - height: 10 + height: 12 color: 9211020 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 } priority: 3250 } - apply_if: "population<20000" } element { scale: 16 caption { primary { - height: 10 + height: 14 color: 9211020 - stroke_color: 856756480 + stroke_color: 1118464 } secondary { - height: 10 + height: 12 color: 9211020 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 } priority: 3250 } - apply_if: "population<20000" } element { scale: 17 caption { primary { - height: 10 + height: 14 color: 9211020 - stroke_color: 856756480 + stroke_color: 1118464 } secondary { - height: 10 + height: 12 color: 9211020 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 } priority: 3250 } - apply_if: "population<20000" } element { scale: 18 caption { primary { - height: 10 + height: 14 color: 9211020 - stroke_color: 856756480 + stroke_color: 1118464 } secondary { - height: 10 + height: 12 color: 9211020 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 } priority: 3250 } - apply_if: "population<20000" } element { scale: 19 caption { primary { - height: 10 + height: 14 color: 9211020 - stroke_color: 856756480 + stroke_color: 1118464 } secondary { - height: 10 + height: 12 color: 9211020 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 } priority: 3250 } - apply_if: "population<20000" } element { scale: 20 caption { primary { - height: 10 + height: 14 color: 9211020 - stroke_color: 856756480 + stroke_color: 1118464 } secondary { - height: 10 + height: 12 color: 9211020 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 } priority: 3250 } - apply_if: "population<20000" } } cont { @@ -43254,12 +43243,12 @@ cont { primary { height: 12 color: 9211020 - stroke_color: 856756480 + stroke_color: 1292964096 } secondary { height: 10 color: 9211020 - stroke_color: 856756480 + stroke_color: 1292964096 offset_y: 1 } priority: 3050 @@ -43271,12 +43260,12 @@ cont { primary { height: 12 color: 9211020 - stroke_color: 856756480 + stroke_color: 1292964096 } secondary { height: 10 color: 9211020 - stroke_color: 856756480 + stroke_color: 1292964096 offset_y: 1 } priority: 3050 @@ -43288,12 +43277,12 @@ cont { primary { height: 12 color: 9211020 - stroke_color: 856756480 + stroke_color: 1292964096 } secondary { height: 10 color: 9211020 - stroke_color: 856756480 + stroke_color: 1292964096 offset_y: 1 } priority: 3050 @@ -43305,12 +43294,12 @@ cont { primary { height: 12 color: 9211020 - stroke_color: 856756480 + stroke_color: 1292964096 } secondary { height: 10 color: 9211020 - stroke_color: 856756480 + stroke_color: 1292964096 offset_y: 1 } priority: 3050 @@ -43322,12 +43311,12 @@ cont { primary { height: 12 color: 9211020 - stroke_color: 856756480 + stroke_color: 1292964096 } secondary { height: 10 color: 9211020 - stroke_color: 856756480 + stroke_color: 1292964096 offset_y: 1 } priority: 3050 @@ -43339,12 +43328,12 @@ cont { primary { height: 12 color: 9211020 - stroke_color: 856756480 + stroke_color: 1292964096 } secondary { height: 10 color: 9211020 - stroke_color: 856756480 + stroke_color: 1292964096 offset_y: 1 } priority: 3050 @@ -43356,12 +43345,12 @@ cont { primary { height: 12 color: 9211020 - stroke_color: 856756480 + stroke_color: 1292964096 } secondary { height: 10 color: 9211020 - stroke_color: 856756480 + stroke_color: 1292964096 offset_y: 1 } priority: 3050 @@ -43373,12 +43362,12 @@ cont { primary { height: 12 color: 9211020 - stroke_color: 856756480 + stroke_color: 1292964096 } secondary { height: 10 color: 9211020 - stroke_color: 856756480 + stroke_color: 1292964096 offset_y: 1 } priority: 3050