Browse Source

backports murph-skeleton

develop
Simon Vieille 3 weeks ago
parent
commit
a20a32ea0f
  1. 3
      assets/css/_admin_extend.scss
  2. 0
      assets/css/_admin_vars.scss
  3. 18
      assets/css/admin.scss
  4. 4
      assets/js/admin/modal.js
  5. 1
      composer.json
  6. 6
      config/packages/ansi_to_html.yaml
  7. 12
      symfony.lock

3
assets/css/_admin_extend.scss

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

0
assets/css/_admin_vars.scss

18
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";

4
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()

1
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.*",

6
config/packages/ansi_to_html.yaml

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

12
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"
},

Loading…
Cancel
Save