backports murph-skeleton

This commit is contained in:
Simon Vieille 2021-05-25 09:59:29 +02:00
parent 7bd99d0af8
commit a20a32ea0f
7 changed files with 33 additions and 11 deletions

View file

@ -0,0 +1,3 @@
.CodeMirror-fullscreen, .editor-toolbar.fullscreen {
z-index: 2000;
}

View file

View file

@ -1,14 +1,16 @@
@import "./_admin_vars.scss";
$theme-colors: ( $theme-colors: (
"primary": #1ab5dc, "primary": #1ab5dc,
"primary-light": lighten(#3183aa, 40%), "primary-light": lighten(#3183aa, 40%),
"dark-blue": #1e2430, "dark-blue": #1e2430,
); ) !default;
$grid-gutter-width: 0px; $grid-gutter-width: 0px !default;
$pagination-color: #343a40; $pagination-color: #343a40 !default;
$pagination-bg: #ffffff; $pagination-bg: #ffffff !default;
$pagination-active-color: #ffffff; $pagination-active-color: #ffffff !default;
$pagination-active-bg: #343a40; $pagination-active-bg: #343a40 !default;
@import "~simplemde/dist/simplemde.min.css"; @import "~simplemde/dist/simplemde.min.css";
@import "~choices.js/src/styles/choices.scss"; @import "~choices.js/src/styles/choices.scss";
@ -472,6 +474,4 @@ fieldset.form-group {
} }
} }
.CodeMirror-fullscreen, .editor-toolbar.fullscreen { @import "./_admin_extend.scss";
z-index: 2000;
}

View file

@ -18,10 +18,10 @@ module.exports = function() {
loader.html('<div class="spinner-border text-primary" role="status"><span class="sr-only">Loading...</span></div>') loader.html('<div class="spinner-border text-primary" role="status"><span class="sr-only">Loading...</span></div>')
body.append(loader) body.append(loader)
container.html(); container.html('');
const url = $(e.target).attr('data-modal'); const url = $(e.target).attr('data-modal');
$(container).modal('show'); $(container).modal('show');
container.load(url, function() { container.load(url, function() {
loader.remove() loader.remove()

View file

@ -24,6 +24,7 @@
"scheb/2fa-google-authenticator": "^5.7", "scheb/2fa-google-authenticator": "^5.7",
"scheb/2fa-qr-code": "^5.7", "scheb/2fa-qr-code": "^5.7",
"sensio/framework-extra-bundle": "^6.1", "sensio/framework-extra-bundle": "^6.1",
"sensiolabs/ansi-to-html": "^1.2",
"stof/doctrine-extensions-bundle": "^1.6", "stof/doctrine-extensions-bundle": "^1.6",
"symfony/apache-pack": "^1.0", "symfony/apache-pack": "^1.0",
"symfony/asset": "5.2.*", "symfony/asset": "5.2.*",

View file

@ -0,0 +1,6 @@
services:
_defaults:
autowire: true
autoconfigure: true
SensioLabs\AnsiConverter\Bridge\Twig\AnsiExtension: null

View file

@ -235,6 +235,18 @@
"config/packages/sensio_framework_extra.yaml" "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": { "spomky-labs/otphp": {
"version": "v10.0.1" "version": "v10.0.1"
}, },