From a135904e6a1831289c34fa436dd6ae562820dc36 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Wed, 21 Apr 2021 09:56:02 +0200 Subject: [PATCH] fix issues with editor and backports murph skeleton --- assets/css/admin.scss | 3 +++ core/Resources/views/site/page_admin/index.html.twig | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/assets/css/admin.scss b/assets/css/admin.scss index 6f13b37..39c49e2 100644 --- a/assets/css/admin.scss +++ b/assets/css/admin.scss @@ -10,6 +10,7 @@ $pagination-bg: #ffffff; $pagination-active-color: #ffffff; $pagination-active-bg: #343a40; +@import "~simplemde/dist/simplemde.min.css"; @import "~choices.js/src/styles/choices.scss"; @import "~bootstrap/scss/bootstrap.scss"; @import "~@fortawesome/fontawesome-free/css/all.css"; @@ -250,6 +251,7 @@ table.table-fixed, .table-fixed > table { } @media screen and (min-height: 650px) { + /* table.table-fixed, .table-fixed > table { width: 100%; @@ -282,6 +284,7 @@ table.table-fixed, .table-fixed > table { } } } + */ } .toast-container { diff --git a/core/Resources/views/site/page_admin/index.html.twig b/core/Resources/views/site/page_admin/index.html.twig index 63b4a40..5922257 100644 --- a/core/Resources/views/site/page_admin/index.html.twig +++ b/core/Resources/views/site/page_admin/index.html.twig @@ -17,8 +17,9 @@ - - + + + @@ -41,7 +42,7 @@ {% endfor %} -
{{ 'Name'|trans }}{{ 'Actions'|trans }}{{ 'Name'|trans }}{{ 'Actions'|trans }}
+