Skip to content

Commit

Permalink
Merge pull request #20 from markaspot/additional-colors
Browse files Browse the repository at this point in the history
Some new colors for markers-soft images, CSS and example
lennardv2 committed Feb 23, 2014
2 parents 213cc5d + 41b6101 commit af0bfc8
Showing 4 changed files with 40 additions and 4 deletions.
Binary file modified dist/images/markers-soft.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified dist/images/markers-soft@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 39 additions & 3 deletions dist/leaflet.awesome-markers.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Author: L. Voogdt
License: MIT
Version: 1.0
@@ -27,7 +27,7 @@ Version: 1.0
(-webkit-min-device-pixel-ratio: 1.5),(min-device-pixel-ratio: 1.5),(min-resolution: 1.5dppx) {
.awesome-marker {
background-image: url('images/markers-soft@2x.png');
background-size: 360px 46px;
background-size: 720px 46px;
}
.awesome-marker-shadow {
background-image: url('images/markers-shadow@2x.png');
@@ -55,10 +55,18 @@ Version: 1.0
background-position: -180px 0;
}

.awesome-marker-icon-lightred {
background-position: -360px 0;
}

.awesome-marker-icon-orange {
background-position: -36px 0;
}

.awesome-marker-icon-beige {
background-position: -396px 0;
}

.awesome-marker-icon-green {
background-position: -72px 0;
}
@@ -67,6 +75,10 @@ Version: 1.0
background-position: -252px 0;
}

.awesome-marker-icon-lightgreen {
background-position: -432px 0;
}

.awesome-marker-icon-blue {
background-position: -108px 0;
}
@@ -75,6 +87,10 @@ Version: 1.0
background-position: -216px 0;
}

.awesome-marker-icon-lightblue {
background-position: -468px 0;
}

.awesome-marker-icon-purple {
background-position: -144px 0;
}
@@ -83,6 +99,26 @@ Version: 1.0
background-position: -288px 0;
}

.awesome-marker-icon-pink {
background-position: -504px 0;
}

.awesome-marker-icon-cadetblue {
background-position: -324px 0;
}
}

.awesome-marker-icon-white {
background-position: -574px 0;
}

.awesome-marker-icon-gray {
background-position: -648px 0;
}

.awesome-marker-icon-lightgray {
background-position: -612px 0;
}

.awesome-marker-icon-black {
background-position: -682px 0;
}
2 changes: 1 addition & 1 deletion examples/random-markers.html
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@
detectRetina: true
}).addTo(map);

var colors = ['red', 'blue', 'green', 'purple', 'orange', 'darkred', 'darkblue', 'darkgreen', 'cadetblue', 'darkpurple'];
var colors = ['red', 'blue', 'green', 'purple', 'orange', 'darkred', 'lightred', 'beige', 'darkblue', 'darkgreen', 'cadetblue', 'darkpurple', 'white', 'pink', 'lightblue', 'lightgreen', 'gray', 'black', 'lightgray'];

var awesomeIcons = ['font', 'cloud-download', 'medkit', 'github-alt', 'coffee', 'twitter', 'shopping-cart', 'tags', 'star'];

0 comments on commit af0bfc8

Please sign in to comment.