github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-30 20:51:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/edit-link-headers

Browse Source
This commit is contained in:
Dan Brown
2018-07-14 09:36:14 +01:00
parent 771f781e7f c2d6e98985
commit f668bee88b
15 changed files with 127 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/pages/form-toolbox.blade.php
View File

@ -42,8 +42,8 @@
<span class="text-primary small" @click="file.deleting = false;">{{ trans('common.cancel') }}</span>
</div>
</div>
<div @click="startEdit(file)" class="drag-card-action text-center text-primary" style="padding: 0;">@icon('edit')</div>
<div @click="deleteFile(file)" class="drag-card-action text-center text-neg" style="padding: 0;">@icon('close')</div>
<div @click="startEdit(file)" class="drag-card-action text-center text-primary">@icon('edit')</div>
<div @click="deleteFile(file)" class="drag-card-action text-center text-neg">@icon('close')</div>
</div>
</draggable>
<p class="small muted" v-if="files.length === 0">

2
resources/views/pages/revision.blade.php
View File

@ -14,7 +14,7 @@
<div class="container">
<div class="row">
<div class="col-md-9">
<div class="page-content">
<div class="page-content page-revision">
@include('pages.page-display')
</div>
</div>