1
0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-30 07:32:39 +01:00

Merge branch 'Abijeet-bug-650'

This commit is contained in:
Dan Brown 2018-01-28 14:20:35 +00:00
commit 30b4f81fc6
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 14 additions and 1 deletions

View File

@ -102,6 +102,10 @@
display: flex;
align-self: flex-start;
}
.popup-content {
overflow-y: auto;
}
}
.corner-button {
@ -542,6 +546,15 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
}
}
@include smaller-than($m) {
#code-editor .lang-options {
max-width: 100%;
}
#code-editor .CodeMirror {
height: 200px;
}
}
.comment-box {
border: 1px solid #DDD;
margin-bottom: $-s;

View File

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