Merge pull request #2 from houkanshan/dev

Adjust plus icon

assets/stylus/fonticon.styl

@@ -1,4 +1,4 @@
-@font-face 
+@font-face
   font-family 'icomoon'
   src url('/fonts/icomoon.eot?-s5hseh')
   src url('/fonts/icomoon.eot?#iefix-s5hseh') format('embedded-opentype'),
@@ -9,7 +9,7 @@
   font-style normal
 
 
-[class^="icon-"], [class*=" icon-"] 
+[class^="icon-"], [class*=" icon-"]
   font-family 'icomoon'
   speak none
   font-style normal
@@ -23,28 +23,28 @@
   -moz-osx-font-smoothing grayscale
 
 
-.icon-evernote:before 
+.icon-evernote:before
   content "\e600"
 
-.icon-lock:before 
+.icon-lock:before
   content "\e602"
 
-.icon-feather:before 
+.icon-feather:before
   content "\e603"
 
-.icon-leaf:before 
+.icon-leaf:before
   content "\e605"
 
-.icon-delete:before 
+.icon-delete:before
   content "\e604"
 
-.icon-pen:before 
+.icon-pen:before
   content "\e606"
 
-.icon-zoom-in:before 
+.icon-zoom-in:before
   content "\e60b"
 
-.icon-zoom-out:before 
+.icon-zoom-out:before
   content "\e60c"
 
 .icon-eye:before
@@ -102,4 +102,7 @@
   content "\e607"
 
 .icon-star-empty:before
-  content "\e61e"
+  content "\e61e"
+
+.icon-plus:before
+  content "\e61f"

assets/stylus/widgets/book.styl

@@ -61,7 +61,7 @@ book_h = 160px
     height 1.8em
     font-size 1.5em
     text-align center
-    line-height 1.6em
+    line-height 1.8em
     border-radius 1em
     position absolute
     z-index 2
@@ -72,6 +72,11 @@ book_h = 160px
     &:hover
       background #fff
       color #111
+    .icon-plus
+      font-size: 0.7em
+      line-height: 2.7em
+      display: block
+      margin-left: 0.07em
   .notes-count
     position absolute
     z-index 2
@@ -108,4 +113,4 @@ book_h = 160px
     &:hover
       border-color #aaa
       &:after
-        color #999
+        color #999

public/partials/books.html

@@ -1 +1 @@
-<section id="all-books"><h1 ng-show="user.is_self">所有书</h1><h1 ng-show="!user.is_self">{{ user.name }}的书架</h1><ul class="books"><li ng-repeat="book in books" class="book"><div remote-image="book.images.large" class="cover"><a link="/{{ user.uid }}/book/{{ book.id }}" class="book-link"></a><span class="notes-count">{{ book.notes_count }}篇笔记</span><a ng-show="user.is_self" link="/{{ user.uid }}/book/{{ book.id }}/new" class="add-note">+</a></div><span class="title">{{ book.title }}</span><span class="author">{{ book.author[0] }}</span></li><li ng-show="user.is_self" ng-click="searchBook()" class="book empty"><div class="cover"></div></li></ul><p ng-show="tipVisible">还没有写过笔记</p></section><script type="text/ng-template" id="modalSearchBook.html"><div ng-controller="SearchBookCtrl" class="modal-search"><div class="modal-header"><h3>给一本书写笔记</h3></div><div class="modal-body"><input id="new-book-name" type="text" placeholder="输入书名,回车查找" input-enter="searchBook(query)" ng-model="query"/><input id="new-book-id" type="hidden" value="{{ selectedBook.id }}"/><ul class="search-results"><li ng-repeat="book in books" ng-click="selectBook($index, book)" ng-class="{'active': $index == selectedIndex}" class="result"><img remote-image="book.images.large"/><div class="result-info"><h4>{{ book.title }}</h4><p>{{ book.summary | characters: 120 }}</p></div></li></ul><div ng-show="has_searched" class="tip">搜索不到? 直接输入想读的书对应的豆瓣Subject ID (下例红色部分)</div><div ng-show="has_searched" class="tip"> http://book.douban.com/subject/<span>25746578</span>/</div></div><div class="modal-footer"><div class="selected-bookname">{{ selectedBook.title }}</div><div class="buttons-group"><button ng-click="ok(selectedBook.id)" class="button-primary">开始写</button><button ng-click="cancel()" class="button-default">取消</button></div></div></div></script>
+<section id="all-books"><h1 ng-show="user.is_self">所有书</h1><h1 ng-show="!user.is_self">{{ user.name }}的书架</h1><ul class="books"><li ng-repeat="book in books" class="book"><div remote-image="book.images.large" class="cover"><a link="/{{ user.uid }}/book/{{ book.id }}" class="book-link"></a><span class="notes-count">{{ book.notes_count }}篇笔记</span><a ng-show="user.is_self" link="/{{ user.uid }}/book/{{ book.id }}/new" class="add-note"><i class="icon-plus"></i></a></div><span class="title">{{ book.title }}</span><span class="author">{{ book.author[0] }}</span></li><li ng-show="user.is_self" ng-click="searchBook()" class="book empty"><div class="cover"></div></li></ul><p ng-show="tipVisible">还没有写过笔记</p></section><script type="text/ng-template" id="modalSearchBook.html"><div ng-controller="SearchBookCtrl" class="modal-search"><div class="modal-header"><h3>给一本书写笔记</h3></div><div class="modal-body"><input id="new-book-name" type="text" placeholder="输入书名,回车查找" input-enter="searchBook(query)" ng-model="query"/><input id="new-book-id" type="hidden" value="{{ selectedBook.id }}"/><ul class="search-results"><li ng-repeat="book in books" ng-click="selectBook($index, book)" ng-class="{'active': $index == selectedIndex}" class="result"><img remote-image="book.images.large"/><div class="result-info"><h4>{{ book.title }}</h4><p>{{ book.summary | characters: 120 }}</p></div></li></ul><div ng-show="has_searched" class="tip">搜索不到? 直接输入想读的书对应的豆瓣Subject ID (下例红色部分)</div><div ng-show="has_searched" class="tip"> http://book.douban.com/subject/<span>25746578</span>/</div></div><div class="modal-footer"><div class="selected-bookname">{{ selectedBook.title }}</div><div class="buttons-group"><button ng-click="ok(selectedBook.id)" class="button-primary">开始写</button><button ng-click="cancel()" class="button-default">取消</button></div></div></div></script>

views/partials/books.jade

@@ -6,7 +6,8 @@ section#all-books
       div.cover(remote-image='book.images.large')
         a.book-link(link="/{{ user.uid }}/book/{{ book.id }}")
         span.notes-count {{ book.notes_count }}篇笔记
-        a.add-note(ng-show='user.is_self', link="/{{ user.uid }}/book/{{ book.id }}/new")= "+"
+        a.add-note(ng-show='user.is_self', link="/{{ user.uid }}/book/{{ book.id }}/new")
+          i.icon-plus
       span.title {{ book.title }}
       span.author {{ book.author[0] }}
     li.book.empty(ng-show="user.is_self", ng-click="searchBook()")