Просмотр исходного кода

Merge pull request #343 from weseek/master

release v3.0.5
Yuki Takei 8 лет назад
Родитель
Сommit
697a1f2b11
4 измененных файлов с 9 добавлено и 5 удалено
  1. 5 1
      CHANGES.md
  2. 1 1
      package.json
  3. 2 2
      resource/js/components/PageList/PageListMeta.js
  4. 1 1
      resource/js/legacy/crowi.js

+ 5 - 1
CHANGES.md

@@ -1,7 +1,11 @@
 CHANGES
 ========
 
-## 3.0.4-RC
+## 3.0.5-RC
+
+* 
+
+## 3.0.4
 
 * Improvement: The option that switch whether add h1 section when create new page
 * Improvement: Encode page path that includes special character

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "growi",
-  "version": "3.0.4-RC",
+  "version": "3.0.5-RC",
   "description": "Team collaboration software using markdown",
   "tags": [
     "wiki",

+ 2 - 2
resource/js/components/PageList/PageListMeta.js

@@ -23,12 +23,12 @@ export default class PageListMeta extends React.Component {
 
     let CommentCount;
     if (page.commentCount > 0) {
-      CommentCount = <span><i className="fa fa-comment" />{page.commentCount}</span>;
+      CommentCount = <span><i className="icon-bubble" />{page.commentCount}</span>;
     }
 
     let LikerCount;
     if (page.liker.length > 0) {
-      LikerCount = <span><i className="fa fa-thumbs-up" />{page.liker.length}</span>;
+      LikerCount = <span><i className="icon-like" />{page.liker.length}</span>;
     }
 
 

+ 1 - 1
resource/js/legacy/crowi.js

@@ -383,7 +383,7 @@ $(function() {
   /*
    * wrap short path with <strong></strong>
    */
-  $('.page-list-link').each(function() {
+  $('#view-list .page-list-ul-flat .page-list-link').each(function() {
     var $link = $(this);
     var text = $link.text();
     var path = decodeURIComponent($link.data('path'));