Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'albergoniSivaf-master'

Browse Source
This commit is contained in:
Dan Brown 2019-12-27 17:15:45 +00:00
commit 5c040bf2b7
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/js/services/code.js
View File

@ -25,6 +25,7 @@ import 'codemirror/mode/sql/sql';
import 'codemirror/mode/toml/toml'; import 'codemirror/mode/toml/toml';
import 'codemirror/mode/xml/xml'; import 'codemirror/mode/xml/xml';
import 'codemirror/mode/yaml/yaml'; import 'codemirror/mode/yaml/yaml';
import 'codemirror/mode/pascal/pascal';
// Addons // Addons
import 'codemirror/addon/scroll/scrollpastend'; import 'codemirror/addon/scroll/scrollpastend';
@ -61,6 +62,8 @@ const modeMap = {
powershell: 'powershell', powershell: 'powershell',
properties: 'properties', properties: 'properties',
ocaml: 'mllike', ocaml: 'mllike',
pascal: 'text/x-pascal',
pas: 'text/x-pascal',
php: (content) => { php: (content) => {
return content.includes('<?php') ? 'php' : 'text/x-php'; return content.includes('<?php') ? 'php' : 'text/x-php';
}, },

5
resources/sass/_components.scss
View File

@ -94,9 +94,10 @@
.popup-body { .popup-body {
background-color: #FFF; background-color: #FFF;
max-height: 90%; max-height: 90%;
width: 1200px; max-width: 1200px;
width: 90%;
height: auto; height: auto;
margin: 2% 5%; margin: 2% auto;
border-radius: 4px; border-radius: 4px;
box-shadow: 0 0 15px 0 rgba(0, 0, 0, 0.3); box-shadow: 0 0 15px 0 rgba(0, 0, 0, 0.3);
overflow: hidden; overflow: hidden;

5
resources/views/components/code-editor.blade.php
View File

@ -23,10 +23,11 @@
<a @click="updateLanguage('JavaScript')">JavaScript</a> <a @click="updateLanguage('JavaScript')">JavaScript</a>
<a @click="updateLanguage('JSON')">JSON</a> <a @click="updateLanguage('JSON')">JSON</a>
<a @click="updateLanguage('Lua')">Lua</a> <a @click="updateLanguage('Lua')">Lua</a>
<a @click="updateLanguage('PHP')">PHP</a>
<a @click="updateLanguage('Powershell')">Powershell</a>
<a @click="updateLanguage('MarkDown')">MarkDown</a> <a @click="updateLanguage('MarkDown')">MarkDown</a>
<a @click="updateLanguage('Nginx')">Nginx</a> <a @click="updateLanguage('Nginx')">Nginx</a>
<a @click="updateLanguage('PASCAL')">Pascal</a>
<a @click="updateLanguage('PHP')">PHP</a>
<a @click="updateLanguage('Powershell')">Powershell</a>
<a @click="updateLanguage('Python')">Python</a> <a @click="updateLanguage('Python')">Python</a>
<a @click="updateLanguage('Ruby')">Ruby</a> <a @click="updateLanguage('Ruby')">Ruby</a>
<a @click="updateLanguage('shell')">Shell/Bash</a> <a @click="updateLanguage('shell')">Shell/Bash</a>