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 'fix-1186'

Browse Source
This commit is contained in:
Dan Brown 2019-03-08 22:57:57 +00:00
commit 33e999909f
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,7 +210,6 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
.image-manager-sidebar {
width: 300px;
margin-left: 1px;
overflow-y: auto;
overflow-x: hidden;
border-left: 1px solid #DDD;
@ -524,8 +523,8 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
font-size: 12px;
line-height: 1.2;
top: 88px;
left: -26px;
width: 148px;
left: -12px;
width: 160px;
background: $negative;
padding: $-xs;
color: white;
@ -535,7 +534,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
content: '';
position: absolute;
top: -6px;
left: 64px;
left: 44px;
width: 0;
height: 0;
border-left: 6px solid transparent;

1
resources/lang/en/validation.php
View File

@ -69,6 +69,7 @@ return [
'timezone' => 'The :attribute must be a valid zone.',
'unique' => 'The :attribute has already been taken.',
'url' => 'The :attribute format is invalid.',
'is_image' => 'The :attribute must be a valid image.',
// Custom validation lines
'custom' => [