Update Potlatch 2 to r25050 build

[rails.git] / public / potlatch2 / potlatch.css

diff --git a/public/potlatch2/potlatch.css b/public/potlatch2/potlatch.css
index 7c3c51f83dc19fe81a4616ae1cecd32d90711187..9297f925da17277c58e4b920d891748050026c90 100644 (file)
--- a/public/potlatch2/potlatch.css
+++ b/public/potlatch2/potlatch.css
@@ -44,6 +44,8 @@ area=yes tag should be filled. The below doesn't yet work as intended. */
 way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 6; casing-dashes: 2,4;}
 way[highway=pedestrian] :area  { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; }
 
+way[highway=living_street] { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 4; }
+
 way[highway=steps]     { color: #FF6644; width: 6; dashes: 2, 2; }
 way[highway=footway]   { color: #FF6644; width: 2; dashes: 6, 3; set .path;}
 way[highway=footway][bicycle=yes]   { z-index: 4; color: Blue; width: 1; }
@@ -92,7 +94,8 @@ way[landuse=retail] :area                   { color: #cc2222; width: 2; fill-col
 way[landuse=commercial] :area               { color: #4444bb; width: 2; fill-color: #444488; fill-opacity: 0.15; }
 way[landuse=military] :area                 { color: #ff4444; width: 2; fill-color: #ff4444; fill-opacity: 0.2; set .area_small_name; }
 way[amenity],way[shop] :area                { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; }
-way[leisure],way[sport] :area               { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; }
+/* way[sport] should not be rendered by itself, according to wiki. Can we make it an "if all else fails"? */
+way[leisure] :area                         { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; }
 way[tourism] :area                          { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; set .area_small_name;}
 way[historic],way[ruins] :area              { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; set .area_small_name;}
 way[military] :area                         { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; set .area_small_name;}
@@ -117,6 +120,10 @@ way[leisure=marina] :area                                  { color: pink; fill-color: pink; fill-opacity: 0.4
 way[leisure=slipway]                                           { color: grey; width: 3; casing-color: blue; casing-width: 7; }
 way[leisure=golf_course] :area { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; set .area_small_name;}
 
+way[boundary]                               { color: #000066; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;}
+/* Perhaps should be filled, on lower zooms. */
+way[boundary=national_park]                 { color: #225500; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;}
+way[boundary=protected_area]                { color: #447744; width: 2; opacity: 0.6; dashes: 12,4, 4, 4; z-index: 4;}
 way[boundary=administrative]                { color: purple; width: 2; opacity: 0.2; dashes: 24,4; z-index: 4;}
 way[boundary=administrative][waterway]      { opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; }
 way[landuse=cemetery]                                          { color: #664466; width: 2; fill-color: color: #664466; opacity: 0.2; set .area_small_name;}
@@ -234,7 +241,7 @@ way[tunnel=yes][!waterway]
     { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; }
 
 way[embankment=yes], way[cutting=yes]
-    { z-index: 8; opacity: 0.5; color: grey; width: eval('_width+5'); dashes: 2, 2; }
+    { z-index: 3; opacity: 0.5; color: grey; width: eval('_width+5'); dashes: 2, 2; }
 
 /* Oneway */
 way[oneway=yes], way[junction=roundabout] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows; }