Skip to content

Commit d97cc50

Browse files
tbialcztbialcz
committed
Merge branch '4.6' into ibx_9060
2 parents 5114272 + b296fc5 commit d97cc50

File tree

20 files changed

+102
-20
lines changed

20 files changed

+102
-20
lines changed

‎src/bundle/Resources/public/img/ibexa-icons.svg

Lines changed: 7 additions & 0 deletions
Loading

‎src/bundle/Resources/public/img/icons/column-settings.svg

Lines changed: 7 additions & 0 deletions
Loading

‎src/bundle/Resources/public/js/scripts/core/suggestion.taggify.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { getRestInfo } from '@ibexa-admin-ui/src/bundle/Resources/public/js/scri
22

33
(function (global, doc, ibexa) {
44
const MIN_QUERY_LENGTH = 3;
5+
const SUGGESTIONS_LIST_BOTTOM_MARGIN = 16;
56

67
class SuggestionTaggify extends ibexa.core.Taggify {
78
constructor(config) {
@@ -15,6 +16,21 @@ import { getRestInfo } from '@ibexa-admin-ui/src/bundle/Resources/public/js/scri
1516

1617
this.renderSuggestionsList = this.renderSuggestionsList.bind(this);
1718
this.getItemsFromResponse = this.getItemsFromResponse.bind(this);
19+
this.updateSuggestionsMaxHeight = this.updateSuggestionsMaxHeight.bind(this);
20+
}
21+
22+
updateSuggestionsMaxHeight() {
23+
if (this.suggestionsListNode.classList.contains('ibexa-taggify__suggestions--hidden')) {
24+
return;
25+
}
26+
27+
const suggestionRect = this.suggestionsListNode.getBoundingClientRect();
28+
const windowHeight = window.innerHeight;
29+
const topOffset = suggestionRect.top;
30+
const countedMaxHeight = windowHeight - topOffset - SUGGESTIONS_LIST_BOTTOM_MARGIN;
31+
const maxHeight = this.suggestionsListMaxHeight ? Math.min(this.suggestionsListMaxHeight, countedMaxHeight) : countedMaxHeight;
32+
33+
this.suggestionsListNode.style.maxHeight = `${maxHeight}px`;
1834
}
1935

2036
hideSuggestionsList() {
@@ -133,6 +149,8 @@ import { getRestInfo } from '@ibexa-admin-ui/src/bundle/Resources/public/js/scri
133149
this.hideSuggestionsList();
134150
}
135151
});
152+
153+
window.addEventListener('resize', this.updateSuggestionsMaxHeight);
136154
}
137155
}
138156

‎src/bundle/Resources/public/scss/_context-menu.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@
3434

3535
&--more {
3636
position: relative;
37+
38+
.ibexa-btn--more {
39+
align-items: center;
40+
height: calculateRem(48px);
41+
}
3742
}
3843
}
3944

‎src/bundle/Resources/public/scss/_custom-url-form.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,8 @@
3232
}
3333
}
3434
}
35+
36+
&__helper-text {
37+
width: calc(100% - calculateRem(16px));
38+
}
3539
}

‎src/bundle/Resources/public/scss/_dropdown.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
cursor: pointer;
3333
display: flex;
3434
align-items: center;
35-
flex-wrap: nowrap;
35+
flex-wrap: wrap;
3636
margin-bottom: 0;
3737
transition: all $ibexa-admin-transition-duration $ibexa-admin-transition;
3838

‎src/bundle/Resources/public/scss/_main-container.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,14 @@
116116
}
117117
}
118118

119+
&--full-width {
120+
.container {
121+
@media (min-width: 1200px) {
122+
max-width: calculateRem(2000px);
123+
}
124+
}
125+
}
126+
119127
.ibexa-content-container {
120128
display: flex;
121129
flex-direction: column;

‎src/bundle/Resources/public/scss/_tag-view-select.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
white-space: nowrap;
1212
overflow: hidden;
1313
text-overflow: ellipsis;
14+
15+
&--disabled {
16+
color: $ibexa-color-dark-300;
17+
}
1418
}
1519

1620
&__selected-list {

‎src/bundle/Resources/public/scss/_taggify.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@
5858
background-color: $ibexa-color-white;
5959
padding: calculateRem(4px);
6060
box-shadow: $ibexa-edit-content-box-shadow;
61+
max-height: calculateRem(480px);
62+
overflow-y: auto;
6163

6264
&--hidden {
6365
display: none;

‎src/bundle/Resources/public/scss/_user-name.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
.ibexa-user-name {
22
display: inline-flex;
3-
align-items: center;
43

54
&__thumbnail {
65
width: calculateRem(20px);
76
height: calculateRem(20px);
8-
margin-right: calculateRem(8px);
7+
margin: calculateRem(2px) calculateRem(8px) 0 0;
98
}
109

1110
&__text {

‎src/bundle/Resources/translations/ibexa_bookmark.en.xliff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</header>
88
<body>
99
<trans-unit id="5cc4d552faa942983e3eb8ec85c053aeb1e42ae4" resname="bookmark.button.remove">
10-
<source>Delete</source>
11-
<target state="new">Delete</target>
10+
<source>Remove from bookmarks</source>
11+
<target state="new">Remove from bookmarks</target>
1212
<note>key: bookmark.button.remove</note>
1313
</trans-unit>
1414
<trans-unit id="c2c1dc512033aabc10e0c6a46cf5e99355f5c750" resname="bookmark.headline">

‎src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
{% form_theme form_remove '@ibexadesign/ui/form_fields.html.twig' %}
88

99
{% block body_class %}ibexa-bookmark-list-view{% endblock %}
10+
{% block main_container_class %}{{ parent() }} ibexa-main-container--full-width {% endblock %}
1011

1112
{% block header %}
1213
{% include '@ibexadesign/ui/page_title.html.twig' with {
@@ -92,7 +93,7 @@
9293
{ },
9394
],
9495
body_rows,
95-
actions: form_widget(form_remove.remove, {'attr': {'class': 'btn ibexa-btn ibexa-btn--ghost ibexa-btn--small', 'disabled': true}}),
96+
actions: form_widget(form_remove.remove, {'attr': {'class': 'btn ibexa-btn ibexa-btn--ghost ibexa-btn--small', 'disabled': true} }),
9697
empty_table_info_text: 'bookmark.list.empty'|trans|desc('You have no bookmarks yet. Your bookmarks will show up here.'),
9798
} %}
9899
{{ form_end(form_remove) }}
@@ -108,7 +109,7 @@
108109
'action': path('ibexa.content.edit'),
109110
'attr': { 'class': 'ibexa-edit-content-form'}
110111
}) }}
111-
{{ form_widget(form_edit.language, {'attr': {'hidden': 'hidden', 'class': 'language-input'}}) }}
112+
{{ form_widget(form_edit.language, {'attr': {'hidden': 'hidden', 'class': 'language-input'} }) }}
112113
{{ form_end(form_edit) }}
113114
</div>
114115
{% endblock %}

‎src/bundle/Resources/views/themes/admin/account/forgot_password/index.html.twig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,6 @@
2222

2323
{{ form_end(form_forgot_user_password) }}
2424
{% endif %}
25+
26+
{{ encore_entry_script_tags('ibexa-admin-ui-reset-password-js', null, 'ibexa') }}
2527
{%- endblock content -%}

‎src/bundle/Resources/views/themes/admin/content/tab/versions/table.html.twig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
{% set have_actions = (is_draft or is_archived) or custom_actions %}
88

99
<div class="ibexa-scrollable-wrapper">
10+
{{ ibexa_twig_component_group('admin-ui-versions-table-before', {
11+
is_draft: is_draft,
12+
is_archived: is_archived,
13+
is_draft_conflict: is_draft_conflict,
14+
}) }}
15+
1016
<table class="ibexa-table table ibexa-table--draft-conflict {{ (is_draft and have_to_paginate ? 'mb-3' : '') }}">
1117
<thead>
1218
<tr class="ibexa-table__head-row">

‎src/bundle/Resources/views/themes/admin/ui/component/tag_view_select/tag_view_select.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
{% if is_disabled %}disabled{% endif %}
2424
>
2525
{% if show_title %}
26-
<div class="ibexa-tag-view-select__info">
26+
<div class="ibexa-tag-view-select__info {{ is_disabled|default(false) ? 'ibexa-tag-view-select__info--disabled' }}">
2727
{{ title|default(default_title) }}
2828
</div>
2929
{% endif %}

0 commit comments

Comments
 (0)