webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-08-07 23:03:00 +03:00
Code Activity

Merge branch 'diff' of git://github.com/younes0/BookStack into younes0-diff

Browse Source
This commit is contained in:
Dan Brown
2016-09-29 09:32:40 +01:00
parent 42d8e9e5bd c279c6e2af
commit fff5bbcee4
6 changed files with 219 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
resources/assets/sass/_pages.scss Normal file → Executable file
View File

@@ -71,6 +71,18 @@
max-width: 100%;
height: auto !important;
}
// diffs
ins,
del {
text-decoration: none;
}
ins {
background: #dbffdb;
}
del {
background: #FFECEC;
}
}
// Page content pointers

6
resources/views/pages/page-display.blade.php
View File

@@ -24,5 +24,9 @@
<div style="clear:left;"></div>
{!! $page->html !!}
@if (isset($diff) && $diff)
{!! $diff !!}
@else
{!! $page->html !!}
@endif
</div>