fix(server): fix <code> css (#619)

ia-toki · Mar 28, 2024 · 62efe03 · 62efe03
1 parent 256b759
commit 62efe03
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.../src/main/resources/assets/css/main-3.css → .../src/main/resources/assets/css/main-4.css b/.../src/main/resources/assets/css/main-3.css → .../src/main/resources/assets/css/main-4.css
@@ -274,6 +274,7 @@ input[type="text"], input[type="password"], textarea {
 .content-text pre, .content-text code {
   color: #1c2127;
   background-color: #f5f5f5;
+  border: 1px solid #ccc;
 }
 
 .content-text ol.breadcrumb li {

diff --git a/...es/judgels/michael/resource/ckeditor-2.js → ...es/judgels/michael/resource/ckeditor-3.js b/...es/judgels/michael/resource/ckeditor-2.js → ...es/judgels/michael/resource/ckeditor-3.js
@@ -45,12 +45,12 @@ document.addEventListener('DOMContentLoaded', function() {
     pre {
       padding: 9.5px;
       margin: 0 0 10px;
-      border: 1px solid #ccc;
       border-radius: 4px;
     }
 
     pre, code {
       background-color: #f5f5f5;
+      border: 1px solid #ccc;
     }
 
     code {

diff --git a/judgels-backends/judgels-server-app/src/main/resources/judgels/michael/resource/ckeditor.ftl b/judgels-backends/judgels-server-app/src/main/resources/judgels/michael/resource/ckeditor.ftl
@@ -1,2 +1,2 @@
 <script src="/webjars/ckeditor/full/ckeditor.js"></script>
-<script><#include "ckeditor-2.js"></script>
+<script><#include "ckeditor-3.js"></script>
diff --git a/...ckends/judgels-server-app/src/main/resources/judgels/michael/template/base/baseLayout.ftl b/...ckends/judgels-server-app/src/main/resources/judgels/michael/template/base/baseLayout.ftl
@@ -9,7 +9,7 @@
       <link rel="stylesheet" href="/webjars/open-sans/css/open-sans.min.css">
       <link rel="stylesheet" href="/webjars/roboto-fontface/css/roboto/roboto-fontface.css">
       <link rel="stylesheet" href="/webjars/bootstrap/css/bootstrap.min.css">
-      <link rel="stylesheet" href="/assets/css/main-3.css">
+      <link rel="stylesheet" href="/assets/css/main-4.css">
       <link rel="shortcut icon" type="image/ico" href="/assets/images/favicon.ico">
       <script src="/webjars/jquery/jquery.min.js"></script>
       <script src="/webjars/bootstrap/js/bootstrap.min.js"></script>