Просмотр исходного кода

enable select pre-hljs border ON/OFF but this commit has error about sandbox page

yusuketk 8 лет назад
Родитель
Сommit
3832babbcd

+ 1 - 0
lib/models/config.js

@@ -460,6 +460,7 @@ module.exports = function(crowi) {
       behaviorType: Config.behaviorType(config),
       layoutType: Config.layoutType(config),
       isEnabledLineBreaks: Config.isEnabledLinebreaks(config),
+      highlightJsStyleBorder: Config.highlightJsStyleBorder(config),
       isSavedStatesOfTabChanges: Config.isSavedStatesOfTabChanges(config),
       env: {
         PLANTUML_URI: env.PLANTUML_URI || null,

+ 2 - 1
resource/js/util/GrowiRenderer.js

@@ -139,6 +139,7 @@ export default class GrowiRenderer {
   }
 
   codeRenderer(code, langExt) {
+    const config = this.crowi.getConfig();
     if (langExt) {
       const langAndFn = langExt.split(':');
       const lang = langAndFn[0];
@@ -149,7 +150,7 @@ export default class GrowiRenderer {
         return this.langProcessors[lang].process(code, langExt);
       }
 
-      const noborder = (true) ? `hljs-no-border` : '';
+      const noborder = (!config.highlightJsStyleBorder) ? 'hljs-no-border' : '';
       const citeTag = (langFn) ? `<cite>${langFn}</cite>` : '';
       if (hljs.getLanguage(lang)) {
         try {

+ 10 - 2
resource/styles/scss/_override-hljs.scss

@@ -1,4 +1,12 @@
 // override Highlight Js Style Border
-.hljs-no-border {
-   border: none;
+.wiki{
+  pre.hljs.hljs-no-border {
+    border: none;
+  }
+}
+
+.admin-customize{
+  .hljs-no-border{
+    border: none;
+  }
 }