修复代码不高亮的问题

halo-dev · Dec 19, 2018 · af12bd6 · af12bd6
1 parent fbf2d44
commit af12bd6
Show file tree

Hide file tree

Showing 15 changed files with 1,188 additions and 822 deletions.
diff --git a/layout/_partials/head.ftl b/layout/_partials/head.ftl
@@ -43,7 +43,11 @@
 <link href="/${themeName}/source/css/Gemini/main.css?v=5.1.4" rel="stylesheet" type="text/css" />
 <#break >
 </#switch>
-<link href="/${themeName}/source/css/highlight/${options.next_general_highlight?default('normal')}.css" rel="stylesheet" type="text/css" />
+
+<#if post??>
+<link rel="stylesheet" type="text/css" href="/${themeName}/source/lib/prism/css/prism-${options.next_general_highlight!'Default'}.css" />
+<script type="text/javascript" src="/${themeName}/source/lib/prism/js/prism.js"></script>
+</#if>
 
 <#if options.next_general_apple_touch_icon?default('/${themeName}/source/images/apple-touch-icon-next.png') !=''>
   <link rel="apple-touch-icon" sizes="180x180" href="${options.next_general_apple_touch_icon?default('/${themeName}/source/images/apple-touch-icon-next.png')}?v=5.1.4">

diff --git a/module/options.ftl b/module/options.ftl
@@ -348,12 +348,14 @@
                                 <div class="form-group">
                                     <label for="nextGeneralHighlight" class="col-sm-4 control-label">文章代码高亮主题：</label>
                                     <div class="col-sm-8">
-                                        <select class="form-control" id="nextGeneralHighlight" name="next_general_highlight">
-                                            <option value="normal" ${((options.next_general_highlight?default('normal'))=='normal')?string('selected','')}>normal</option>
-                                            <option value="night" ${((options.next_general_highlight?if_exists)=='night')?string('selected','')}>night</option>
-                                            <option value="night-blue" ${((options.next_general_highlight?if_exists)=='night-blue')?string('selected','')}>night-blue</option>
-                                            <option value="night-bright" ${((options.next_general_highlight?if_exists)=='night-bright')?string('selected','')}>night-bright</option>
-                                            <option value="night-eighties" ${((options.next_general_highlight?if_exists)=='night-eighties')?string('selected','')}>night-eighties</option>
+                                        <select class="form-control" id="casperGeneralCodePretty" name="next_general_highlight">
+                                            <option value="Default" ${((options.next_general_highlight!'Default')=='Default')?string('selected','')}>Default</option>
+                                            <option value="Coy" ${((options.next_general_highlight!)=='Coy')?string('selected','')}>Coy</option>
+                                            <option value="Dark" ${((options.next_general_highlight!)=='Dark')?string('selected','')}>Dark</option>
+                                            <option value="Okaidia" ${((options.next_general_highlight!)=='Okaidia')?string('selected','')}>Okaidia</option>
+                                            <option value="Solarized Light" ${((options.next_general_highlight!)=='Solarized Light')?string('selected','')}>Solarized Light</option>
+                                            <option value="Tomorrow Night" ${((options.next_general_highlight!)=='Tomorrow Night')?string('selected','')}>Tomorrow Night</option>
+                                            <option value="Twilight" ${((options.next_general_highlight!)=='Twilight')?string('selected','')}>Twilight</option>
                                         </select>
                                     </div>
                                 </div>

diff --git a/source/css/highlight/night-blue.css b/source/css/highlight/night-blue.css
diff --git a/source/css/highlight/night-bright.css b/source/css/highlight/night-bright.css