From e44960f78019d933c678df46aa1b576e274aca00 Mon Sep 17 00:00:00 2001 From: Max Goodman Date: Thu, 8 Nov 2012 14:24:58 -0800 Subject: [PATCH] Add a close button to the comment gilding box. --- r2/r2/public/static/close.png | Bin 0 -> 287 bytes r2/r2/public/static/css/reddit.css | 20 ++++++++++++++++++++ r2/r2/public/static/js/gold.js | 2 +- r2/r2/templates/goldpayment.html | 3 +++ 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 r2/r2/public/static/close.png diff --git a/r2/r2/public/static/close.png b/r2/r2/public/static/close.png new file mode 100644 index 0000000000000000000000000000000000000000..609b4cd8b48c77b771751e81691923097c3582a8 GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uAB#T}@sR2?f#ZI0f96(URk z2Vq7hjoB4ILCF%=h?3y^w370~qEv?R@^Zb*yzJuS#DY}4{G#;P?`))iispE_IEH9U zti5Q+$LJ{1@UTC}Y@PdKvn@hZtv9%Lw7ZGCFyUgaoTa$?ap0b`Py5b1k)QFnk9Sr_ z0Ke3m0`1@DI*i(-#0p-#jhQN~)Xd4Dlh~uzIGLqHV*mUJ2h-VXJH?{2l*xg7DIlA&8=Q4|=yXR*eVAY$k amtk%G;WKH>TGl{!GI+ZBxvX td { margin-left: 80px; } +.gold-payment .close-button { + width: 13px; + height: 13px; + float: right; + margin: 6px 4px 6px 8px; + border: none; + background: url(../close.png) no-repeat; /* SPRITE */ + text-indent: -9999px; + opacity: .25; +} + +.gold-payment .close-button:hover { + opacity: .55; +} + +.gold-payment .close-button:active { + position: relative; + top: 1px; +} + .giftmessage { border: solid #888 1px; color: black; diff --git a/r2/r2/public/static/js/gold.js b/r2/r2/public/static/js/gold.js index 195610cd7..6b2b8091d 100644 --- a/r2/r2/public/static/js/gold.js +++ b/r2/r2/public/static/js/gold.js @@ -4,7 +4,7 @@ r.gold = { init: function () { $('div.content').on( 'click', - 'a.give-gold, .gilded-comment-icon', + 'a.give-gold, .gilded-comment-icon, .gold-payment .close-button', $.proxy(this, '_toggleCommentGoldForm') ) }, diff --git a/r2/r2/templates/goldpayment.html b/r2/r2/templates/goldpayment.html index 3b006bb6e..4304f670d 100644 --- a/r2/r2/templates/goldpayment.html +++ b/r2/r2/templates/goldpayment.html @@ -29,6 +29,9 @@
+ % if thing.clone_template: + + % endif
${unsafe(safemarkdown(thing.summary, wrap=False))}