Merge branch '4.2' into 4.3

src/bundle/Resources/public/scss/ui/modules/universal-discovery/_content.edit.button.scss

@@ -7,4 +7,7 @@
         justify-content: center;
         align-items: center;
     }
+    .ibexa-icon {
+        margin-right: 0;
+    }
 }

src/bundle/Resources/public/scss/ui/modules/universal-discovery/_selected.locations.item.scss

@@ -3,7 +3,7 @@
     align-items: center;
     padding: calculateRem(5px);
     margin-bottom: calculateRem(8px);
-    border-top: calculateRem(1px) solid $ibexa-color-light;
+    border: calculateRem(1px) solid $ibexa-color-light;
     border-radius: $ibexa-border-radius;
     box-shadow: calculateRem(4px) calculateRem(2px) calculateRem(17px) 0 rgba($ibexa-color-black, 0.05);
 
@@ -38,6 +38,7 @@
     &__actions-wrapper {
         display: flex;
         justify-content: flex-end;
+        align-items: center;
     }
 
     &__remove-button {

src/bundle/Resources/public/scss/ui/modules/universal-discovery/_selected.locations.scss

@@ -2,7 +2,7 @@
     background-color: $ibexa-color-white;
     position: fixed;
     top: calculateRem(95px);
-    right: 0;
+    right: calculateRem(16px);
     min-height: calculateRem(60px);
     min-width: calculateRem(390px);
     border: calculateRem(1px) solid $ibexa-color-light;
@@ -16,24 +16,20 @@
         display: flex;
         justify-content: space-between;
         align-items: center;
-        padding: calculateRem(12px) calculateRem(12px) calculateRem(12px) calculateRem(32px);
+        padding: calculateRem(7px) calculateRem(12px) calculateRem(7px) calculateRem(22px);
     }
 
     &__selection-counter {
+        color: $ibexa-color-dark;
         font-size: calculateRem(22px);
         font-weight: 600;
         padding-right: calculateRem(16px);
     }
 
-    &__toggle-button {
-        .ibexa-icon:first-child {
-            margin-right: calculateRem(-6px);
-        }
-    }
-
     &--expanded {
         bottom: calculateRem(100px);
         min-width: calculateRem(491px);
+        overflow: hidden;
 
         .c-selected-locations {
             &__items-wrapper {
@@ -47,6 +43,7 @@
         overflow: auto;
         padding: 0 calculateRem(38px) calculateRem(16px) calculateRem(22px);
         border-top: calculateRem(1px) solid $ibexa-color-light;
+        height: calc(100% - calculateRem(70px));
     }
 
     &__actions {

src/bundle/Resources/translations/universal_discovery_widget.en.xliff

@@ -296,16 +296,16 @@
         <target state="new">Collapse sidebar</target>
         <note>key: selected_locations.collapse.sidebar</note>
       </trans-unit>
+      <trans-unit id="d4462bb9386e96a0984586618fbfbcd0852fd4ea" resname="selected_locations.deselect_all">
+        <source>Deselect all</source>
+        <target state="new">Deselect all</target>
+        <note>key: selected_locations.deselect_all</note>
+      </trans-unit>
       <trans-unit id="19700661da70137e52d0009660c9a87f5bcb99bd" resname="selected_locations.expand.sidebar">
         <source>Expand sidebar</source>
         <target state="new">Expand sidebar</target>
         <note>key: selected_locations.expand.sidebar</note>
       </trans-unit>
-      <trans-unit id="01e881354bb5e776ed6f3fd36360f8f3c06a5fd7" resname="selected_locations.remove_all">
-        <source>Remove all</source>
-        <target state="new">Remove all</target>
-        <note>key: selected_locations.remove_all</note>
-      </trans-unit>
       <trans-unit id="fe05e738022445778cb775ca099ba54291ae88e9" resname="selected_locations.selected_items">
         <source>%count% selected item(s)</source>
         <target state="new">%count% selected item(s)</target>

src/bundle/ui-dev/src/modules/universal-discovery/components/selected-locations/selected.locations.item.js

@@ -39,7 +39,7 @@ const SelectedLocationsItem = ({ location, permissions }) => {
     return (
         <div className="c-selected-locations-item" ref={refSelectedLocationsItem}>
             <div className="c-selected-locations-item__image-wrapper">
-                <Thumbnail thumbnailData={thumbnailData} />
+                <Thumbnail thumbnailData={thumbnailData} iconExtraClasses="ibexa-icon--small" />
             </div>
             <div className="c-selected-locations-item__info">
                 <span className="c-selected-locations-item__info-name">{location.ContentInfo.Content.TranslatedName}</span>

src/bundle/ui-dev/src/modules/universal-discovery/components/selected-locations/selected.locations.js

@@ -42,7 +42,7 @@ const SelectedLocations = () => {
         return <div className="c-selected-locations__selection-counter">{selectedLabel}</div>;
     };
     const renderToggleButton = () => {
-        const iconName = isExpanded ? 'caret-next' : 'caret-back';
+        const iconName = isExpanded ? 'caret-double-next' : 'caret-double-back';
 
         return (
             <button
@@ -54,18 +54,21 @@ const SelectedLocations = () => {
                 data-tooltip-container-selector=".c-udw-tab"
             >
                 <Icon name={iconName} extraClasses="ibexa-icon--small" />
-                <Icon name={iconName} extraClasses="ibexa-icon--small" />
             </button>
         );
     };
     const renderActionButtons = () => {
-        const removeAllLabel = Translator.trans(/*@Desc("Remove all")*/ 'selected_locations.remove_all', {}, 'universal_discovery_widget');
+        const removeAllLabel = Translator.trans(
+            /*@Desc("Deselect all")*/ 'selected_locations.deselect_all',
+            {},
+            'universal_discovery_widget',
+        );
 
         return (
             <div className="c-selected-locations__actions">
                 <button
                     type="button"
-                    className="c-selected-locations__clear-selection-button btn ibexa-btn ibexa-btn--secondary"
+                    className="c-selected-locations__clear-selection-button btn ibexa-btn ibexa-btn--small ibexa-btn--secondary"
                     onClick={clearSelection}
                 >
                     {removeAllLabel}