Merge branch 'dev' into binarity.cz

2016-10-03 01:09:53 +02:00
parent 304518fbe7 49577a7e1a
commit 0869ac7c24
9 changed files with 245 additions and 983 deletions
@@ -70,7 +70,7 @@

 <div class="row">
    <div class="col-lg-12">
-        <textarea name="pageContent" id="pageContent" class="wysiwyg-editor">
+        <textarea name="pageContent" id="pageContent" rows="15" class="wysiwyg-editor">
            {{old('pageContent', $page->content)}}
        </textarea>
    </div>
@@ -76,8 +76,10 @@
    <!-- /.modal-dialog -->
 </div>

-<script src="{{asset('resources/assets/admin/js')}}/vendor.js"></script>
+<script src="{{asset('resources/assets/admin/js')}}/vendor.min.js"></script>
 <script src="{{asset('resources/assets/admin/js')}}/app.js"></script>
+
+
@yield('javascripts')
 </body>

@@ -171,5 +171,4 @@
            </footer>
        </div>
    </div>
-
@endsection
@@ -8,6 +8,7 @@
        basicEntities: false,
        entities_greek: false,
        entities_latin: false,
+        height: 550,
        removePlugins: 'about,scayt', //elementspath
        extraPlugins: 'justify',
        enterMode: CKEDITOR.ENTER_DIV,