Merge v0.5.11

Conflicts:
	browser/main/index.js
	package.json

browser/styles/main/ArticleDetail.styl

@@ -25,7 +25,6 @@ infoButton()
   padding 10px
   background-color #E6E6E6
   border-top 1px solid borderColor
-  border-left 1px solid borderColor
   &.empty
     .ArticleDetail-empty-box
       line-height 72px

browser/styles/main/ArticleList.styl

@@ -30,6 +30,8 @@ articleItemColor = #777
         height 20px
         color articleItemColor
         font-size 11px
+        i
+          margin-right 4px
         .folderName
           overflow ellipsis
           display inline-block

browser/styles/main/ArticleNavigator.styl

@@ -11,6 +11,7 @@ articleCount = #999
   .userInfo
     height 60px
     display block
+    box-sizing content-box
     border-bottom 1px solid borderColor
     .userProfileName
       color brandColor

browser/styles/main/index.styl

@@ -7,6 +7,7 @@ global-reset()
 @import './ArticleList'
 @import './ArticleDetail'
 @import './modal/*'
+@import '../theme/*'
 
 DEFAULT_FONTS = 'Lato', helvetica, arial, sans-serif
 

browser/styles/main/modal/CreateNewFolder.styl

@@ -72,7 +72,7 @@ iptFocusBorderColor = #369DCD
   .confirmBtn
     display block
     position absolute
-    left 180px
+    left 205px
     bottom 44px
     width 240px
     font-size 24px

browser/styles/main/modal/Preferences.styl

@@ -8,7 +8,7 @@ iptFocusBorderColor = #369DCD
   border-radius 5px
   overflow hidden
   width 720px
-  height 450px
+  height 600px
   &>.header
     absolute top left right
     height 50px