colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bug-650' of git://github.com/Abijeet/BookStack into Abijeet-bug-650

This commit is contained in:
Dan Brown 2018-01-28 14:15:31 +00:00
parent ead4b14d94 f2c62765ca
commit 98d4bf4486
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/assets/sass/_components.scss
View File

@ -102,6 +102,10 @@
display: flex; display: flex;
align-self: flex-start; align-self: flex-start;
} }
.popup-content {
overflow-y: auto;
}
} }
.corner-button { .corner-button {

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

@ -7,7 +7,7 @@
<button class="overlay-close neg corner-button button" @click="hide()">x</button> <button class="overlay-close neg corner-button button" @click="hide()">x</button>
</div> </div>
<div class="padded"> <div class="padded popup-content">
<div class="form-group"> <div class="form-group">
<label for="code-editor-language">{{ trans('components.code_language') }}</label> <label for="code-editor-language">{{ trans('components.code_language') }}</label>
<div class="lang-options"> <div class="lang-options">