Skip to content

Commit

Permalink
Merge pull request #1 from apphillipe/2.0/develop
Browse files Browse the repository at this point in the history
Adding square markers
  • Loading branch information
george-silva authored Oct 31, 2016
2 parents 4dfeef6 + dc99c3f commit c7d1990
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 1 deletion.
15 changes: 14 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ For bootstrap 2.x & Fontawesome 3.x use Leaflet.awesome-markers v1.0

## Screenshots
![AwesomeMarkers screenshot](https://raw.github.com/lvoogdt/Leaflet.awesome-markers/master/screenshots/screenshot-soft.png "Screenshot of AwesomeMarkers")

<a href="http://jsfiddle.net/VPzu4/92/" target="_blank">JSfiddle demo</a>

### Twitter Bootstrap/Font-Awesome icons
Expand Down Expand Up @@ -108,6 +108,19 @@ Set default prefix to something other than `glypicon`

See [JSFIddle](http://jsfiddle.net/markmarijnissen/VPzu4/286/)

### Using Square Markers

![Square Markers screenshot](/screenshots/screenshot-square-markers.png "Screenshot of Square Markers")

````js
// Creates a red square marker with the coffee icon
var squareRedMarker = L.AwesomeMarkers.icon({
icon: 'coffee',
markerColor: 'red'
className: 'awesome-marker awesome-marker-square'
});
````

## License
- Leaflet.AwesomeMarkers and colored markers are licensed under the MIT License - http://opensource.org/licenses/mit-license.html.
- Font Awesome: http://fortawesome.github.io/Font-Awesome/license/
Expand Down
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.
4 changes: 4 additions & 0 deletions dist/leaflet.awesome-markers.css
Original file line number Diff line number Diff line change
Expand Up @@ -122,3 +122,7 @@ Version: 1.0
.awesome-marker-icon-black {
background-position: -682px 0;
}

.awesome-marker-square {
background-position-y: -46px;
}
Binary file added screenshots/screenshot-square-markers.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c7d1990

Please sign in to comment.