diff --git a/data/styles/clear/include/POI.mapcss b/data/styles/clear/include/POI.mapcss
index 16fcaa375d..153d347597 100644
--- a/data/styles/clear/include/POI.mapcss
+++ b/data/styles/clear/include/POI.mapcss
@@ -3,7 +3,6 @@
/* NAMED AMENITIES BY DEFAULT — TEMPORARY */
node|z19-[amenity], area|z19-[amenity] { icon-image: none.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; }
-
/* ZOOM 15 */
@@ -140,35 +139,35 @@ area|z12[natural=rock][!name]
{ }
node|z13[natural=peak][name],
-{ icon-image: peakt-s.svg;text-offset: 6; font-size: 9; text: name; text-color: @poi_label;z-index: 2700; }
+{ icon-image: peakt-s.svg;text-offset: 5; font-size: 9; text: name; text-color: @poi_label;z-index: 2700; }
node|z13[natural=peak][!name],
node|z13[natural=bare_rock][!name],
node|z13[natural=rock][!name]
{ }
area|z13[natural=peak][name],
-{ icon-image: peakt-s.svg; text-offset: 6; font-size: 9; text: name; text-color: @poi_label;z-index: 2700; }
+{ icon-image: peakt-s.svg; text-offset: 5; font-size: 9; text: name; text-color: @poi_label;z-index: 2700; }
area|z13[natural=peak][!name],
area|z13[natural=bare_rock][!name],
area|z13[natural=rock][!name]
{ }
node|z14[natural=peak][name],
-{ icon-image: peakt-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
+{ icon-image: peakt-s.svg; text-offset: 5; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
node|z14[natural=peak][!name],
node|z14[natural=bare_rock][!name],
node|z14[natural=rock][!name]
{ }
area|z14[natural=peak][name],
-{ icon-image: peakt-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
+{ icon-image: peakt-s.svg; text-offset: 5; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
area|z14[natural=peak][!name],
area|z14[natural=bare_rock][!name],
area|z14[natural=rock][!name]
{ }
-node|z15-16[natural=peak],node|z15-16[natural=bare_rock],node|z15-16[natural=rock] { icon-image: peakt-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
-area|z15-16[natural=peak],area|z15-16[natural=bare_rock],area|z15-16[natural=rock] { icon-image: peakt-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;}
-node|z17-[natural=peak],node|z17-[natural=bare_rock],node|z17-[natural=rock] { icon-image: peakt-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
-area|z17-[natural=peak],area|z17-[natural=bare_rock],area|z17-[natural=rock] { icon-image: peakt-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;}
+node|z15-16[natural=peak],node|z15-16[natural=bare_rock],node|z15-16[natural=rock] { icon-image: peakt-m.svg; text-offset: 5; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
+area|z15-16[natural=peak],area|z15-16[natural=bare_rock],area|z15-16[natural=rock] { icon-image: peakt-m.svg; text-offset: 5; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;}
+node|z17-[natural=peak],node|z17-[natural=bare_rock],node|z17-[natural=rock] { icon-image: peakt-l.svg; text-offset: 6; font-size: 11; text: name; text-color: @poi_label;z-index: 2700; }
+area|z17-[natural=peak],area|z17-[natural=bare_rock],area|z17-[natural=rock] { icon-image: peakt-l.svg; text-offset: 6; font-size: 11; text: name; text-color: @poi_label; z-index: 2700;}
node|z12-13[landuse=forest][boundary=national_park],area|z12-14[landuse=forest][boundary=national_park] { icon-image: nparkf-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light;
text-halo-radius:0.5; z-index: 2700;}
@@ -195,6 +194,7 @@ node|z17-[natural=beach], area|z17-[natural=beach]{ icon-image: beach-l.svg; tex
/* AMENITY */
+
node|z15-[natural=spring],area|z17-[natural=spring]{ icon-image: drinking-water-m.svg; text-offset:8; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; }
node|z15-[amenity=hunting_stand], area|z18-[amenity=hunting_stand] { icon-image: hunting-tower-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; }
node|z15-[tourism=attraction], area|z15-[tourism=attraction ] { icon-image: tourism-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; }
@@ -318,7 +318,7 @@ node|z17-[leisure=stadium] { icon-image: pitch-l.svg; text-offset: 10; font-size
node|z17-[leisure=pitch] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; }
node|z17-[sport=multi] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; }
-node|z17-[leisure=sports_centre] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; -x-me-text-priority: 15500; }
+node|z17-[leisure=sports_centre] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; -x-me-text-priority: 15500;}
node|z18-[leisure=playground] { icon-image: pitch-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400; }
node|z17-[leisure=swimming_pool],area|z18-[leisure=swimming_pool] { icon-image: swimming-l.svg;z-index: 2600; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; }
node|z17-[leisure=golf_course], area|z18-[leisure=golf_course] { icon-image: golf-l.svg;z-index: 50; } /* нельзя другой z-inex^иначе пропадают все объекты на поле */
diff --git a/data/styles/clear/include/boundaries.mapcss b/data/styles/clear/include/boundaries.mapcss
index 8267eaafe6..d504c16111 100644
--- a/data/styles/clear/include/boundaries.mapcss
+++ b/data/styles/clear/include/boundaries.mapcss
@@ -116,14 +116,3 @@ line|z10-[boundary=administrative][admin_level=4]
z-index: 130;
dashes: 1.8,0.9;
}
-
-
-/*
-line|z12-[boundary=administrative][admin_level=4]
-{
- color: @border_region;
- width: 1.2;
- opacity: 1;
- z-index: 130;
-}
-*/
diff --git a/data/styles/clear/include/other.mapcss b/data/styles/clear/include/other.mapcss
index 7e6cf6f9c0..6a436ae287 100644
--- a/data/styles/clear/include/other.mapcss
+++ b/data/styles/clear/include/other.mapcss
@@ -44,14 +44,14 @@ line|z18-[historic=citywalls],
/* PISTE */
-/* node|z13[aerialway=station] { symbol-shape: circle; symbol-fill-color: grey; symbol-size: 2; } */
-line|z13-14[piste:lift=j-bar],
-line|z13-14[piste:lift=magic_carpet],
-line|z13-14[piste:lift=platter],
-line|z13-14[piste:lift=rope_tow],
-line|z13-14[piste:lift=t-bar] {
- color: red;
+
+line|z12-14[piste:lift=j-bar],
+line|z12-14[piste:lift=magic_carpet],
+line|z12-14[piste:lift=platter],
+line|z12-14[piste:lift=rope_tow],
+line|z12-14[piste:lift=t-bar] {
+ color: @aerialway;
width: 1;
opacity: 1;
z-index: 6888;
@@ -68,6 +68,17 @@ line|z15-[piste:lift=t-bar] {
opacity: 1;
z-index: 6888;
}
+line|z17-[piste:lift],
+line|z17-[piste:lift=j-bar],
+line|z17-[piste:lift=magic_carpet],
+line|z17-[piste:lift=platter],
+line|z17-[piste:lift=rope_tow],
+line|z17-[piste:lift=t-bar] {
+ color: @aerialway;
+ width: 2;
+ opacity: 1;
+ z-index: 6888;
+}
line|z19-[power=line] {
color: @aerialway;
@@ -132,7 +143,7 @@ line|z17-[leisure=skiing] {
}
-line|z14-[piste:type=downhill][piste:difficulty=novice] { color: @piste_novice; width: 1; opacity: 1; z-index: 100;}
+line|z14-[piste:type=downhill][piste:difficulty=novice] { color: @piste_novice; width: 1; opacity: 1; z-index: 100; casing-width: 0.2);casing-linecap: butt;casing-color: #fff;}
line|z14-[piste:type=downhill][piste:difficulty=easy] { color: @piste_easy; width: 1; opacity: 1; z-index: 100; }
line|z14-[piste:type=downhill][piste:difficulty=intermediate] { color: @piste_intermadiate; width: 1; opacity: 1; z-index: 100;}
line|z14-[piste:type=downhill][piste:difficulty=advanced] { color: @piste_advanced; width: 1; opacity: 1; z-index: 100; }
diff --git a/data/styles/clear/include/roads.mapcss b/data/styles/clear/include/roads.mapcss
index d4f94df0ff..9c4f0a5102 100644
--- a/data/styles/clear/include/roads.mapcss
+++ b/data/styles/clear/include/roads.mapcss
@@ -163,16 +163,7 @@ line|z11[highway=motorway]
opacity: 1;
z-index: 900;
}
-/*
-line|z11[highway=trunk]::case,
-line|z11[highway=motorway]::case
-{
- color: @trunk_orange_case;
- width: 3.6;
- opacity: 1;
- z-index: 45;
-}
-*/
+
line|z11[highway=primary]
{
@@ -181,15 +172,7 @@ line|z11[highway=primary]
opacity: 1;
z-index: 850;
}
-/*
-line|z11[highway=primary]::case
-{
- color: @primary_orange_case;
- width: 2.6;
- opacity: 1;
- z-index: 45;
-}
-*/
+
line|z11[highway=secondary]
{
@@ -219,16 +202,6 @@ line|z12[highway=motorway]
opacity: 1;
z-index: 900;
}
-/*
-line|z12[highway=trunk]::case,
-line|z12[highway=motorway]::case
-{
- color: @trunk_orange_case;
- width: 3.2;
- opacity: 1;
- z-index: 45;
-}
-*/
line|z12[highway=motorway][tunnel?],
line|z12[highway=trunk][tunnel?] {
@@ -247,15 +220,7 @@ line|z12[highway=primary]
opacity: 1;
z-index: 850;
}
-/*
-line|z12[highway=primary]::case
-{
- color: @primary_orange_case;
- width: 2.5;
- opacity: 1;
- z-index: 45;
-}
-*/
+
line|z12[highway=secondary]
{
@@ -287,16 +252,6 @@ line|z13[highway=motorway]
color: @trunk_orange_light;
z-index: 900;
}
-/*
-line|z13[highway=trunk]::case,
-line|z13[highway=motorway]::case
-{
- color: @trunk_orange_case;
- width: 4;
- opacity: 1;
- z-index: 45;
-}
-*/
line|z13[highway=motorway][tunnel?],
line|z13[highway=trunk][tunnel?],
@@ -324,15 +279,6 @@ line|z13[highway=primary]
opacity: 1;
z-index: 850;
}
-/*
-line|z13[highway=primary]::case
-{
- color: @primary_orange_case;
- width: 3.5;
- opacity: 1;
- z-index: 45;
-}
-*/
line|z13[highway=secondary]
{
@@ -367,7 +313,7 @@ line|z13[highway=ford]
{
color: @pedestrian;
width: 1;
- dashes: 2,1;/*dashes: 0.9,0.45 1.8,0.9;*/
+ dashes: 2,1;
opacity: 1;
z-index: 660;
}
@@ -378,8 +324,7 @@ line|z13[highway=cycleway]
width: 1;
opacity: 1;
z-index: 1000;
-/* dashes: 0.9,0.9;
- opacity: 0.8;*/
+
}
line|z13[highway=construction],
@@ -402,16 +347,7 @@ line|z14[highway=motorway]
color: @trunk_orange_light;
z-index: 900;
}
-/*
-line|z14[highway=trunk]::case,
-line|z14[highway=motorway]::case
-{
- color: @trunk_orange_case;
- width: 5;
- opacity: 1;
- z-index: 45;
-}
-*/
+
line|z14[highway=motorway_link],
line|z14[highway=trunk_link]
@@ -439,15 +375,6 @@ line|z14[highway=primary]
opacity: 1;
z-index: 850;
}
-/*
-line|z14[highway=primary]::case
-{
- color: @primary_orange_case;
- width: 4;
- opacity: 1;
- z-index: 45;
-}
-*/
line|z14[highway=primary_link]
{
@@ -587,16 +514,6 @@ line|z15[highway=motorway]
color: @trunk_orange_light;
z-index: 900;
}
-/*
-line|z15[highway=trunk]::case,
-line|z15[highway=motorway]::case
-{
- color: @trunk_orange_case;
- width: 6;
- opacity: 1;
- z-index: 45;
-}
-*/
line|z15[highway=motorway_link],
line|z15[highway=trunk_link]
@@ -623,20 +540,12 @@ line|z15[highway=primary]
opacity: 1;
z-index: 850;
}
-/*
-line|z15[highway=primary]::case
-{
- color: @primary_orange_case;
- width: 5.5;
- opacity: 1;
- z-index: 45;
-}
-*/
+
line|z15[highway=primary_link]
{
color: @primary_orange_light;
- width: 2.1;
+ width: 4.2;
z-index: 840;
}
@@ -781,16 +690,6 @@ line|z16[highway=motorway]
z-index: 900;
}
-/*
-line|z16[highway=trunk]::case,
-line|z16[highway=motorway]::case
-{
- color: @trunk_orange_case;
- width: 8.8;
- opacity: 1;
- z-index: 45;
-}
-*/
line|z16[highway=motorway_link],
line|z16[highway=trunk_link]
@@ -818,20 +717,11 @@ line|z16[highway=primary]
z-index: 850;
}
-/*
-line|z16[highway=primary]::case
-{
- color: @primary_orange_case;
- width: 7.2;
- opacity: 1;
- z-index: 45;
-}
-*/
line|z16[highway=primary_link]
{
color: @primary_orange_light;
- width: 2.4;
+ width: 4.8;
z-index: 840;
}
@@ -1048,20 +938,12 @@ line|z17[highway=primary]
opacity: 1;
z-index: 850;
}
-/*
-line|z17[highway=primary]::case
-{
- color: @primary_orange_case;
- width: 10.5;
- opacity: 1;
- z-index: 45;
-}
-*/
+
line|z17[highway=primary_link]
{
color: @primary_orange_light;
- width: 3.5;
+ width: 7;
opacity: 1;
z-index: 840;
}
@@ -1288,20 +1170,12 @@ line|z18[highway=primary]
opacity: 1;
z-index: 850;
}
-/*
-line|z18[highway=primary]::case
-{
- color: @primary_orange_case;
- width: 16;
- opacity: 1;
- z-index: 45;
-}
-*/
+
line|z18[highway=primary_link]
{
color: @primary_orange_light;
- width: 5;
+ width: 10;
opacity: 1;
z-index: 840;
}
@@ -1528,20 +1402,11 @@ line|z19-[highway=primary]
opacity: 1;
z-index: 850;
}
-/*
-line|z19-[highway=primary]::case
-{
- color: @primary_orange_case;
- width: 16;
- opacity: 1;
- z-index: 45;
-}
-*/
line|z19-[highway=primary_link]
{
color: @primary_orange_light;
- width: 7;
+ width: 13;
opacity: 1;
z-index: 840;
}
diff --git a/data/styles/clear/include/transport.mapcss b/data/styles/clear/include/transport.mapcss
index 558e154500..802d66ec79 100644
--- a/data/styles/clear/include/transport.mapcss
+++ b/data/styles/clear/include/transport.mapcss
@@ -1386,7 +1386,12 @@ line|z14-15[aerialway=cable_car],
line|z14-15[aerialway=chair_lift],
line|z14-15[aerialway=gondola],
line|z14-15[aerialway=mixed_lift],
-line|z14-15[aerialway=drag_lift]
+line|z14-15[aerialway=drag_lift],
+line|z14-15[aerialway=j-bar],
+line|z14-15[aerialway=t-bar],
+line|z14-15[aerialway=magic_carpet],
+line|z14-15[aerialway=platter],
+line|z14-15[aerialway=rope_tow],
{
color: @aerialway;
width: 0.5;
@@ -1398,7 +1403,12 @@ line|z16[aerialway=cable_car],
line|z16[aerialway=chair_lift],
line|z16[aerialway=gondola],
line|z16[aerialway=mixed_lift],
-line|z16[aerialway=drag_lift]
+line|z16[aerialway=drag_lift],
+line|z16[aerialway=j-bar],
+line|z16[aerialway=t-bar],
+line|z16[aerialway=magic_carpet],
+line|z16[aerialway=platter],
+line|z16[aerialway=rope_tow],
{
color: @aerialway;
width: 1;
@@ -1410,7 +1420,12 @@ line|z17-[aerialway=cable_car],
line|z17-[aerialway=chair_lift],
line|z17-[aerialway=gondola],
line|z17-[aerialway=mixed_lift],
-line|z17-[aerialway=drag_lift]
+line|z17-[aerialway=drag_lift],
+line|z17-[aerialway=j-bar],
+line|z17-[aerialway=t-bar],
+line|z17-[aerialway=magic_carpet],
+line|z17-[aerialway=platter],
+line|z17-[aerialway=rope_tow],
{
color: @aerialway;
width: 1;
@@ -1420,8 +1435,13 @@ line|z17-[aerialway=drag_lift]
line|z14[aerialway=cable_car]::dash,
line|z14[aerialway=chair_lift]::dash,
line|z14[aerialway=gondola]::dash,
-line|z14[aerialway=mixed_lift]::dash
-line|z14[aerialway=drag_lift] ::dash
+line|z14[aerialway=mixed_lift]::dash,
+line|z14[aerialway=drag_lift] ::dash,
+line|z14[aerialway=j-bar]::dash,
+line|z14[aerialway=t-bar]::dash,
+line|z14[aerialway=magic_carpet]::dash,
+line|z14[aerialway=platter]::dash,
+line|z14[aerialway=rope_tow]::dash,
{
color: @aerialway;
width: 2.5;
@@ -1434,7 +1454,12 @@ line|z15-[aerialway=cable_car]::dash,
line|z15-[aerialway=chair_lift]::dash,
line|z15-[aerialway=gondola]::dash,
line|z15-[aerialway=mixed_lift]::dash,
-line|z15-[aerialway=drag_lift] ::dash
+line|z15-[aerialway=drag_lift] ::dash,
+line|z15-[aerialway=j-bar]::dash,
+line|z15-[aerialway=t-bar]::dash,
+line|z15-[aerialway=magic_carpet]::dash,
+line|z15-[aerialway=platter]::dash,
+line|z15-[aerialway=rope_tow]::dash,
{
color: @aerialway;
width: 2.5;
@@ -1454,7 +1479,13 @@ node|z15[aerialway=station],
node|z15[aerialway=cable_car],
node|z15[aerialway=chair_lift],
node|z15[aerialway=gondola],
-node|z15[aerialway=mixed_lift] {
+node|z15[aerialway=mixed_lift],
+node|z15[aerialway=drag_lift],
+node|z15[aerialway=j-bar],
+node|z15[aerialway=t-bar],
+node|z15[aerialway=magic_carpet],
+node|z15[aerialway=platter],
+node|z15[aerialway=rope_tow], {
icon-image: cable-car-m.svg;
z-index: 2600;
text-offset: 6;
@@ -1470,7 +1501,13 @@ node|z16-17[aerialway=station],
node|z16-17[aerialway=cable_car],
node|z16-17[aerialway=chair_lift],
node|z16-17[aerialway=gondola],
-node|z16-17[aerialway=mixed_lift]{
+node|z16-17[aerialway=mixed_lift],
+node|z16-17[aerialway=drag_lift],
+node|z16-17[aerialway=j-bar],
+node|z16-17[aerialway=t-bar],
+node|z16-17[aerialway=magic_carpet],
+node|z16-17[aerialway=platter],
+node|z16-17[aerialway=rope_tow],{
icon-image: cable-car-m.svg;
text-offset: 8;
font-size: 10;
@@ -1483,10 +1520,16 @@ node|z16-17[aerialway=mixed_lift]{
}
node|z18-[aerialway=station],
-node|z18[aerialway=cable_car],
-node|z18[aerialway=chair_lift],
-node|z18[aerialway=gondola],
-node|z18[aerialway=mixed_lift] {
+node|z18-[aerialway=cable_car],
+node|z18-[aerialway=chair_lift],
+node|z18-[aerialway=gondola],
+node|z18-[aerialway=mixed_lift],
+node|z18-[aerialway=drag_lift],
+node|z18-[aerialway=j-bar],
+node|z18-[aerialway=t-bar],
+node|z18-[aerialway=magic_carpet],
+node|z18-[aerialway=platter],
+node|z18-[aerialway=rope_tow], {
icon-image: cable-car-l.svg;
text-offset: 8;
font-size: 12;
diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss
index 7189d5db5a..dda99a394e 100644
--- a/data/styles/clear/style-clear/colors.mapcss
+++ b/data/styles/clear/style-clear/colors.mapcss
@@ -178,8 +178,8 @@
/* PISTE */
@piste: #C47AFF;
-@piste_novice: #11dd00;
-@piste_easy: #11dd00;
-@piste_intermadiate: #ff0000;
-@piste_expert: #333333;
-@piste_advanced: #333333;
+@piste_novice:#5feb2e;
+@piste_easy: #0b27fb;
+@piste_intermadiate: #fc0e1b;
+@piste_expert: #220625;
+@piste_advanced: #0a0a0d;
diff --git a/data/styles/clear/style-clear/symbols/hospital-l.svg b/data/styles/clear/style-clear/symbols/hospital-l.svg
index 22fb7fb4b2..df9f588c26 100644
--- a/data/styles/clear/style-clear/symbols/hospital-l.svg
+++ b/data/styles/clear/style-clear/symbols/hospital-l.svg
@@ -5,10 +5,10 @@
Created with Sketch.
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/hospital-m.svg b/data/styles/clear/style-clear/symbols/hospital-m.svg
index fea2f89044..2fdd43afa1 100644
--- a/data/styles/clear/style-clear/symbols/hospital-m.svg
+++ b/data/styles/clear/style-clear/symbols/hospital-m.svg
@@ -5,10 +5,10 @@
Created with Sketch.
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/hospital-s.svg b/data/styles/clear/style-clear/symbols/hospital-s.svg
index 191881843d..1608301939 100644
--- a/data/styles/clear/style-clear/symbols/hospital-s.svg
+++ b/data/styles/clear/style-clear/symbols/hospital-s.svg
@@ -5,10 +5,10 @@
Created with Sketch.
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/clear/style-night/colors.mapcss
index bbb9a932c1..443eae2f28 100644
--- a/data/styles/clear/style-night/colors.mapcss
+++ b/data/styles/clear/style-night/colors.mapcss
@@ -5,9 +5,9 @@
@backgroundone: #DEDECD;
/* BOUNDARIES */
-@border_country: #555544;
-@border_country_light: #444433;
-@border_region: #555544;
+@border_country: #555555;
+@border_country_light: #666666;
+@border_region: #666666;
/* ROADS */
@@ -24,30 +24,30 @@
@trunk_yellow_case: black;
/* ORANGE ROADS BUNDLE */
-@trunk_orange: #FF5102;
-@trunk_orange_hard: #F7632C;
-@trunk_orange_medium: #F86B39;
-@trunk_orange_light: #F87C4A;
-@trunk_orange_case: #DDDDCC;
-@primary_orange: #FF864E;
-@primary_orange_medium: #FC9757;
-@primary_orange_light: #FCA462;
-@primary_orange_case: #DDDDCC;
-@trunk_tunnel_orange: #FF8800;
+@trunk_orange: #381F14;
+@trunk_orange_hard: #331C12;
+ @trunk_orange_medium: #381F14;
+ @trunk_orange_light: #381F11;
+@trunk_orange_case: black;
+ @primary_orange: #422518;
+ @primary_orange_medium: #422518;
+ @primary_orange_light: #422518;
+@primary_orange_case: black;
+ @trunk_tunnel_orange: #381F14;
@primary_medium: #373211;
@primary_light: #373211;
-@secondary: #222222;
-@residential: #222222;
-@tertiary: #222222;
-@unclassified: #222222;
-@pedestrian: #333322;
-@footway: #333322;
-@cycleway: #61403F;
-@steps: #222222;
-@construction: #222222;
-@track: #222222;
-@bridleway: #222222;
+ @secondary: #2B2827;
+ @residential: #2B2827;
+ @tertiary: #2B2827;
+ @unclassified: #2B2827;
+ @pedestrian: #4D4744;
+ @footway: #2B2827;
+ @cycleway: #6E3D47;
+ @steps: #2B2827;
+ @construction: #332F2D;
+ @track: #2B2827;
+ @bridleway: #2B2827;
@@ -57,23 +57,23 @@
/* tunnels */
-@primary_tunnel_orange: #FCA462;
+ @primary_tunnel_orange: #4C2A1B;
@primary_tunnel_yellow: #61562B;
-@trunk_tunnel_orange: #FCA462;
+ @trunk_tunnel_orange: #381F14;
@trunk_tunnel_yellow: #61400B;
-@primary_tunnel_casing: #000000;
-@trunk_tunnel_casing: #000000;
-@secondary_tunnel: #2E2E1C;
+ @primary_tunnel_casing: #000000;
+ @trunk_tunnel_casing: #000000;
+@secondary_tunnel: #2B2827;
@secondary_tunnel_casing: #000000;
-@tertiary_tunnel: #2E2E1C;
+@tertiary_tunnel: #2B2827;
@tertiary_tunnel_casing: #000000;
-@unclassified_tunnel: #2E2E1C;
+@unclassified_tunnel: #2B2827;
@unclassified_tunnel_casing: #000000;
/*roads_links */
-@trunk_link: #2E2E1C;
-@primary_link: #2E2E1C;
-@secondary_link: #2E2E1C;
-@tertiary_link: #2E2E1C;
+@trunk_link: #85492E;
+@primary_link: #663824;
+@secondary_link: #2B2827;
+@tertiary_link: #2B2827;
/* TRANSPORT */
@@ -84,49 +84,49 @@
@aerialway: #4E4E3D;
@tram: #5C5C51;
@ferry: #2A4541;
-@aerodrome: #2A1444;
+ @aerodrome: #382D45;
/*aerodrome*/
-@aerodrome0: #2A1444;
-@aerodrome1: #2A1444;
-@aerodrome2: #2A1444;
-@aerodrome3: #2A1444;
-@aerodrome4: #2A1444;
-@aerodrome5: #2A1444;
+ @aerodrome0: #382D45;
+ @aerodrome1: #382D45;
+ @aerodrome2: #382D45;
+ @aerodrome3: #382D45;
+ @aerodrome4: #382D45;
+ @aerodrome5: #382D45;
/* NATURAL */
@glacier: #111111;
@water: #002222;
@river: #062026;
@wetland: #001919;
-@forest: #1B2500;
-@park: #1B2500;
+@forest: #141C00;
+@park: #141C00;
@beach: #28281A;
/*forest-park*/
-@green0: #1B2500;
-@green1: #1B2500;
-@green2: #1B2500;
-@green3: #1B2500;
-@green4: #1B2500;
-@green5: #1B2500;
+ @green0: #0F1400;
+ @green1: #131900;
+ @green2: #141C00;
+ @green3: #141C00;
+ @green4: #141C00;
+ @green5: #141C00;
/* BUILDINGS */
@housename: #555555;
@building: #222222;
@building_dark: #333333;
/* LANDUSE */
-@pedestrian_area: #2E2E1C;
-@pedestrian_area_light: #2E2E1C;
-@unversity: #2C2A17;
-@hospital: #3B2D23;
-@industrial: #141400;
-@sport: #111100;
-@parking: #001111;
+@pedestrian_area: #262222;
+@pedestrian_area_light: #262222;
+@unversity: #261F13;
+@hospital: #261916;
+@industrial: #191419;
+@sport: #21211B;
+@parking: #1F1B1B;
/* BARRIERS */
@fence: #444444;
/* LABELS COLORS */
-@label_extra_dark: #EEEEEE;
-@label_dark: #B2B2B2;
+@label_extra_dark: #999999;
+@label_dark: #888888;
@label_medium: #777777;
@label_light: #666666;
@label_extra_light: #555555;
@@ -154,16 +154,15 @@
@primary_road_label: #909090;
@secondary_road_label: #707070;
@road_label_halo: #000000;
-@shield: #FFFFFF;
+@shield: #b2b2b2;
@shield_halo: #000000;
-/* blue - #2E89B0; #498F46; #598DBE; */
/* NATURAL LABELS */
-@water_label: #004466;
-@park_label: #1B430B;
-@halo_park_lable: #000000;
-@halo_water_lable: #000000;
+@water_label: #004A59;
+@park_label: #2B4918;
+@halo_park_lable: #111;
+@halo_water_lable: #111;
/* UNIVERSAL HALO */
@label_halo: #FFFFFF;
@@ -172,9 +171,9 @@
@building_label: #555555;
/* PISTE */
-@piste: #333333;
-@piste_novice: #004400;
-@piste_easy: #004400;
-@piste_intermadiate: #440000;
+@piste: #623D7F;
+@piste_novice:#5feb2e;
+@piste_easy: #0b27fb;
+@piste_intermadiate: #fc0e1b;
@piste_expert: #333333;
-@piste_advanced: #333333;
+@piste_advanced: #222222;
diff --git a/data/styles/clear/style-night/symbols/airport-l.svg b/data/styles/clear/style-night/symbols/airport-l.svg
index 7b96530b5b..b4cc83306a 100644
--- a/data/styles/clear/style-night/symbols/airport-l.svg
+++ b/data/styles/clear/style-night/symbols/airport-l.svg
@@ -7,7 +7,7 @@
-
+
diff --git a/data/styles/clear/style-night/symbols/airport-m.svg b/data/styles/clear/style-night/symbols/airport-m.svg
index cd7cd0b58a..3fffcbc07e 100644
--- a/data/styles/clear/style-night/symbols/airport-m.svg
+++ b/data/styles/clear/style-night/symbols/airport-m.svg
@@ -7,7 +7,7 @@
-
+
diff --git a/data/styles/clear/style-night/symbols/airport-s.svg b/data/styles/clear/style-night/symbols/airport-s.svg
index 0468939ec0..8320aa3f80 100644
--- a/data/styles/clear/style-night/symbols/airport-s.svg
+++ b/data/styles/clear/style-night/symbols/airport-s.svg
@@ -7,7 +7,7 @@
-
+
diff --git a/data/styles/clear/style-night/symbols/alcohol-l.svg b/data/styles/clear/style-night/symbols/alcohol-l.svg
index 942594a6bb..4a84528671 100644
--- a/data/styles/clear/style-night/symbols/alcohol-l.svg
+++ b/data/styles/clear/style-night/symbols/alcohol-l.svg
@@ -10,7 +10,7 @@
-
+
diff --git a/data/styles/clear/style-night/symbols/alcohol-m.svg b/data/styles/clear/style-night/symbols/alcohol-m.svg
index d326f6c642..db53469fd9 100644
--- a/data/styles/clear/style-night/symbols/alcohol-m.svg
+++ b/data/styles/clear/style-night/symbols/alcohol-m.svg
@@ -10,7 +10,7 @@
-
+
diff --git a/data/styles/clear/style-night/symbols/alcohol-s.svg b/data/styles/clear/style-night/symbols/alcohol-s.svg
index beea976582..78a6aaa81c 100644
--- a/data/styles/clear/style-night/symbols/alcohol-s.svg
+++ b/data/styles/clear/style-night/symbols/alcohol-s.svg
@@ -10,7 +10,7 @@
-
+
diff --git a/data/styles/clear/style-night/symbols/alpine_hut-l.svg b/data/styles/clear/style-night/symbols/alpine_hut-l.svg
index beff7b27bb..d719bdb1f1 100644
--- a/data/styles/clear/style-night/symbols/alpine_hut-l.svg
+++ b/data/styles/clear/style-night/symbols/alpine_hut-l.svg
@@ -8,7 +8,7 @@
-
+
diff --git a/data/styles/clear/style-night/symbols/alpine_hut-m.svg b/data/styles/clear/style-night/symbols/alpine_hut-m.svg
index 1f5ac8e3d5..780c828299 100644
--- a/data/styles/clear/style-night/symbols/alpine_hut-m.svg
+++ b/data/styles/clear/style-night/symbols/alpine_hut-m.svg
@@ -8,7 +8,7 @@
-
+
diff --git a/data/styles/clear/style-night/symbols/america-football-l.svg b/data/styles/clear/style-night/symbols/america-football-l.svg
index 67a187a2f4..f52c4b5ca1 100644
--- a/data/styles/clear/style-night/symbols/america-football-l.svg
+++ b/data/styles/clear/style-night/symbols/america-football-l.svg
@@ -10,7 +10,7 @@