From 5c3bd9b3802e2001a7e77baf2911386135a03839 Mon Sep 17 00:00:00 2001 From: notoraptor Date: Wed, 14 Aug 2019 12:22:22 -0400 Subject: [Web] Integrated new maps on the web interface - Fixed bug with incorrect dislodged unit on pure map - [python] Make sure dummy powers are registered only for standard maps. - Hardcoded supply centers into SVG files. - Removed supply centers CSS classes. - Update positions for units and dislodged units on all maps. - Converted SVGs to React. - Removed "sym" classes and hardcode related styles into symbol definitions. - Reordered map list (standard at top, then other ones in alphabetical order) - Displayed + button for all maps and disable it for maps without variants. - Minified generated code when converting SVG files to React. - [web] Added ability to hide/display map abbreviations. --- diplomacy/maps/svg/ancmed.svg | 1593 ++++++++++++------------ diplomacy/maps/svg/modern.svg | 2579 +++++++++++++++++++-------------------- diplomacy/maps/svg/pure.svg | 338 +++-- diplomacy/maps/svg/standard.svg | 599 +++++---- 4 files changed, 2512 insertions(+), 2597 deletions(-) (limited to 'diplomacy/maps/svg') diff --git a/diplomacy/maps/svg/ancmed.svg b/diplomacy/maps/svg/ancmed.svg index b94a89e..2d238ed 100644 --- a/diplomacy/maps/svg/ancmed.svg +++ b/diplomacy/maps/svg/ancmed.svg @@ -1,483 +1,422 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Ancient Med Map - - - - - ]]> - + + @@ -493,15 +432,15 @@ - + - + - + @@ -510,14 +449,15 @@ - - + + + @@ -525,19 +465,40 @@ - + - + + + + + + + + + + + + + + + + + + + + + + - - - + + + @@ -551,9 +512,9 @@ - - - + + + @@ -568,9 +529,9 @@ - - - + + + @@ -584,9 +545,9 @@ - - - + + + @@ -602,151 +563,186 @@ - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -762,192 +758,193 @@ - - - - adr - aeg - ale - ant - apu - ara - arm - ath - aus - bal - bay - ber - bit - bla - byz - cap - car - che - cil - cir - cor - cre - cyp - cyr - dac - dal - dam - egy - epi - etr - gal - gau - gop - gos - got - ibe - ill - ion - isa - jer - lep - lib - lig - lus - mac - mar - mas - mau - mem - mes - mil - min - nab - nea - num - pet - pha - pun - rav - ree - rha - rom - sag - sah - sad - sam - sic - sid - sin - sip - spa - syr - tar - tha - thb - tye - tyn - ven - vin - - - - - - - - - S1901M - - - - + + + + adr + aeg + ale + ant + apu + ara + arm + ath + aus + bal + bay + ber + bit + bla + byz + cap + car + che + cil + cir + cor + cre + cyp + cyr + dac + dal + dam + egy + epi + etr + gal + gau + gop + gos + got + ibe + ill + ion + isa + jer + lep + lib + lig + lus + mac + mar + mas + mau + mem + mes + mil + min + nab + nea + num + pet + pha + pun + rav + ree + rha + rom + sag + sah + sad + sam + sic + sid + sin + sip + spa + syr + tar + tha + thb + tye + tyn + ven + vin + + + + + + + + + + S1901M + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/diplomacy/maps/svg/modern.svg b/diplomacy/maps/svg/modern.svg index 2701137..8d3efe7 100644 --- a/diplomacy/maps/svg/modern.svg +++ b/diplomacy/maps/svg/modern.svg @@ -1,787 +1,694 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - MODERN - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MODERN + + + + + - .symDarkener {fill:black;opacity:0.45;fill-opacity:0.45;} - .symCenterHub {fill:black; stroke:black; opacity:0.60; stroke-width:0.5px;} - .symBorder {stroke:black;stroke-width:3%;} - .symThinBorder {stroke:black;stroke-width:0.4;} - .symSilhouette {stroke:black;fill:black;stroke-width:1;} - - ]]> - - - + + + @@ -797,15 +704,15 @@ - + - + - + @@ -814,14 +721,15 @@ - - + + + @@ -829,19 +737,40 @@ - + - + + + + + + + + + + + + + + + + + + + + + + - - - + + + @@ -855,9 +784,9 @@ - - - + + + @@ -872,9 +801,9 @@ - - - + + + @@ -888,9 +817,9 @@ - - - + + + @@ -906,209 +835,274 @@ - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - nc - sc - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + nc + sc + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1124,323 +1118,324 @@ - - - Ada - ADR - AEG - Alb - Ale - Alg - Als - Ana - Adl - Ank - Apu - ARA - ARC - Arm - Asw - Aus - Auv - Aze - BAL - Bar - Bel - Ber - BHM - Bie - BIS - Bor - Bos - Bri - BRN - Bul - Cai - CAS - Cau - Crp - Cly - Cro - Cze - Den - Don - EBS - Edi - EME - ENG - Esa - Est - Fin - Fra - Gda - Geo - Gib - GOB - GOL - Gor - Gre - Ham - HEL - Hol - Hun - Ice - ION - Ire - IRI - Irk - Irn - Isr - Ist - Izm - Jor - Kaz - Kha - Kie - Kra - Lap - Lat - LBN - Lib - LIG - Lit - Lpl - Lon - Lyo - Mac - Mad - MAL - Mar - MAT - Mil - Mol - Mon - Mor - Mos - Mun - Mur - Nap - NAT - Nav - Nwy - NTH - NWG - Ode - Par - PER - Pic - Pie - Pod - Por - Pru - RED - Rom - Ros - Ruh - Rum - SAT - Sau - Sax - Ser - Sev - Sib - Sil - Sin - SKA - Slk - Stp - SOG - Svl - Swe - Swi - Syr - Tun - Tus - TYR - Ura - Ven - Vol - Wal - War - WBS - WME - Wsa - WHI - Yor - - - + + ada + adr + aeg + alb + ale + alg + als + ana + adl + ank + apu + ara + arc + arm + asw + aus + auv + aze + bal + bar + bel + ber + bhm + bie + bis + bor + bos + bri + brn + bul + cai + cas + cau + crp + cly + cro + cze + den + don + ebs + edi + eme + eng + esa + est + fin + fra + gda + geo + gib + gob + gol + gor + gre + ham + hel + hol + hun + ice + ion + ire + iri + irk + irn + isr + ist + izm + jor + kaz + kha + kie + kra + lap + lat + lbn + lib + lig + lit + lpl + lon + lyo + mac + mad + mal + mar + mat + mil + mol + mon + mor + mos + mun + mur + nap + nat + nav + nwy + nth + nwg + ode + par + per + pic + pie + pod + por + pru + red + rom + ros + ruh + rum + sat + sau + sax + ser + sev + sib + sil + sin + ska + slk + stp + sog + svl + swe + swi + syr + tun + tus + tyr + ura + ven + vol + wal + war + wbs + wme + wsa + whi + yor + + + + - - - - S1901M - - + + + + + S1901M + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/diplomacy/maps/svg/pure.svg b/diplomacy/maps/svg/pure.svg index bedd677..fd28b65 100644 --- a/diplomacy/maps/svg/pure.svg +++ b/diplomacy/maps/svg/pure.svg @@ -11,11 +11,11 @@ - + - - - + + + @@ -29,54 +29,42 @@ - - - - - - - - - - + + + + + - - - - - + + + + + + + + - - - - + + + + + + + - - - - - - - - - + + + - - - - - - - - - - - - - - + + + + + + + Pure @@ -85,36 +73,9 @@ /* text */ svg { font-size: 100% } - .titletext {text-anchor:middle; stroke-width:0.3; font-family:sans-serif; font-size:0.7em; stroke:black; fill:black;} - .provtext {text-anchor:middle; stroke-width:0.3; font-family:sans-serif; font-size:0.7em; stroke:black; fill:black;} .labeltext {stroke-width:0.1; stroke:black; fill:black;} - .unordered {fill:red; stroke:black; stroke-width:1; fill-opacity:0.90;} - .labeltext24 {text-anchor:middle; stroke-width:0.1; stroke:black; fill:black; font-family:serif,sans-serif; font-style:italic; font-size:1.4em;} - .labeltext18 {text-anchor:middle; stroke-width:0.1; stroke:black; fill:black; font-family:serif,sans-serif; font-style:italic; font-size:1.1em;} - .fulllabeltext {font-family:serif,sans-serif; font-style:italic; font-size:1.2em; fill:black; stroke:black;} .currentnotetext {font-family:serif,sans-serif; font-size:1.5em; fill:black; stroke:black;} - .currentnoterect {fill:#c5dfea;} - .currentphasetext {font-family:serif,sans-serif; font-size:2.5em; fill:black; stroke:black;} - - .labeltext24 text {cursor:default;} - - /* NB: this style is not yet used. */ - .labeltext24 text.allowed { - font-weight:bold; - fill:blue; - font-size: 1.5em; - stroke: red; - stroke-width:2; - text-decoration: underline; - background-color: green; - } - - /* map and object features */ - - .seapoly {stroke:#000000; stroke-width:1; fill:#B5DEF8} - .dashline {stroke:darkslateblue; stroke-width:3; stroke-linecap:round; stroke-dasharray:5,6;} - .impassable {fill:#353433; stroke:#000000; stroke-width:1} - .sealine {stroke:#B5DEFF; stroke-width:3;} + .currentphasetext {font-family:serif,sans-serif; fill:black; stroke:black;} /* invisible click rects fill:none does not work */ @@ -122,85 +83,50 @@ /* default region coloring, by power */ - .provinceRed {fill:url(#patternRed)} - .provinceBrown {fill:url(#patternBrown)} - .provinceGreen {fill:url(#patternGreen)} - .provinceBlack {fill:url(#patternBlack)} - .provinceBlue {fill:url(#patternBlue)} + .provinceRed {fill:url(#patternRed); stroke: black; stroke-width: 2} + .provinceBrown {fill:url(#patternBrown); stroke: black; stroke-width: 2} + .provinceGreen {fill:url(#patternGreen); stroke: black; stroke-width: 2} + .provinceBlack {fill:url(#patternBlack); stroke: black; stroke-width: 2} + .provinceBlue {fill:url(#patternBlue); stroke: black; stroke-width: 2} - .nopower {fill:antiquewhite; stroke:#000000; stroke-width:1} - .water {fill:#c5dfea; stroke:#000000; stroke-width:1} + .nopower {fill:antiquewhite; stroke:#000000; stroke-width:2} + .water {fill:#c5dfea; stroke:#000000; stroke-width:2} - .neutral {fill:lightgray; stroke:#000000; stroke-width:1} - - .austria {fill:#c48f85; stroke:#000000; stroke-width:1} - .england {fill:darkviolet; stroke:#000000; stroke-width:1} - .france {fill:royalblue; stroke:#000000; stroke-width:1} - .germany {fill:#a08a75; stroke:#000000; stroke-width:1} - .italy {fill:forestgreen; stroke:#000000; stroke-width:1} - .russia {fill:#757d91; stroke:#000000; stroke-width:1} - .turkey {fill:#b9a61c; stroke:#000000; stroke-width:1} + .austria {fill:#c48f85; stroke:#000000; stroke-width:2} + .england {fill:darkviolet; stroke:#000000; stroke-width:2} + .france {fill:royalblue; stroke:#000000; stroke-width:2} + .germany {fill:#a08a75; stroke:#000000; stroke-width:2} + .italy {fill:forestgreen; stroke:#000000; stroke-width:2} + .russia {fill:#757d91; stroke:#000000; stroke-width:2} + .turkey {fill:#b9a61c; stroke:#000000; stroke-width:2} /* unit colors, by power note that underscores are not supported */ .unitaustria {fill:red; fill-opacity:0.85} .unitengland {fill:mediumpurple; fill-opacity:0.85} - .unitfrance {fill:deepskyblue; fill-opacity:0.85} + .unitfrance {fill:deepskyblue; fill-opacity:0.85} .unitgermany {fill:dimgray; fill-opacity:0.85} - .unititaly {fill:olive; fill-opacity:0.85} - .unitrussia {fill:white; fill-opacity:1.0} - .unitturkey {fill:yellow; fill-opacity:0.85} - - /* supply center styles */ - - .scnopower {fill:black; stroke:black;} - .scaustria {fill:black; stroke:black;} - .scengland {fill:black; stroke:black;} - .scfrance {fill:black; stroke:black;} - .scgermany {fill:black; stroke:black;} - .scitaly {fill:black; stroke:black;} - .scrussia {fill:black; stroke:black;} - .scturkey {fill:black; stroke:black;} + .unititaly {fill:olive; fill-opacity:0.85} + .unitrussia {fill:white; fill-opacity:1.0} + .unitturkey {fill:yellow; fill-opacity:0.85} /* order drawing styles, stroke and fill colors should not be specified */ - .defaultorder {stroke-width:6; fill:none;} .supportorder {stroke-width:6; fill:none; stroke-dasharray:5,5;} - .convoyorder {stroke-dasharray:15,5; stroke-width:6; fill:none;} - - .shadoworder {stroke-width:10; fill:none; stroke:black;} - .shadowdash {stroke-width:10; fill:none; stroke:black; opacity:0.45;} - - .varwidthorder {fill:none;} + .convoyorder {stroke-dasharray:15,5; stroke-width:6; fill:none;} + .shadowdash {stroke-width:10; fill:none; stroke:black; opacity:0.45;} + .varwidthorder {fill:none;} .varwidthshadow {fill:none; stroke:black;} - /* Symbol private styles. Always start with "sym" to avoid name collisions! */ - - .symBuildShadow {fill:none;stroke:black;opacity:0.5;stroke-width:7;} - .symBuild {stroke:yellow;stroke-width:7;fill:none;} - .symRemove {stroke:red;stroke-width:1;fill:none;} - - .symShadow {stroke:black;fill:black;stroke-width:1;opacity:0.40;} - .symDislodgedShadow {stroke:red;fill:red;stroke-width:1;opacity:0.50;} - .symDislodgedBorder {stroke:red;stroke-width:3%;} - - .symDarkener {fill:black;opacity:0.45;fill-opacity:0.45;} - .symCenterHub {fill:black; stroke:black; opacity:0.60; stroke-width:0.5px;} - .symBorder {stroke:black;stroke-width:3%;} - .symThinBorder {stroke:black;stroke-width:0.4;} - .symSilhouette {stroke:black;fill:black;stroke-width:1;} - ]]> - + + + @@ -216,15 +142,15 @@ - + - + - + @@ -233,14 +159,15 @@ - - + + + @@ -248,19 +175,40 @@ - + - + + + + + + + + + + + + + + + + + + + + + + - - - + + + @@ -274,9 +222,9 @@ - - - + + + @@ -291,9 +239,9 @@ - - - + + + @@ -307,9 +255,9 @@ - - - + + + @@ -325,23 +273,23 @@ - + - + - + - + - + @@ -388,12 +336,12 @@ - - - - - - + + + + + + @@ -401,32 +349,32 @@ Paris + font-family="sansserif" font-size="36" + transform="translate(-123.913 110.87) translate(1263.04 589.13) translate(-32.6087 2.17391) rotate(309.832 -221.264 125.31) translate(-7.1597 -41.6087) translate(14.9305 -15.5542)" + >Paris London + font-family="sansserif" x="-287px" y="205px" + transform="translate(-119.565 -19.5652) translate(1354.35 219.565) translate(-64.1975 1.23457) rotate(75.7072 -220.85 195.892) translate(26.8838 14.493) translate(-21.3531 -2.98297) translate(0.45683 6.30804)" + >London Vienna + font-family="sansserif" x="-274px" y="308px" + transform="translate(-132.609 -197.826) translate(2.17391 6.52174) translate(1069.57 -10.8696) rotate(29.8179 -218.768 295.31) translate(10.2944 29.5644) rotate(358.562 -220.214 298.775) rotate(359.007 -220.285 298.603) rotate(357.849 -220.329 298.482) translate(0.720196 6.03851) translate(-8.46365 -1.53838) translate(-11.2897 -18.3683)" + >Vienna Berlin + font-family="sansserif" x="-313px" y="390px" + transform="translate(-93.4783 -84.7826) translate(839.13 676.087) translate(-8.69565 -2.17391) translate(0 2.17391) translate(-2.38095 -21.4286) translate(0 5.76923) translate(23 -2) translate(7 0)" + >Berlin Constantinople + font-family="sansserif" x="-333px" y="475px" + transform="translate(-60.8696 0) translate(586.957 -369.565) translate(32.6923 23.0769) rotate(335.957 -277.737 465.894) translate(17.1839 -0.756818) translate(-1.37782 7.80842) translate(0.972716 2.53974) translate(6.55609 -20.5395) rotate(358.255 -213.197 464.84) translate(-50.1197 -2.00399) translate(-10.8147 -1.39563) translate(-2.30251 0.802347) translate(2.35477 3.05259)" + >Constantinople Moscow + font-family="sansserif" x="-322px" y="551px" + transform="translate(-71.7391 -130.435) translate(6.52174 0) translate(6.52174 2.17391) translate(330.435 6.52174) translate(1.92308 0) translate(50 0) translate(-7.69231 0) rotate(285.776 -266.269 538.335) translate(1.28651 11.6267) rotate(357.124 -268.227 538.669) translate(20.3562 -7.10479)" + >Moscow Rome @@ -438,13 +386,21 @@ - + - S1901M + S1901M - + + + + + + + + + @@ -452,19 +408,19 @@ - + - + - + - + - + diff --git a/diplomacy/maps/svg/standard.svg b/diplomacy/maps/svg/standard.svg index b6450df..5eada69 100644 --- a/diplomacy/maps/svg/standard.svg +++ b/diplomacy/maps/svg/standard.svg @@ -1,10 +1,10 @@ - - - - + + + + @@ -35,403 +35,361 @@ - - - - - - - - - - + + + + + - - + + - - + + - - + + - - - + + - - + + - - + + - - + + - - + + - - - + + - - - + + - - + + - - + + - - + + - - - + + - - - + + - - - + + + + + + + + + + - - + + - - - + + - - - + + - - - + + - - + + - - - + + - - + + - - + + - - + + - - + + - - + + - - - + + - - + + - - - + + - - + + - - + + - - - + + - - - + + - - + + - - - + + - - - - - - - + + - - + + + + + + - - + + - - - + + - - - + + - - + + - - + + - - - + + - - + + - - + + - - + + - - + + - - - + + - - - + + - - + + - - + + - - - + + - - + + - - - + + - - + + - - - + + - - - + + - - - + + - - + + - - + + - - - + + - - - + + + + + + + + + + - - - + + + + + + + + + + - - - + + - - + + - - + + - - - + + - - - + + - - + + - - + + - - + + - - + + - - + + - - - + + - - - + + - - - + + - - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -440,36 +398,17 @@ /* text */ svg { font-size: 100% } - .titletext {text-anchor:middle; stroke-width:0.3; font-family:sans-serif; font-size:0.7em; stroke:black; fill:black;} - .provtext {text-anchor:middle; stroke-width:0.3; font-family:sans-serif; font-size:0.7em; stroke:black; fill:black;} - .labeltext {stroke-width:0.1; stroke:black; fill:black;} - .unordered {fill:red; stroke:black; stroke-width:1; fill-opacity:0.90;} .labeltext24 {text-anchor:middle; stroke-width:0.1; stroke:black; fill:black; font-family:serif,sans-serif; font-style:italic; font-size:1.4em;} .labeltext18 {text-anchor:middle; stroke-width:0.1; stroke:black; fill:black; font-family:serif,sans-serif; font-style:italic; font-size:1.1em;} - .fulllabeltext {font-family:serif,sans-serif; font-style:italic; font-size:1.2em; fill:black; stroke:black;} .currentnotetext {font-family:serif,sans-serif; font-size:1.5em; fill:black; stroke:black;} .currentnoterect {fill:#c5dfea;} .currentphasetext {font-family:serif,sans-serif; font-size:2.5em; fill:black; stroke:black;} .labeltext24 text {cursor:default;} - /* NB: this style is not yet used. */ - .labeltext24 text.allowed { - font-weight:bold; - fill:blue; - font-size: 1.5em; - stroke: red; - stroke-width:2; - text-decoration: underline; - background-color: green; - } - /* map and object features */ - .seapoly {stroke:#000000; stroke-width:1; fill:#B5DEF8} - .dashline {stroke:darkslateblue; stroke-width:3; stroke-linecap:round; stroke-dasharray:5,6;} .impassable {fill:#353433; stroke:#000000; stroke-width:1} - .sealine {stroke:#B5DEFF; stroke-width:3;} /* invisible click rects fill:none does not work */ @@ -500,54 +439,25 @@ .unitaustria {fill:red; fill-opacity:0.85} .unitengland {fill:mediumpurple; fill-opacity:0.85} - .unitfrance {fill:deepskyblue; fill-opacity:0.85} + .unitfrance {fill:deepskyblue; fill-opacity:0.85} .unitgermany {fill:dimgray; fill-opacity:0.85} - .unititaly {fill:olive; fill-opacity:0.85} - .unitrussia {fill:white; fill-opacity:1.0} - .unitturkey {fill:yellow; fill-opacity:0.85} - - /* supply center styles */ - - .scnopower {fill:black; stroke:black;} - .scaustria {fill:black; stroke:black;} - .scengland {fill:black; stroke:black;} - .scfrance {fill:black; stroke:black;} - .scgermany {fill:black; stroke:black;} - .scitaly {fill:black; stroke:black;} - .scrussia {fill:black; stroke:black;} - .scturkey {fill:black; stroke:black;} + .unititaly {fill:olive; fill-opacity:0.85} + .unitrussia {fill:white; fill-opacity:1.0} + .unitturkey {fill:yellow; fill-opacity:0.85} /* order drawing styles, stroke and fill colors should not be specified */ - .defaultorder {stroke-width:6; fill:none;} .supportorder {stroke-width:6; fill:none; stroke-dasharray:5,5;} - .convoyorder {stroke-dasharray:15,5; stroke-width:6; fill:none;} - - .shadoworder {stroke-width:10; fill:none; stroke:black;} - .shadowdash {stroke-width:10; fill:none; stroke:black; opacity:0.45;} - - .varwidthorder {fill:none;} + .convoyorder {stroke-dasharray:15,5; stroke-width:6; fill:none;} + .shadowdash {stroke-width:10; fill:none; stroke:black; opacity:0.45;} + .varwidthorder {fill:none;} .varwidthshadow {fill:none; stroke:black;} - /* Symbol private styles. Always start with "sym" to avoid name collisions! */ - - .symBuildShadow {fill:none;stroke:black;opacity:0.5;stroke-width:7;} - .symBuild {stroke:yellow;stroke-width:7;fill:none;} - .symRemove {stroke:red;stroke-width:1;fill:none;} - - .symShadow {stroke:black;fill:black;stroke-width:1;opacity:0.40;} - .symDislodgedShadow {stroke:red;fill:red;stroke-width:1;opacity:0.50;} - .symDislodgedBorder {stroke:red;stroke-width:3%;} - - .symDarkener {fill:black;opacity:0.45;fill-opacity:0.45;} - .symCenterHub {fill:black; stroke:black; opacity:0.60; stroke-width:0.5px;} - .symBorder {stroke:black;stroke-width:3%;} - .symThinBorder {stroke:black;stroke-width:0.4;} - .symSilhouette {stroke:black;fill:black;stroke-width:1;} - ]]> + + @@ -563,15 +473,15 @@ - + - + - + @@ -580,14 +490,15 @@ - - + + + @@ -595,19 +506,40 @@ - + - + + + + + + + + + + + + + + + + + + + + + + - - - + + + @@ -621,9 +553,9 @@ - - - + + + @@ -638,9 +570,9 @@ - - - + + + @@ -654,9 +586,9 @@ - - - + + + @@ -779,7 +711,42 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3