fixing merge conflicts

1 files changed, 3 insertions, 6 deletions

diff --git a/static/gritter/css/jquery.gritter.css b/static/gritter/css/jquery.gritter.css
index 0982790..177765a 100755
--- a/static/gritter/css/jquery.gritter.css
+++ b/static/gritter/css/jquery.gritter.css
@@ -48,14 +48,12 @@ color:#000;
 	background:url('.'); /* ie7/8 fix */ 
 }
 .gritter-top {
-	background:url(../images/gritter.png0) no-repeat left -30px;
 	height:10px;
 }
 .hover .gritter-top {
 	background-position:right -30px;
 }
 .gritter-bottom {
-	background:url(../images/gritter.png0) no-repeat left bottom;
 	height:0px;
 	margin:0;
 }
@@ -64,7 +62,6 @@ color:#000;
 }
 .gritter-item {
 	display:block;
-	background:url(../images/gritter.png0) no-repeat left -40px;
 background-color:#eee;
 	color:#000;
 	height:auto;
@@ -88,7 +85,7 @@ height:auto;
 -webkit-box-shadow: 5px 7px 10px #c8cbce;
 -moz-box-shadow: 5px 7px 10px #c8cbce;
 border:0px solid #999;
-	background:url(/static/gritterbg.png)
+	background:url(/static/gritter/gritterbg.png)
 }
 .gritter-item a{color:#000;
 }
@@ -106,7 +103,7 @@ right:0;
 	position:absolute;
 	top:-5px;
 	right:-12px;
-	background:url(../images/gritter.png) no-repeat left top;
+	background:url(/static/gritter/gritterclose.png) no-repeat left top;
 	cursor:pointer;
 	width:30px;
 	height:30px;
@@ -117,7 +114,7 @@ right:0;
 	color:#000;
 	display:block;
 }
-.gritter-title a{color:#000;
+.gritter-title a:link{color:#000;
 }
 .gritter-image {
 	width:48px;