Merge branch 'master'

Conflicts:
	package.json

browser/styles/main/ArticleDetail.styl

@@ -382,6 +382,9 @@ infoButton()
           color lighten(inactiveTextColor, 10%)
           user-select none
           font-size 14px
+        &.lineNumbered
+          .lineNumber
+            display block
       .CodeEditor
         absolute top left right bottom
         border-top solid 1px borderColor

browser/styles/mixins/marked.styl

@@ -126,15 +126,25 @@ marked()
     border-radius 5px
     overflow-x auto
     margin 0 0 15px
-    line-height 1.35em
-    &>code
+    line-height 1.35
+    code
       margin 0
       padding 0
       border none
       border-radius 0
-      &>pre
+      pre
         border none
         margin -5px
+    &>span.lineNumber
+      font-family Monaco, Menlo, 'Ubuntu Mono', Consolas, source-code-pro, monospace
+      display none
+      float left
+      margin 0 0.5em 0 -0.5em
+      border-right 1px solid
+      text-align right
+      &>span
+        display block
+        padding 0 .5em 0 1em
   table
     width 100%
     margin 15px 0 25px