Browse Source

fix the error and change select

yusuketk 8 years ago
parent
commit
d65e234f1f
2 changed files with 3 additions and 8 deletions
  1. 2 1
      resource/js/util/GrowiRenderer.js
  2. 1 7
      resource/styles/scss/_override-hljs.scss

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

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

+ 1 - 7
resource/styles/scss/_override-hljs.scss

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