github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-11-28 03:33:37 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Started design changes to the code-editor

Browse Source
This commit is contained in:
Dan Brown 2022-06-20 13:42:12 +01:00
parent be1d691529
commit 96d9077479
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 85 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
resources/sass/_components.scss
View File

@ -166,6 +166,9 @@
color: #FFF; color: #FFF;
padding: 8px $-m; padding: 8px $-m;
} }
&.flex-container-row {
display: flex !important;
}
} }
body.flexbox-support #entity-selector-wrap .popup-body .form-group { body.flexbox-support #entity-selector-wrap .popup-body .form-group {
height: 444px; height: 444px;
@ -634,12 +637,46 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
} }
.code-editor .lang-options { .code-editor .lang-options {
max-width: 540px; overflow-y: scroll;
margin-bottom: $-s;
a {
margin-inline-end: $-xs;
text-decoration: underline;
} }
.code-editor .lang-options button {
display: block;
padding: $-xs $-m;
border-bottom: 1px solid #eee;
width: 100%;
text-align: left;
font-family: $mono;
font-size: 0.7rem;
&:hover {
background-color: var(--color-primary-light);
color: var(--color-primary);
}
}
.code-editor label {
background-color: var(--color-primary-light);
width: 100%;
color: var(--color-primary);
padding: $-xxs $-m;
}
.code-editor-language-list {
flex-basis: 200px;
border-right: 1px solid #DDD;
box-shadow: $bs-card;
}
.code-editor-language-list input {
border-radius: 0;
border: 0;
border-bottom: 1px solid #DDD;
}
.code-editor-main {
flex: 1;
height: 100%;
overflow-y: scroll;
} }
@include smaller-than($m) { @include smaller-than($m) {

90
resources/views/pages/parts/code-editor.blade.php
View File

@ -2,69 +2,61 @@
<div components="popup code-editor" class="popup-background code-editor"> <div components="popup code-editor" class="popup-background code-editor">
<div refs="code-editor@container" class="popup-body" tabindex="-1"> <div refs="code-editor@container" class="popup-body" tabindex="-1">
<div class="popup-header primary-background"> <div class="popup-header flex-container-row primary-background">
<div class="popup-title">{{ trans('components.code_editor') }}</div> <div class="popup-title">{{ trans('components.code_editor') }}</div>
<div component="dropdown" refs="code-editor@historyDropDown" class="block">
<button refs="dropdown@toggle" class="text-small">
<span>@icon('history')</span>
<span>{{ trans('components.code_session_history') }}</span>
</button>
<ul refs="dropdown@menu code-editor@historyList" class="dropdown-menu"></ul>
</div>
<button class="popup-header-close" refs="popup@hide">x</button> <button class="popup-header-close" refs="popup@hide">x</button>
</div> </div>
<div class="p-l popup-content"> <div class="flex-container-row flex-fill gap-m">
<div class="form-group"> <div class="code-editor-language-list flex-container-column flex-fill">
<label for="code-editor-language">{{ trans('components.code_language') }}</label> <label for="code-editor-language">{{ trans('components.code_language') }}</label>
<div class="lang-options">
<small>
<a refs="code-editor@languageLink" data-lang="CSS">CSS</a>
<a refs="code-editor@languageLink" data-lang="C">C</a>
<a refs="code-editor@languageLink" data-lang="C++">C++</a>
<a refs="code-editor@languageLink" data-lang="C#">C#</a>
<a refs="code-editor@languageLink" data-lang="Fortran">Fortran</a>
<a refs="code-editor@languageLink" data-lang="Go">Go</a>
<a refs="code-editor@languageLink" data-lang="HTML">HTML</a>
<a refs="code-editor@languageLink" data-lang="INI">INI</a>
<a refs="code-editor@languageLink" data-lang="Java">Java</a>
<a refs="code-editor@languageLink" data-lang="JavaScript">JavaScript</a>
<a refs="code-editor@languageLink" data-lang="JSON">JSON</a>
<a refs="code-editor@languageLink" data-lang="LaTeX">LaTeX</a>
<a refs="code-editor@languageLink" data-lang="Lua">Lua</a>
<a refs="code-editor@languageLink" data-lang="MarkDown">MarkDown</a>
<a refs="code-editor@languageLink" data-lang="Nginx">Nginx</a>
<a refs="code-editor@languageLink" data-lang="PASCAL">Pascal</a>
<a refs="code-editor@languageLink" data-lang="Perl">Perl</a>
<a refs="code-editor@languageLink" data-lang="PHP">PHP</a>
<a refs="code-editor@languageLink" data-lang="Powershell">Powershell</a>
<a refs="code-editor@languageLink" data-lang="Python">Python</a>
<a refs="code-editor@languageLink" data-lang="Ruby">Ruby</a>
<a refs="code-editor@languageLink" data-lang="shell">Shell/Bash</a>
<a refs="code-editor@languageLink" data-lang="SQL">SQL</a>
<a refs="code-editor@languageLink" data-lang="VBScript">VBScript</a>
<a refs="code-editor@languageLink" data-lang="VB.NET">VB.NET</a>
<a refs="code-editor@languageLink" data-lang="XML">XML</a>
<a refs="code-editor@languageLink" data-lang="YAML">YAML</a>
</small>
</div>
<input refs="code-editor@languageInput" id="code-editor-language" type="text"> <input refs="code-editor@languageInput" id="code-editor-language" type="text">
</div> <div class="lang-options">
<button type="button" refs="code-editor@languageLink" data-lang="CSS">CSS</button>
<div class="form-group"> <button type="button" refs="code-editor@languageLink" data-lang="C">C</button>
<div class="grid half no-break v-end mb-xs"> <button type="button" refs="code-editor@languageLink" data-lang="C++">C++</button>
<div> <button type="button" refs="code-editor@languageLink" data-lang="C#">C#</button>
<label for="code-editor-content">{{ trans('components.code_content') }}</label> <button type="button" refs="code-editor@languageLink" data-lang="Fortran">Fortran</button>
</div> <button type="button" refs="code-editor@languageLink" data-lang="Go">Go</button>
<div class="text-right"> <button type="button" refs="code-editor@languageLink" data-lang="HTML">HTML</button>
<div component="dropdown" refs="code-editor@historyDropDown" class="inline block"> <button type="button" refs="code-editor@languageLink" data-lang="INI">INI</button>
<button refs="dropdown@toggle" class="text-button text-small">@icon('history') {{ trans('components.code_session_history') }}</button> <button type="button" refs="code-editor@languageLink" data-lang="Java">Java</button>
<ul refs="dropdown@menu code-editor@historyList" class="dropdown-menu"></ul> <button type="button" refs="code-editor@languageLink" data-lang="JavaScript">JavaScript</button>
</div> <button type="button" refs="code-editor@languageLink" data-lang="JSON">JSON</button>
<button type="button" refs="code-editor@languageLink" data-lang="LaTeX">LaTeX</button>
<button type="button" refs="code-editor@languageLink" data-lang="Lua">Lua</button>
<button type="button" refs="code-editor@languageLink" data-lang="MarkDown">MarkDown</button>
<button type="button" refs="code-editor@languageLink" data-lang="Nginx">Nginx</button>
<button type="button" refs="code-editor@languageLink" data-lang="PASCAL">Pascal</button>
<button type="button" refs="code-editor@languageLink" data-lang="Perl">Perl</button>
<button type="button" refs="code-editor@languageLink" data-lang="PHP">PHP</button>
<button type="button" refs="code-editor@languageLink" data-lang="Powershell">Powershell</button>
<button type="button" refs="code-editor@languageLink" data-lang="Python">Python</button>
<button type="button" refs="code-editor@languageLink" data-lang="Ruby">Ruby</button>
<button type="button" refs="code-editor@languageLink" data-lang="shell">Shell/Bash</button>
<button type="button" refs="code-editor@languageLink" data-lang="SQL">SQL</button>
<button type="button" refs="code-editor@languageLink" data-lang="VBScript">VBScript</button>
<button type="button" refs="code-editor@languageLink" data-lang="VB.NET">VB.NET</button>
<button type="button" refs="code-editor@languageLink" data-lang="XML">XML</button>
<button type="button" refs="code-editor@languageLink" data-lang="YAML">YAML</button>
</div> </div>
</div> </div>
<div class="clearfix"></div> <div class="code-editor-main">
<textarea refs="code-editor@editor"></textarea> <textarea refs="code-editor@editor"></textarea>
</div> </div>
<div class="form-group">
<button refs="code-editor@saveButton" type="button" class="button">{{ trans('components.code_save') }}</button>
</div> </div>
<div class="popup-footer primary-background-light">
<button refs="code-editor@saveButton" type="button" class="button corner-button">{{ trans('components.code_save') }}</button>
</div> </div>
</div> </div>