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

delete hljs-border class and correct misspell

yusuketk 8 лет назад
Родитель
Сommit
90540edc6c
2 измененных файлов с 7 добавлено и 11 удалено
  1. 4 4
      lib/views/admin/customize.html
  2. 3 7
      resource/styles/scss/_override-hljs.scss

+ 4 - 4
lib/views/admin/customize.html

@@ -269,7 +269,7 @@
       </fieldset>
       </form>
 
-      <form action="/_api/admin/customize/highlightJsStyle" method="post" class="form-horizontal" id="cutomhighlightJsStyleSettingForm" role="form">
+      <form action="/_api/admin/customize/highlightJsStyle" method="post" class="form-horizontal" id="customhighlightJsStyleSettingForm" role="form">
         <fieldset>
           <legend>{{ t('customize_page.Code Highlight') }}</legend>
           <div class="form-group">
@@ -303,7 +303,7 @@
 
           <p class="help-block">
             Examples:
-            <pre class="hljs hljs-border {% if !settingForm['customize:highlightJsStyleBorder'] %}hljs-no-border{% endif %}"><code class="highlightjs-demo">function $initHighlight(block, cls) {
+            <pre class="hljs {% if !settingForm['customize:highlightJsStyleBorder'] %}hljs-no-border{% endif %}"><code class="highlightjs-demo">function $initHighlight(block, cls) {
   try {
     if (cls.search(/\bno\-highlight\b/) != -1)
       return process(block, true, 0x0F) +
@@ -495,7 +495,7 @@ window.addEventListener('load', (event) => {
 {% block body_end %}
   {% parent %}
   <script>
-    $(`#customthemeSettingForm, #cutomlayoutSettingForm, #cutombehaviorSettingForm, #cutomhighlightJsStyleSettingForm,
+    $(`#customthemeSettingForm, #cutomlayoutSettingForm, #cutombehaviorSettingForm, #customhighlightJsStyleSettingForm,
        #customfeaturesSettingForm, #cutomheaderSettingForm, #cutomcssSettingForm, #cutomscriptSettingForm, #customtitleSettingForm`
     ).each(function() {
       $(this).submit(function()
@@ -585,7 +585,7 @@ window.addEventListener('load', (event) => {
       $('.hljs-no-border').removeClass('hljs-no-border');
     }
     function selectBorderOff(){
-      $('.hljs-border').addClass('hljs-no-border')
+      $('#customhighlightJsStyleSettingForm .hljs').addClass('hljs-no-border')
     }
   </script>
 

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

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