From a20a32ea0fc665c08d08c0c9dce32a7348dee98d Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Tue, 25 May 2021 09:59:29 +0200
Subject: [PATCH] backports murph-skeleton

---
 assets/css/_admin_extend.scss     |  3 +++
 assets/css/_admin_vars.scss       |  0
 assets/css/admin.scss             | 18 +++++++++---------
 assets/js/admin/modal.js          |  4 ++--
 composer.json                     |  1 +
 config/packages/ansi_to_html.yaml |  6 ++++++
 symfony.lock                      | 12 ++++++++++++
 7 files changed, 33 insertions(+), 11 deletions(-)
 create mode 100644 assets/css/_admin_extend.scss
 create mode 100644 assets/css/_admin_vars.scss
 create mode 100644 config/packages/ansi_to_html.yaml

diff --git a/assets/css/_admin_extend.scss b/assets/css/_admin_extend.scss
new file mode 100644
index 0000000..aa0dca9
--- /dev/null
+++ b/assets/css/_admin_extend.scss
@@ -0,0 +1,3 @@
+.CodeMirror-fullscreen, .editor-toolbar.fullscreen {
+    z-index: 2000;
+}
diff --git a/assets/css/_admin_vars.scss b/assets/css/_admin_vars.scss
new file mode 100644
index 0000000..e69de29
diff --git a/assets/css/admin.scss b/assets/css/admin.scss
index e976e71..e3cd170 100644
--- a/assets/css/admin.scss
+++ b/assets/css/admin.scss
@@ -1,14 +1,16 @@
+@import "./_admin_vars.scss";
+
 $theme-colors: (
   "primary": #1ab5dc,
   "primary-light": lighten(#3183aa, 40%),
   "dark-blue": #1e2430,
-);
+) !default;
 
-$grid-gutter-width: 0px;
-$pagination-color: #343a40;
-$pagination-bg: #ffffff;
-$pagination-active-color: #ffffff;
-$pagination-active-bg: #343a40;
+$grid-gutter-width: 0px !default;
+$pagination-color: #343a40 !default;
+$pagination-bg: #ffffff !default;
+$pagination-active-color: #ffffff !default;
+$pagination-active-bg: #343a40 !default;
 
 @import "~simplemde/dist/simplemde.min.css";
 @import "~choices.js/src/styles/choices.scss";
@@ -472,6 +474,4 @@ fieldset.form-group {
     }
 }
 
-.CodeMirror-fullscreen, .editor-toolbar.fullscreen {
-    z-index: 2000;
-}
+@import "./_admin_extend.scss";
diff --git a/assets/js/admin/modal.js b/assets/js/admin/modal.js
index af17e32..359b6a6 100644
--- a/assets/js/admin/modal.js
+++ b/assets/js/admin/modal.js
@@ -18,10 +18,10 @@ module.exports = function() {
         loader.html('<div class="spinner-border text-primary" role="status"><span class="sr-only">Loading...</span></div>')
         body.append(loader)
 
-        container.html();
+        container.html('');
 
         const url = $(e.target).attr('data-modal');
-            $(container).modal('show');
+        $(container).modal('show');
 
         container.load(url, function() {
             loader.remove()
diff --git a/composer.json b/composer.json
index 3635ed7..84f54e6 100644
--- a/composer.json
+++ b/composer.json
@@ -24,6 +24,7 @@
         "scheb/2fa-google-authenticator": "^5.7",
         "scheb/2fa-qr-code": "^5.7",
         "sensio/framework-extra-bundle": "^6.1",
+        "sensiolabs/ansi-to-html": "^1.2",
         "stof/doctrine-extensions-bundle": "^1.6",
         "symfony/apache-pack": "^1.0",
         "symfony/asset": "5.2.*",
diff --git a/config/packages/ansi_to_html.yaml b/config/packages/ansi_to_html.yaml
new file mode 100644
index 0000000..78e983c
--- /dev/null
+++ b/config/packages/ansi_to_html.yaml
@@ -0,0 +1,6 @@
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
+    SensioLabs\AnsiConverter\Bridge\Twig\AnsiExtension: null
diff --git a/symfony.lock b/symfony.lock
index 173e3ab..4cc1c58 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -235,6 +235,18 @@
             "config/packages/sensio_framework_extra.yaml"
         ]
     },
+    "sensiolabs/ansi-to-html": {
+        "version": "1.2",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "master",
+            "version": "1.2",
+            "ref": "d58d11d5b998f39260d387d3a0b50adc342db7e4"
+        },
+        "files": [
+            "config/packages/ansi_to_html.yaml"
+        ]
+    },
     "spomky-labs/otphp": {
         "version": "v10.0.1"
     },