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

Aligned other popup windows 

Primary change was altering image-manager to use same footer bar style
as other windows.
This commit is contained in:
Dan Brown 2022-06-20 23:02:06 +01:00
parent 1e41546e51
commit 75110813e6
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
5 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/sass/_components.scss
View File

@ -156,6 +156,8 @@
.popup-footer { .popup-footer {
justify-content: end; justify-content: end;
background-color: var(--color-primary-light);
min-height: 41px;
button { button {
padding: 10px $-m; padding: 10px $-m;
} }
@ -316,12 +318,6 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
} }
} }
.image-manager .corner-button {
margin: 0;
border-radius: 0;
padding: $-m;
}
// Dropzone // Dropzone
/* /*
* The MIT License * The MIT License

2
resources/views/common/confirm-dialog.blade.php
View File

@ -5,7 +5,7 @@
<div class="popup-header primary-background"> <div class="popup-header primary-background">
<div class="popup-title">{{ $title }}</div> <div class="popup-title">{{ $title }}</div>
<button refs="popup@hide" type="button" class="popup-header-close">x</button> <button refs="popup@hide" type="button" class="popup-header-close">@icon('close')</button>
</div> </div>
<div class="px-m py-m"> <div class="px-m py-m">

4
resources/views/entities/selector-popup.blade.php
View File

@ -3,11 +3,11 @@
<div class="popup-body small" tabindex="-1"> <div class="popup-body small" tabindex="-1">
<div class="popup-header primary-background"> <div class="popup-header primary-background">
<div class="popup-title">{{ trans('entities.entity_select') }}</div> <div class="popup-title">{{ trans('entities.entity_select') }}</div>
<button refs="popup@hide" type="button" class="popup-header-close">x</button> <button refs="popup@hide" type="button" class="popup-header-close">@icon('close')</button>
</div> </div>
@include('entities.selector', ['name' => 'entity-selector']) @include('entities.selector', ['name' => 'entity-selector'])
<div class="popup-footer"> <div class="popup-footer">
<button refs="entity-selector-popup@select" type="button" disabled="true" class="button corner-button">{{ trans('common.select') }}</button> <button refs="entity-selector-popup@select" type="button" disabled="true" class="button">{{ trans('common.select') }}</button>
</div> </div>
</div> </div>
</div> </div>

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

@ -63,8 +63,8 @@
</div> </div>
<div class="popup-footer primary-background-light"> <div class="popup-footer">
<button refs="code-editor@saveButton" type="button" class="button corner-button">{{ trans('components.code_save') }}</button> <button refs="code-editor@saveButton" type="button" class="button">{{ trans('components.code_save') }}</button>
</div> </div>
</div> </div>

10
resources/views/pages/parts/image-manager.blade.php
View File

@ -9,7 +9,7 @@
<div class="popup-header primary-background"> <div class="popup-header primary-background">
<div class="popup-title">{{ trans('components.image_select') }}</div> <div class="popup-title">{{ trans('components.image_select') }}</div>
<button refs="popup@hide" type="button" class="popup-header-close">x</button> <button refs="popup@hide" type="button" class="popup-header-close">@icon('close')</button>
</div> </div>
<div class="flex-fill image-manager-body"> <div class="flex-fill image-manager-body">
@ -53,14 +53,16 @@
</div> </div>
<div refs="image-manager@formContainer" class="inner flex"></div> <div refs="image-manager@formContainer" class="inner flex"></div>
</div>
<button refs="image-manager@selectButton" type="button" class="hidden button corner-button"> </div>
<div class="popup-footer">
<button refs="image-manager@selectButton" type="button" class="hidden button">
{{ trans('components.image_select_image') }} {{ trans('components.image_select_image') }}
</button> </button>
</div> </div>
</div> </div>
</div>
</div> </div>
</div> </div>