Merge branch 'master'

Conflicts: package.json
2026-05-25 00:42:03 +00:00 · 2016-05-12 20:10:18 +09:00
parent 365d7a1afd 6ba49ad294
commit 9d60704c9b
7 changed files with 54 additions and 12 deletions
--- a/browser/styles/main/ArticleDetail.styl
+++ b/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