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('