diff --git a/public/assets/kindeditor/at/config.js b/public/assets/kindeditor/at/config.js index 2bab7eb67..651f33464 100644 --- a/public/assets/kindeditor/at/config.js +++ b/public/assets/kindeditor/at/config.js @@ -35,7 +35,7 @@ var enableAt = function(_editor) { var at_config = { at: "@", data: names, - insertTpl: '@${name}(${login})', + insertTpl: '@${name}(${login})', displayTpl: "
  • ${name} ${login}
  • ", searchKey: 'searchKey', limit: 200 diff --git a/public/assets/kindeditor/at/jquery.atwho.css b/public/assets/kindeditor/at/jquery.atwho.css index df3ff9d94..13ca0265a 100644 --- a/public/assets/kindeditor/at/jquery.atwho.css +++ b/public/assets/kindeditor/at/jquery.atwho.css @@ -49,4 +49,5 @@ } /* @功能 定义 */ -span.at {color:#269ac9;} \ No newline at end of file +span.at {color:#269ac9;} +span.at a{color:#269ac9;text-decoration: none;} \ No newline at end of file diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css index c106a72f3..c8e5df4e1 100644 --- a/public/assets/kindeditor/plugins/code/previewcode.css +++ b/public/assets/kindeditor/plugins/code/previewcode.css @@ -45,4 +45,5 @@ .ke-content blockquote {margin:15px 10px;border:2px solid #eee;padding:5px 5px 5px 35px;background:#f4f5f7 url('../img/blockquote.gif') no-repeat left top;color:#060;font-size:9pt;} -span.at {color:#269ac9;} \ No newline at end of file +span.at {color:#269ac9;} +span.at a{color:#269ac9;text-decoration: none;} \ No newline at end of file diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 3d9fba942..84186a0b2 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -991,14 +991,3 @@ function showNormalImage(id) { } } - -$(function(){ - //at 加链接 - $("span.at").hover(function(){ - $(this).css('cursor', 'pointer'); - }); - $("span.at").live('click', function(){ - var userId = $(this).attr('data-user-id'); - $(window.location).attr('href', '/users/'+userId); - }); -}); \ No newline at end of file diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 775ade128..fbd2bc7c5 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1387,6 +1387,7 @@ a:hover.blueCir{ background:#3598db; color:#fff;} /* @功能 定义 */ span.at {color:#269ac9;} +span.at a{color:#269ac9;text-decoration: none;} .relatePInfo {text-align: left; position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;} /*问题状态图片*/ diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 51f0be25d..a736ef777 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -918,6 +918,7 @@ a.resourcesTypeUser {background:url(images/homepage_icon.png) -178px -453px no-r /* @功能 定义 */ span.at {color:#269ac9;} +span.at a{color:#269ac9;text-decoration: none;} .del_line{text-decoration:line-through !important;} /*转发样式*/ .shareDP {width:415px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; z-index:1000;}