From f4ecfe61fb07cc9e5394cd30d817ffae0a7a9804 Mon Sep 17 00:00:00 2001
From: Vladimir Agafonkin <agafonkin@gmail.com>
Date: Thu, 12 Jul 2012 16:22:14 +0300
Subject: [PATCH] improve popup close button, get rid of the image, closes #631

---
 dist/images/popup-close.png | Bin 1125 -> 0 bytes
 dist/leaflet.css            |  26 ++++++++++++++------------
 src/layer/Popup.js          |   1 +
 3 files changed, 15 insertions(+), 12 deletions(-)
 delete mode 100644 dist/images/popup-close.png

diff --git a/dist/images/popup-close.png b/dist/images/popup-close.png
deleted file mode 100644
index c8faec5ea909075fd573e032a67f867e66b0eea7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1125
zcmaJ=U1$?o6rLt(YiKdcqR^`BW&B}LlbK1Hgp7%uB$L`er<63sh@ehpZricW+;QgC
zOuH_d3gSPgpuSYm-G{BPhzPPQtGl8_5EMlar2agJZ-NRUiZAs}ZK4mxd6;|d<@>(#
zopaAU*xR$Q#n<MeD5@pbCFaTM#=fQn<bO1D?;2TJakhy2&;TyW7Nk-tDnXFb<w2N-
zvO2o!HcU{I7ifhdE=t|Jg7l#5VuFrt5;jF8Ivi70h9L$eIH(y(`t`s6(?C;`^rnc!
zN@fNQX<cI$>>KMTC}YD)T%|iUfP}*n0Ucr)IQmY*=A9%xtILzvJ!WVy3&F!l`m?E`
z)C)4mf*=xP0}2~uL6i$};r3W8whn|?j%C;o!-WD|j1Px+mIZSkO|n_)0G}5-=W>x<
zk{-g?<Qb-1E(gouAhHG-E*_7&8lg~tAOiNNfn_IP*ej|EBD57tGqHvY;3~=`G=h^f
zar(Ig-K@zP_FS7t!x%?487|1WB~^iv^nIwV*U&c3!!LfnDQp);O~~Y-jYcemT-?A4
zH<ig}EGT1S6%g84?PBi`!pI&%Cdl+fz$VR5QQ4kFOA?<mY%CiJ%!x^w@PnGB@{z2V
zX^*8kxlS(4aalH=PDfK>oXbWd(O5JbuX07CjOft7Rjyj&rrEk&cMx=wWEP>N?S^Wn
zg>*1mFt643BG%QL<EnMNq_TCn3^BvF*ZS2pSC7c-xM6K*$)+~;&>*vJk)eL}?$4X#
zK|Ichse&_IO8oM%eXZA<3HaA~cl~$#;O(X0uKDUts}1@WOuem?wzQ7>mX1%ffdS8R
zNtkG!x-4Av9q6xoX!W1IL@iu3N&DY;pPv-g`TFO1^1@#Y`64wnAuMY?X_kb_HsOh9
z>dcXunVH6a_AlCTqVdG<zk#gq{$UtwzTmmySw7j&@`HyH&T`%dhbzT14eO~<_NN!O
zR<F#0m(!Kv;sZC2Cq67u-|g{x*F0**KmObuKEHbW`h2jp>1}u0u|Jx8&bb>M_o>Ex
haIv46e`t9_6HEPiDxppP-SyOc__=J4crm?w?<ZpCXTtyh

diff --git a/dist/leaflet.css b/dist/leaflet.css
index 2cab9818..e7ae4b6f 100644
--- a/dist/leaflet.css
+++ b/dist/leaflet.css
@@ -305,15 +305,20 @@
 	-o-transform: rotate(45deg);
 	transform: rotate(45deg);
 	}
-.leaflet-popup-close-button {
+.leaflet-container a.leaflet-popup-close-button {
 	position: absolute;
-	top: 8px;
-	right: 8px;
-
-	width: 10px;
-	height: 10px;
-
-	overflow: hidden;
+	top: 3px;
+	right: 3px;
+	text-align: center;
+	width: 24px;
+	height: 24px;
+	font: 16px/24px Tahoma, Verdana, sans-serif;
+	color: #ccc;
+	text-decoration: none;
+	font-weight: bold;
+	}
+.leaflet-container a.leaflet-popup-close-button:hover {
+	color: #999;
 	}
 .leaflet-popup-content p {
 	margin: 18px 0;
@@ -362,7 +367,4 @@
 	}
 .leaflet-popup-content {
 	font: 12px/1.4 "Helvetica Neue", Arial, Helvetica, sans-serif;
-	}
-.leaflet-popup-close-button {
-	background: white url(images/popup-close.png);
-	}
+	}
\ No newline at end of file
diff --git a/src/layer/Popup.js b/src/layer/Popup.js
index 630ea41d..322bfaff 100644
--- a/src/layer/Popup.js
+++ b/src/layer/Popup.js
@@ -107,6 +107,7 @@ L.Popup = L.Class.extend({
 		if (this.options.closeButton) {
 			closeButton = this._closeButton = L.DomUtil.create('a', prefix + '-close-button', container);
 			closeButton.href = '#close';
+			closeButton.innerHTML = '&times;';
 
 			L.DomEvent.on(closeButton, 'click', this._onCloseButtonClick, this);
 		}