Merge commit '2f110c6f52b48bcc44bfd3acd0c53ad44a34ebea'

jzwalk · jzwalk · commit d1c5ccdd20e9 · 2018-06-25T09:31:52.000+08:00
diff --git a/CodeStyle/Plugin.php b/CodeStyle/Plugin.php
@@ -4,7 +4,7 @@
  * 
  * @package CodeStyle 
  * @author hongweipeng
- * @version 0.7.1
+ * @version 0.8.0
  * @link https://www.hongweipeng.com
  */
 class CodeStyle_Plugin implements Typecho_Plugin_Interface {
@@ -43,6 +43,8 @@ public static function config(Typecho_Widget_Helper_Form $form){
         $styles = array_combine($styles, $styles);
         $name = new Typecho_Widget_Helper_Form_Element_Select('code_style', $styles, 'segmentfault.css', _t('选择你的代码风格'));
         $form->addInput($name->addRule('enum', _t('必须选择配色样式'), $styles));
+        $showLineNumber = new Typecho_Widget_Helper_Form_Element_Checkbox('showln', array('showln' => _t('显示行号')), array('showln'), _t('是否在代码左侧显示行号'));
+        $form->addInput($showLineNumber);
 
         /*$jq_import = new Typecho_Widget_Helper_Form_Element_Radio('jq_import', array(
             0   =>  _t('不引入'),
@@ -79,6 +81,9 @@ public static function header() {
         $style = Helper::options()->plugin('CodeStyle')->code_style;
         $cssUrl = Helper::options()->pluginUrl . '/CodeStyle/markdown/styles/' . $style;
         echo '<link rel="stylesheet" type="text/css" href="' . $cssUrl . '" />';
+        if (Helper::options()->plugin('CodeStyle')->showln) {
+            echo '<link rel="stylesheet" type="text/css" href="' . Helper::options()->pluginUrl. '/CodeStyle/markdown/highlightjs-line.css" />';
+        }
     }
 
     /**
@@ -87,11 +92,22 @@ public static function header() {
      */
     public static function footer() {
         $jsUrl = Helper::options()->pluginUrl . '/CodeStyle/markdown/highlight.pack.js';
+        $lineUrl = Helper::options()->pluginUrl . '/CodeStyle/markdown/highlightjs-line-numbers.min.js';
+        $showIn = Helper::options()->plugin('CodeStyle')->showln;
         echo <<<HTML
             <script type="text/javascript" src="{$jsUrl}"></script>
             <script type="text/javascript">
                 hljs.initHighlightingOnLoad();
             </script>
 HTML;
+        if ($showIn) {
+            echo <<<HTML
+            <script type="text/javascript" src="{$lineUrl}"></script>
+            <script type="text/javascript">
+                hljs.initLineNumbersOnLoad();
+            </script>
+HTML;
+
+        }
     }
 }
diff --git a/CodeStyle/README.md b/CodeStyle/README.md
@@ -1,6 +1,6 @@
 ## 起步
 
-代码展示样式，将highlightjs制作为typecho插件形式。
+代码展示样式，将 [highlightjs][4] 制作为typecho插件形式。
 
 ## 使用方法
 
@@ -19,5 +19,12 @@ github开源地址：[https://github.com/hongweipeng/CodeStyle_for_typecho][1]
 或者通过 Emai: hongweichen8888@sina.com
 有任何问题也可评论留言
 
+## 感谢
+代码行显示支持:
+
+[https://github.com/wcoder/highlightjs-line-numbers.js][3]
+
 [1]: https://github.com/hongweipeng/MenuTree_for_typecho
-[2]: https://www.hongweipeng.com/
+[2]: https://www.hongweipeng.com/
+[3]: https://github.com/wcoder/highlightjs-line-numbers.js
+[4]: https://highlightjs.org/
diff --git a/CodeStyle/markdown/highlightjs-line-numbers.min.js b/CodeStyle/markdown/highlightjs-line-numbers.min.js
diff --git a/CodeStyle/markdown/highlightjs-line.css b/CodeStyle/markdown/highlightjs-line.css
@@ -0,0 +1,28 @@
+
+.hljs td.hljs-ln-numbers {
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+
+    text-align: right;
+    color: #ccc;
+    border-top: none;
+    border-bottom: none;
+    border-left: none;
+    border-right: 1px solid #CCC;
+    vertical-align: top;
+    word-break: normal;
+    word-wrap: normal;
+    padding: 0 5px 0 0;
+    width: 20px;
+    /* your custom style here */
+}
+
+/* for block of code */
+.hljs td.hljs-ln-code {
+    padding: 0 0 0 8px;
+    border: none;
+}
diff --git a/CodeStyle/markdown/styles/segmentfault.css b/CodeStyle/markdown/styles/segmentfault.css
@@ -52,9 +52,4 @@ pre {
 
 .tex .hljs-formula {
     background: #eee8d5
-}/*!
- *  Font Awesome 4.3.0 by @davegandy - http://fontawesome.io - @fontawesome
- *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */@font-face {
-    font-family:FontAwesome;src:url(../../3rd/fontawesome/fonts/fontawesome-webfont.eot?v=4.3.0);src:url(../../3rd/fontawesome/fonts/fontawesome-webfont.eot?#iefix&v=4.3.0) format('embedded-opentype'),url(../../3rd/fontawesome/fonts/fontawesome-webfont.woff2?v=4.3.0) format('woff2'),url(../../3rd/fontawesome/fonts/fontawesome-webfont.woff?v=4.3.0) format('woff'),url(../../3rd/fontawesome/fonts/fontawesome-webfont.ttf?v=4.3.0) format('truetype'),url(../../3rd/fontawesome/fonts/fontawesome-webfont.svg?v=4.3.0#fontawesomeregular) format('svg');font-weight:400;font-style:normal
 }

Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,4 @@ pre {`
`52`	`52`
`53`	`53`	`.tex .hljs-formula {`
`54`	`54`	`background: #eee8d5`
`55`		`-}/*!`
`56`		`- * Font Awesome 4.3.0 by @davegandy - http://fontawesome.io - @fontawesome`
`57`		`- * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)`
`58`		`- */@font-face {`
`59`		- font-family:FontAwesome;src:url(../../3rd/fontawesome/fonts/fontawesome-webfont.eot?v=4.3.0);src:url(../../3rd/fontawesome/fonts/fontawesome-webfont.eot?#iefix&v=4.3.0) format('embedded-opentype'),url(../../3rd/fontawesome/fonts/fontawesome-webfont.woff2?v=4.3.0) format('woff2'),url(../../3rd/fontawesome/fonts/fontawesome-webfont.woff?v=4.3.0) format('woff'),url(../../3rd/fontawesome/fonts/fontawesome-webfont.ttf?v=4.3.0) format('truetype'),url(../../3rd/fontawesome/fonts/fontawesome-webfont.svg?v=4.3.0#fontawesomeregular) format('svg');font-weight:400;font-style:normal
`60`	`55`	`}`