Merged in static_ernie_leanmodal_closebox

css/application.css

@@ -552,12 +552,26 @@ div.leanModal_box {
   border: none;
   background: #fff;
   padding: 45.304px; }
+  div.leanModal_box a.modal_close {
+    position: absolute;
+    top: 12px;
+    right: 12px;
+    display: block;
+    width: 14px;
+    height: 14px;
+    z-index: 2;
+    color: #aaa;
+    font-style: normal; }
+    div.leanModal_box a.modal_close:hover {
+      text-decoration: none;
+      color: #993333; }
   div.leanModal_box h1 {
     font-size: 24px;
     margin-top: 0;
     padding-bottom: 22.652px;
     border-bottom: 1px solid #eee;
-    margin-bottom: 22.652px; }
+    margin-bottom: 22.652px;
+    text-align: left; }
   div.leanModal_box#enroll {
     max-width: 600px; }
     div.leanModal_box#enroll ol li.terms, div.leanModal_box#enroll ol li.honor-code {
@@ -3703,6 +3717,17 @@ div.answer-own {
   padding-left: 8.178%;
   padding-top: 10px; }
 
+div.answer-actions {
+  text-align: right;
+  margin: 0;
+  padding: 0; }
+  div.answer-actions span.sep {
+    color: #ddd; }
+  div.answer-actions a {
+    text-decoration: none; }
+  div.answer-actions a.question-edit, div.answer-actions a.permant-link {
+    color: #999; }
+
 form.answer-form, form.question-form {
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;

css/marketing.css

@@ -627,12 +627,26 @@ div.leanModal_box {
   border: none;
   background: #fff;
   padding: 51.776px; }
+  div.leanModal_box a.modal_close {
+    position: absolute;
+    top: 12px;
+    right: 12px;
+    display: block;
+    width: 14px;
+    height: 14px;
+    z-index: 2;
+    color: #aaa;
+    font-style: normal; }
+    div.leanModal_box a.modal_close:hover {
+      text-decoration: none;
+      color: #993333; }
   div.leanModal_box h1 {
     font-size: 24px;
     margin-top: 0;
     padding-bottom: 25.888px;
     border-bottom: 1px solid #eee;
-    margin-bottom: 25.888px; }
+    margin-bottom: 25.888px;
+    text-align: left; }
   div.leanModal_box#enroll {
     max-width: 600px; }
     div.leanModal_box#enroll ol li.terms, div.leanModal_box#enroll ol li.honor-code {

js/jquery.leanModal.js

@@ -6,8 +6,13 @@
  
             var defaults = {
                 top: 100,
-                overlay: 0.5
+                overlay: 0.5,
+                closeButton:'.modal_close'
             }
+            
+            var overlay = $("<div id='lean_overlay'></div>");
+            
+            $("body").append(overlay);
                  
             options =  $.extend(defaults, options);
  
@@ -17,17 +22,20 @@
                
                 $(this).click(function(e) {
               
-          	  	var overlay = $("<div id='lean_overlay'></div>");
-              
               	var modal_id = $(this).attr("href");
 
         $(".leanModal_box").css({ 'display' : 'none' });
 
 				$("body").append(overlay);
-                
+        $(".leanModal_box").append("<a class=\"modal_close\" href=\"#\">&#10006;</a>");
+
 				$("#lean_overlay").click(function() { 
                      close_modal(modal_id);                    
                 });
+                
+                $(o.closeButton).click(function() { 
+                     close_modal(modal_id);                    
+                });
                          	
               	var modal_height = $(modal_id).outerHeight();
         	  	var modal_width = $(modal_id).outerWidth();

js/jquery.leanModal.min.js

-(function(a){a.fn.extend({leanModal:function(b){function d(b){a("#lean_overlay").fadeOut(200);a(b).css({display:"none"})}var c={top:100,overlay:.5};b=a.extend(c,b);return this.each(function(){var c=b;a(this).click(function(b){var e=a("<div id='lean_overlay'></div>");var f=a(this).attr("href");a(".leanModal_box").css({display:"none"});a("body").append(e);a("#lean_overlay").click(function(){d(f)});var g=a(f).outerHeight();var h=a(f).outerWidth();a("#lean_overlay").css({display:"block",opacity:0});a("#lean_overlay").fadeTo(200,c.overlay);a(f).css({display:"block",position:"fixed",opacity:0,"z-index":11e3,left:50+"%","margin-left":-(h/2)+"px",top:c.top+"px"});var i=a(f).offset().top+"px";a(f).css({position:"absolute",top:i});a(f).fadeTo(200,1);b.preventDefault()})})}})})(jQuery)
+(function(a){a.fn.extend({leanModal:function(b){function e(b){a("#lean_overlay").fadeOut(200);a(b).css({display:"none"})}var c={top:100,overlay:.5,closeButton:".modal_close"};var d=a("<div id='lean_overlay'></div>");a("body").append(d);b=a.extend(c,b);return this.each(function(){var c=b;a(this).click(function(b){var f=a(this).attr("href");a(".leanModal_box").css({display:"none"});a("body").append(d);a(".leanModal_box").append('<a class="modal_close" href="#">&#10006;</a>');a("#lean_overlay").click(function(){e(f)});a(c.closeButton).click(function(){e(f)});var g=a(f).outerHeight();var h=a(f).outerWidth();a("#lean_overlay").css({display:"block",opacity:0});a("#lean_overlay").fadeTo(200,c.overlay);a(f).css({display:"block",position:"fixed",opacity:0,"z-index":11e3,left:50+"%","margin-left":-(h/2)+"px",top:c.top+"px"});var i=a(f).offset().top+"px";a(f).css({position:"absolute",top:i});a(f).fadeTo(200,1);b.preventDefault()})})}})})(jQuery)