From 52caf888e6ecbece24083c70c4c2438c2a74ef09 Mon Sep 17 00:00:00 2001
From: math1985 <github@matthijsmelissen.nl>
Date: Fri, 30 Jan 2015 23:38:36 +0000
Subject: [PATCH] Make halos transparent (alpha 0.6)

---
 admin.mss          |  2 ++
 amenity-points.mss | 42 ++++++++++++++++++++++++++++++++++++++++--
 roads.mss          |  9 +++++++--
 shapefiles.mss     |  1 +
 stations.mss       |  2 ++
 water.mss          |  6 ++++++
 6 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/admin.mss b/admin.mss
index cac9e313af..62e90fe0da 100644
--- a/admin.mss
+++ b/admin.mss
@@ -122,6 +122,7 @@ overlapping borders correctly.
   text-fill: @admin-boundaries;
   text-placement: line;
   text-halo-radius: 1.0;
+  text-halo-fill: rgba(255,255,255,0.6);
   text-placement: line;
   text-dy: -10;
 }
@@ -132,6 +133,7 @@ overlapping borders correctly.
   text-fill: green;
   text-placement: line;
   text-halo-radius: 1.0;
+  text-halo-fill: rgba(255,255,255,0.6);
   text-placement: line;
   text-dy: -10;
 }
diff --git a/amenity-points.mss b/amenity-points.mss
index 20c663d0c9..a649f87fd5 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -650,6 +650,7 @@
     [way_pixels > 48000] { text-size: 15; }
     text-face-name: @oblique-fonts;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-wrap-width: @standard-wrap-width;
     text-placement: interior;
   }
@@ -668,6 +669,7 @@
       text-dy: 11;
       text-face-name: @bold-fonts;
       text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
       text-wrap-width: @standard-wrap-width;
       text-placement: interior;
       [feature = 'amenity_bar']{
@@ -688,6 +690,7 @@
       text-dy: 13;
       text-face-name: @bold-fonts;
       text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
       text-wrap-width: @standard-wrap-width;
       text-placement: interior;
       [feature = 'amenity_theatre'],
@@ -704,6 +707,7 @@
     text-dy: 9;
     text-face-name: @book-fonts;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-wrap-width: @standard-wrap-width;
     text-placement: interior;
     [access != ''][access != 'public'][access != 'yes'] {
@@ -718,6 +722,7 @@
     text-dy: 11;
     text-face-name: @book-fonts;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-wrap-width: @standard-wrap-width;
     text-placement: interior;
   }
@@ -729,6 +734,7 @@
     text-dy: 11;
     text-face-name: @book-fonts;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-wrap-width: @standard-wrap-width;
     text-placement: interior;
   }
@@ -740,6 +746,7 @@
     text-dy: 12;
     text-face-name: @book-fonts;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-wrap-width: @standard-wrap-width;
     text-placement: interior;
   }
@@ -771,6 +778,7 @@
       text-dy: 7;
       text-face-name: @book-fonts;
       text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
       text-wrap-width: @standard-wrap-width;
       text-placement: interior;
     }
@@ -784,6 +792,7 @@
       text-dy: 7;
       text-face-name: @book-fonts;
       text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
       text-wrap-width: @standard-wrap-width;
       text-placement: interior;
     }
@@ -796,6 +805,7 @@
     text-dy: 11;
     text-face-name: @book-fonts;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-wrap-width: @standard-wrap-width;
     text-placement: interior;
   }
@@ -807,6 +817,7 @@
     text-dy: 11;
     text-face-name: @book-fonts;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-wrap-width: @standard-wrap-width;
     text-placement: interior;
   }
@@ -818,6 +829,7 @@
     text-dy: 15;
     text-face-name: @book-fonts;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-wrap-width: @standard-wrap-width;
     text-placement: interior;
   }
@@ -839,6 +851,7 @@
       text-fill: @water-text;
       text-face-name: @oblique-fonts;
       text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
       text-wrap-width: @standard-wrap-width;
       text-placement: interior;
     }
@@ -854,6 +867,7 @@
       text-fill: @mud-text;
       text-face-name: @landcover-face-name;
       text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
       text-wrap-width: @landcover-wrap-width-size;
       [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
       [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
@@ -872,6 +886,7 @@
       text-fill: @wetland-text;
       text-face-name: @landcover-face-name;
       text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
       text-wrap-width: @landcover-wrap-width-size;
       [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
       [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
@@ -889,6 +904,7 @@
       text-fill: @marina-text;
       text-face-name: @landcover-face-name;
       text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
       text-wrap-width: @landcover-wrap-width-size;
       [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
       [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
@@ -956,6 +972,7 @@
       text-fill: darken(@track, 40%);
       text-face-name: @landcover-face-name;
       text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
       text-wrap-width: @landcover-wrap-width-size;
       [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
       [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
@@ -1309,6 +1326,7 @@
     text-fill: #6699cc;
     text-face-name: @book-fonts;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-wrap-width: @standard-wrap-width;
     text-placement: interior;
   }
@@ -1319,6 +1337,7 @@
     text-fill: #6699cc;
     text-face-name: @book-fonts;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-wrap-width: @standard-wrap-width;
     text-placement: interior;
     text-dy: 6;
@@ -1331,6 +1350,7 @@
     text-dy: 11;
     text-face-name: @book-fonts;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-wrap-width: @standard-wrap-width;
     text-placement: interior;
   }
@@ -1352,6 +1372,7 @@
     text-fill: black;
     text-dy: 12;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-wrap-width: @standard-wrap-width;
     text-placement: interior;
     text-face-name: @book-fonts;
@@ -1368,6 +1389,7 @@
       text-dy: 13;
       text-face-name: @book-fonts;
       text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
       text-wrap-width: @standard-wrap-width;
       text-placement: interior;
       [feature = 'tourism_chalet'] {
@@ -1383,6 +1405,7 @@
     text-dy: 10;
     text-face-name: @book-fonts;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-wrap-width: @standard-wrap-width;
     text-placement: interior;
   }
@@ -1394,6 +1417,7 @@
     text-dy: 10;
     text-face-name: @book-fonts;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-wrap-width: @standard-wrap-width;
     text-placement: interior;
   }
@@ -1408,6 +1432,7 @@
       text-dy: 11;
       text-face-name: @book-fonts;
       text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
       text-wrap-width: @standard-wrap-width;
       text-placement: interior;
       [feature = 'highway_bus_stop'] {
@@ -1423,6 +1448,7 @@
     text-dy: 15;
     text-face-name: @book-fonts;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-wrap-width: @standard-wrap-width;
     text-placement: interior;
   }
@@ -1453,6 +1479,7 @@
     text-fill: #0066ff;
     text-face-name: @book-fonts;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-wrap-width: @standard-wrap-width;
     text-placement: interior;
   }
@@ -1463,6 +1490,7 @@
     text-fill: @marina-text;
     text-face-name: @book-fonts;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-wrap-width: @standard-wrap-width;
     text-placement: interior;
     [zoom >= 17] {
@@ -1495,6 +1523,7 @@
     text-fill: #734a08;
     text-face-name: @book-fonts;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-wrap-width: @standard-wrap-width;
     text-placement: interior;
   }
@@ -1506,6 +1535,7 @@
     text-dy: 12;
     text-face-name: @book-fonts;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-wrap-width: @standard-wrap-width;
     text-placement: interior;
   }
@@ -1520,6 +1550,7 @@
       text-fill: #660033;
       text-face-name: @book-fonts;
       text-halo-radius: 2;
+      text-halo-fill: rgba(255,255,255,0.6);
       text-wrap-width: @landcover-wrap-width-size;
       [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
       [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
@@ -1589,6 +1620,7 @@
     text-dy: 16;
     text-face-name: @book-fonts;
     text-halo-radius: 2;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-wrap-width: @standard-wrap-width;
     text-placement: interior;
   }
@@ -1600,6 +1632,7 @@
     text-dy: 12;
     text-face-name: @book-fonts;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-wrap-width: @standard-wrap-width;
     text-placement: interior;
   }
@@ -1611,6 +1644,7 @@
     text-dy: 10;
     text-face-name: @book-fonts;
     text-halo-radius: 2;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-wrap-width: @standard-wrap-width;
     text-placement: interior;
   }
@@ -1625,6 +1659,7 @@
       text-fill: @health-color;
       text-face-name: @book-fonts;
       text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
       text-wrap-width: @standard-wrap-width;
       text-placement: interior;
     }
@@ -1649,7 +1684,7 @@
       text-fill: #939;
       text-face-name: @book-fonts;
       text-halo-radius: 1.5;
-      text-halo-fill: rgba(255, 255, 255, 0.8);
+      text-halo-fill: rgba(255, 255, 255, 0.6);
       text-wrap-width: @standard-wrap-width;
       text-placement: interior;
     }
@@ -1664,7 +1699,7 @@
       text-fill: #939;
       text-face-name: @book-fonts;
       text-halo-radius: 1.5;
-      text-halo-fill: rgba(255, 255, 255, 0.8);
+      text-halo-fill: rgba(255, 255, 255, 0.6);
       text-wrap-width: @standard-wrap-width;
       text-placement: interior;
     }
@@ -1712,6 +1747,7 @@
     text-fill: #aa66cc;
     text-face-name: @book-fonts;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-wrap-width: @standard-wrap-width;
     text-placement: interior;
   }
@@ -1927,6 +1963,7 @@
     text-dy: -10;
     text-face-name: @bold-fonts;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-placement: interior;
     text-wrap-width: 30;
   }
@@ -1938,6 +1975,7 @@
     text-dy: -10;
     text-face-name: @oblique-fonts;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-placement: interior;
     text-wrap-width: 30;
   }
diff --git a/roads.mss b/roads.mss
index 32524b0b2c..e069b44f4b 100644
--- a/roads.mss
+++ b/roads.mss
@@ -1840,6 +1840,7 @@
       text-fill: black;
       text-face-name: @book-fonts;
       text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
       text-wrap-width: 30;
       text-min-distance: 2;
       [zoom >= 14] {
@@ -2135,6 +2136,7 @@
       text-face-name: @bold-fonts;
       text-min-distance: 18;
       text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
       text-spacing: 750;
       text-clip: false;
     }
@@ -2152,6 +2154,7 @@
       text-min-distance: 18;
       text-face-name: @book-fonts;
       text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
     }
   }
 }
@@ -2233,6 +2236,7 @@
       text-clip: false;
       text-placement: line;
       text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
       text-face-name: @book-fonts;
       text-opacity: 0.3;
     }
@@ -2249,6 +2253,7 @@
       text-clip: false;
       text-placement: line;
       text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
       text-face-name: @book-fonts;
     }
     [zoom >= 17] {
@@ -2345,7 +2350,7 @@
       text-fill: #222;
       text-size: 8;
       text-halo-radius: 1;
-      text-halo-fill: rgba(255,255,255,0.8);
+      text-halo-fill: rgba(255,255,255,0.6);
       text-spacing: 300;
       text-clip: false;
       text-placement: line;
@@ -2372,7 +2377,7 @@
       text-fill: #222;
       text-size: 9;
       text-halo-radius: 1;
-      text-halo-fill: rgba(255,255,255,0.8);
+      text-halo-fill: rgba(255,255,255,0.6);
       text-spacing: 300;
       text-clip: false;
       text-placement: line;
diff --git a/shapefiles.mss b/shapefiles.mss
index 1e8bfa099c..76da5b8694 100644
--- a/shapefiles.mss
+++ b/shapefiles.mss
@@ -14,6 +14,7 @@
       text-fill: grey;
       text-face-name: @book-fonts;
       text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
     }
   }
 }
diff --git a/stations.mss b/stations.mss
index 0ff3b9501e..53fc8ee6f1 100644
--- a/stations.mss
+++ b/stations.mss
@@ -21,6 +21,7 @@
       text-fill: #66f;
       text-dy: -8;
       text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
       text-wrap-width: 0;
       text-placement: interior;
     }
@@ -50,6 +51,7 @@
       text-fill: #66f;
       text-dy: -8;
       text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
       text-wrap-width: 0;
       text-placement: interior;
       [zoom >= 15] {
diff --git a/water.mss b/water.mss
index df40f8d5a2..a421bf59dc 100644
--- a/water.mss
+++ b/water.mss
@@ -223,6 +223,7 @@
     text-spacing: 400;
     text-size: 10;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     [zoom >= 14] { text-size: 12; }
     [int_tunnel = 'yes'] { text-min-distance: 200; }
   }
@@ -231,6 +232,7 @@
     text-name: "[name]";
     text-face-name: @oblique-fonts;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-size: 10;
     text-placement: line;
     text-fill: @water-text;
@@ -242,6 +244,7 @@
     text-face-name: @oblique-fonts;
     text-fill: @water-text;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     text-spacing: 600;
     text-placement: line;
     text-dy: 8;
@@ -257,6 +260,7 @@
       text-spacing: 600;
       text-placement: line;
       text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
     }
   }
 
@@ -267,6 +271,7 @@
     text-placement: line;
     text-face-name: @oblique-fonts;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     [lock = 'yes'][zoom >= 17] {
       text-placement: point;
       text-wrap-width: 20;
@@ -281,6 +286,7 @@
     text-placement: line;
     text-spacing: 600;
     text-halo-radius: 1;
+    text-halo-fill: rgba(255,255,255,0.6);
     [zoom >= 14] {
       text-size: 12;
     }