diff --git a/.gitignore b/.gitignore index 281da24..dc07d31 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ npm-debug.log yarn-error.log ###< symfony/webpack-encore-bundle ### + +/public/uploads/ +!/public/uploads/.gitkeep diff --git a/assets/css/admin.scss b/assets/css/admin.scss index 9186bef..42b932e 100644 --- a/assets/css/admin.scss +++ b/assets/css/admin.scss @@ -114,7 +114,7 @@ tr.table-primary-light { .fa { font-size: 1.2rem; margin-right: 5px; - min-width: 20px; + min-width: 30px; color: #fff; } @@ -352,3 +352,78 @@ table.table-fixed, .table-fixed > table { .login-image { width: 50%; } + +.tree { + position: relative; + background: white; + color: #212529; + + span { + font-style: italic; + letter-spacing: .4px; + color: #a8a8a8; + } + + .fa-folder-open, .fa-folder { + color: #007bff; + } + + .fa-html5 { + color: #f21f10; + } + + ul { + padding-left: 5px; + list-style: none; + margin: 0; + padding-bottom: 0; + + li { + position: relative; + padding-top: 5px; + padding-bottom: 5px; + padding-left: 15px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + + &:before { + position: absolute; + top: 15px; + left: 0; + width: 10px; + height: 1px; + margin: auto; + content: ''; + background-color: #666; + } + + &:after { + position: absolute; + top: 0; + bottom: 0; + left: 0; + width: 1px; + height: 100%; + content: ''; + background-color: #666; + } + + &:last-child:after { + height: 15px; + } + } + + a { + cursor: pointer; + + &:hover { + text-decoration: none; + } + } + } +} + +fieldset.form-group { + margin-bottom: 0; +} diff --git a/assets/js/addons/modal.js b/assets/js/addons/modal.js index 8cc6dbe..5b007b4 100644 --- a/assets/js/addons/modal.js +++ b/assets/js/addons/modal.js @@ -5,9 +5,20 @@ module.exports = function() { e.preventDefault(); e.stopPropagation(); - let id = $(e.target).attr('data-modal'); - let modal = $(id); + let container = $('#modal-container'); - modal.modal('toggle'); + if (!container.length) { + container = $('