diff --git a/admin.mss b/admin.mss index c01c11509c..4c2eda26a2 100644 --- a/admin.mss +++ b/admin.mss @@ -233,7 +233,7 @@ overlapping borders correctly. #protected-areas-text[zoom >= 13][way_pixels > 192000] { text-name: "[name]"; text-face-name: @book-fonts; - text-fill: green; + text-fill: @protected-area; [boundary='aboriginal_lands'], [boundary='protected_area'][protect_class='24'] { text-fill: @aboriginal; @@ -253,25 +253,15 @@ overlapping borders correctly. #protected-areas { [way_pixels > 750] { [zoom >= 8][zoom < 10] { - ::fill { - opacity: 0.05; - polygon-fill: green; - [boundary='aboriginal_lands'], - [boundary='protected_area'][protect_class='24'] { - polygon-fill: @aboriginal; - } + opacity: 0.25; + line-width: 1.2; + line-color: @protected-area; + [boundary='aboriginal_lands'], + [boundary='protected_area'][protect_class='24'] { + line-color: @aboriginal; } - ::outline { - opacity: 0.25; - line-width: 1.2; - line-color: green; - [boundary='aboriginal_lands'], - [boundary='protected_area'][protect_class='24'] { - line-color: @aboriginal; - } - [zoom >= 9] { - line-width: 1.5; - } + [zoom >= 9] { + line-width: 1.5; } } [zoom >= 10] { @@ -286,7 +276,7 @@ overlapping borders correctly. // also applies to inner rings of multipolygons.) So a negative // line-offset is always an offset to the inner side of the polygon. line-offset: -0.9; - line-color: green; + line-color: @protected-area; [boundary='aboriginal_lands'], [boundary='protected_area'][protect_class='24'] { line-color: @aboriginal; @@ -306,7 +296,7 @@ overlapping borders correctly. ::narrowline { opacity: 0.15; line-width: 1.8; - line-color: green; + line-color: @protected-area; [boundary='aboriginal_lands'], [boundary='protected_area'][protect_class='24'] { line-color: @aboriginal; diff --git a/amenity-points.mss b/amenity-points.mss index a040ff70a6..e5be53f8e7 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -20,6 +20,7 @@ @barrier-icon: #3f3f3f; @landform-color: #d08f55; @leisure-green: darken(@park, 60%); +@protected-area: #008000; @aboriginal: #82643a; @religious-icon: #000000; @@ -2070,7 +2071,7 @@ [feature = 'boundary_national_park'], [feature = 'leisure_nature_reserve'], [feature = 'boundary_protected_area'] { - text-fill: darken(@park, 70%); + text-fill: @protected-area; } } }