+
{this.items.map(itemInfo =>
@@ -51,11 +53,9 @@ export default function CarouselTemplate(this: Carousel) {
{this.renderNavigation &&
{this.showArrows.navigation && arrowBack.call(this)}
-
{ !this.hidePageIndicator && navIndicator.call(this) }
-
{this.showArrows.navigation && arrowForward.call(this)}
}
@@ -64,29 +64,29 @@ export default function CarouselTemplate(this: Carousel) {
}
function arrowBack(this: Carousel) {
- return
;
}
function arrowForward(this: Carousel) {
- return
;
}
@@ -94,8 +94,9 @@ function arrowForward(this: Carousel) {
function navIndicator(this: Carousel) {
return this.isPageTypeDots ? this.dots.map(dot =>
{this.selectedIndexToShow} {this.ofText} {this.pagesCount}
;
+ >{this._currentSlideIndex + 1} {this.ofText} {this.pagesCount}
;
}
diff --git a/packages/main/src/i18n/messagebundle.properties b/packages/main/src/i18n/messagebundle.properties
index 9e2b48e6f5b1..bd7ae6c73d53 100644
--- a/packages/main/src/i18n/messagebundle.properties
+++ b/packages/main/src/i18n/messagebundle.properties
@@ -104,7 +104,7 @@ CAL_LEGEND_ROLE_DESCRIPTION=Calendar Legend
CAROUSEL_OF_TEXT=of
#Carousel dots text
-CAROUSEL_DOT_TEXT=Item {0} of {1} displayed
+CAROUSEL_DOT_TEXT=Page {0} of {1}
# Carousel Previous Page text
CAROUSEL_PREVIOUS_ARROW_TEXT=Previous Page
diff --git a/packages/main/src/themes/Carousel.css b/packages/main/src/themes/Carousel.css
index 9f87a8d65aa8..a287989e270b 100644
--- a/packages/main/src/themes/Carousel.css
+++ b/packages/main/src/themes/Carousel.css
@@ -8,9 +8,10 @@
height: 100%;
}
-:host([desktop]) .ui5-carousel-root:focus,
-.ui5-carousel-root:focus-visible {
+:host([desktop]) .ui5-carousel-item:focus,
+.ui5-carousel-item:focus-visible {
outline: var(--sapContent_FocusWidth) var(--sapContent_FocusStyle) var(--sapContent_FocusColor);
+ outline-offset: -1px;
}
.ui5-carousel-root {
@@ -70,14 +71,14 @@
display: flex;
align-items: center;
justify-content: center;
- padding: 0 0.75rem;
+ padding: 0.75rem;
box-sizing: border-box;
- transition: opacity 0.5s linear;
- will-change: opacity;
}
.ui5-carousel-item--hidden {
- opacity: 0;
+ transition: visibility 0.5s linear;
+ will-change: visibility;
+ visibility: hidden;
}
.ui5-carousel-navigation-arrows {
@@ -127,13 +128,32 @@
}
.ui5-carousel-navigation-button {
- width: var(--ui5_carousel_button_size);
- height: var(--ui5_carousel_button_size);
- border-radius: 50%;
- box-shadow: none;
- cursor: pointer;
- outline-offset: .1rem;
- --_ui5_button_focused_border_radius: 50%;
+ width: var(--ui5_carousel_button_size);
+ height: var(--ui5_carousel_button_size);
+ border-radius: 50%;
+ box-sizing: border-box;
+ align-items: center;
+ justify-content: center;
+ display: flex;
+ padding: 0 0.5rem;
+ border: 1px solid var(--sapButton_Hover_BorderColor);
+ background: var(--sapButton_Background);
+ pointer-events: all;
+ color: var(--sapButton_TextColor);
+}
+
+.ui5-carousel-navigation-button:hover {
+ background: var(--sapButton_Hover_Background);
+ border: 1px solid var(--sapButton_Hover_BorderColor);
+ color: var(--sapButton_Hover_TextColor);
+}
+
+.ui5-carousel-navigation-button:active {
+ background-color: var(--sapButton_Active_Background);
+ border-color: var(--sapButton_Active_BorderColor);
+ outline-offset: 1px;
+ color: var(--sapButton_Active_TextColor);
+ box-shadow: none;
}
.ui5-carousel-navigation-arrows .ui5-carousel-navigation-button {
diff --git a/packages/main/src/themes/base/Carousel-parameters.css b/packages/main/src/themes/base/Carousel-parameters.css
index 4c6a3a9c2e4a..164ba83ddfce 100644
--- a/packages/main/src/themes/base/Carousel-parameters.css
+++ b/packages/main/src/themes/base/Carousel-parameters.css
@@ -1,7 +1,7 @@
:root {
--ui5_carousel_background_color_solid: var(--sapGroup_ContentBackground);
--ui5_carousel_background_color_translucent: var(--sapBackgroundColor);
- --ui5_carousel_button_size: 2.5rem;
+ --ui5_carousel_button_size: 2.25rem;
--ui5_carousel_inactive_dot_size: 0.25rem;
--ui5_carousel_inactive_dot_margin: 0 0.375rem;
--ui5_carousel_inactive_dot_border: 1px solid var(--sapContent_ForegroundBorderColor);
diff --git a/packages/main/src/themes/sap_fiori_3_hcb/Carousel-parameters.css b/packages/main/src/themes/sap_fiori_3_hcb/Carousel-parameters.css
index 8ac76606d1d8..3091ab0854bf 100644
--- a/packages/main/src/themes/sap_fiori_3_hcb/Carousel-parameters.css
+++ b/packages/main/src/themes/sap_fiori_3_hcb/Carousel-parameters.css
@@ -1,5 +1,5 @@
:root {
- --ui5_carousel_button_size: 2.5rem;
+ --ui5_carousel_button_size: 2.25rem;
--ui5_carousel_inactive_dot_size: 0.5rem;
--ui5_carousel_inactive_dot_margin: 0 0.25rem;
--ui5_carousel_inactive_dot_border: 1px solid var(--sapContent_ForegroundBorderColor);
diff --git a/packages/main/src/themes/sap_fiori_3_hcw/Carousel-parameters.css b/packages/main/src/themes/sap_fiori_3_hcw/Carousel-parameters.css
index 8ac76606d1d8..3091ab0854bf 100644
--- a/packages/main/src/themes/sap_fiori_3_hcw/Carousel-parameters.css
+++ b/packages/main/src/themes/sap_fiori_3_hcw/Carousel-parameters.css
@@ -1,5 +1,5 @@
:root {
- --ui5_carousel_button_size: 2.5rem;
+ --ui5_carousel_button_size: 2.25rem;
--ui5_carousel_inactive_dot_size: 0.5rem;
--ui5_carousel_inactive_dot_margin: 0 0.25rem;
--ui5_carousel_inactive_dot_border: 1px solid var(--sapContent_ForegroundBorderColor);
diff --git a/packages/main/src/themes/sap_horizon_hcb/Carousel-parameters.css b/packages/main/src/themes/sap_horizon_hcb/Carousel-parameters.css
index 71d68de9aeb5..4aa8dac41480 100644
--- a/packages/main/src/themes/sap_horizon_hcb/Carousel-parameters.css
+++ b/packages/main/src/themes/sap_horizon_hcb/Carousel-parameters.css
@@ -1,5 +1,5 @@
:root {
- --ui5_carousel_button_size: 2.5rem;
+ --ui5_carousel_button_size: 2.25rem;
--ui5_carousel_inactive_dot_size: 0.5rem;
--ui5_carousel_inactive_dot_margin: 0 0.25rem;
--ui5_carousel_inactive_dot_border: 1px solid var(--sapContent_ForegroundBorderColor);
diff --git a/packages/main/src/themes/sap_horizon_hcw/Carousel-parameters.css b/packages/main/src/themes/sap_horizon_hcw/Carousel-parameters.css
index 8ac76606d1d8..3091ab0854bf 100644
--- a/packages/main/src/themes/sap_horizon_hcw/Carousel-parameters.css
+++ b/packages/main/src/themes/sap_horizon_hcw/Carousel-parameters.css
@@ -1,5 +1,5 @@
:root {
- --ui5_carousel_button_size: 2.5rem;
+ --ui5_carousel_button_size: 2.25rem;
--ui5_carousel_inactive_dot_size: 0.5rem;
--ui5_carousel_inactive_dot_margin: 0 0.25rem;
--ui5_carousel_inactive_dot_border: 1px solid var(--sapContent_ForegroundBorderColor);
diff --git a/packages/main/test/pages/Carousel.html b/packages/main/test/pages/Carousel.html
index 9bfb1a10a37e..04a9690082f7 100644
--- a/packages/main/test/pages/Carousel.html
+++ b/packages/main/test/pages/Carousel.html
@@ -10,9 +10,72 @@
-
+
+
-
+
+
+ Template Based Segmentation
+ Segmentation Models
+ Marketing plans
+
+
+
+
+
+
+
+
+
+ Template Based Segmentation
+ Segmentation Models
+
+
+
+
+
+
+ Template Based Segmentation
+ Segmentation Models
+
+
+
+
+
+
+ Template Based Segmentation
+ Segmentation Models
+ Marketing plans
+
+
+
+
+
+
+
+
+
+ Template Based Segmentation
+ Segmentation Models
+
+
+
+
+
+
+ Template Based Segmentation
+ Segmentation Models
+
+
+
+
@@ -23,9 +86,43 @@
+
+
+
+
+
+ Template Based Segmentation
+ Segmentation Models
+
+
+
+
+
+
+ Template Based Segmentation
+ Segmentation Models
+
+
+
+
+
+
+
+ Template Based Segmentation
+ Segmentation Models
+
+
+
+
+
+
+ Template Based Segmentation
+ Segmentation Models
+
+
-
+
@@ -35,7 +132,7 @@
-
+
Template Based Segmentation
@@ -44,7 +141,7 @@
-
@@ -57,7 +154,7 @@
-
+
@@ -67,7 +164,7 @@
-
+
Template Based Segmentation
@@ -76,7 +173,7 @@
-
@@ -89,7 +186,7 @@
-
+
@@ -99,7 +196,7 @@
-
+
Template Based Segmentation
@@ -108,7 +205,7 @@
-
+
@@ -118,13 +215,29 @@
-
+
Template Based Segmentation
Segmentation Models
+
+
+
+
+ Event Planning
+ Team Management
+
+
+
+
+
+
+ Documentation
+ Tutorials
+
+
@@ -155,7 +268,7 @@
-
+
Template Based Segmentation
@@ -164,7 +277,7 @@
-
@@ -177,7 +290,7 @@
-
+
@@ -187,7 +300,7 @@
-
+
Template Based Segmentation
@@ -196,7 +309,7 @@
-
@@ -209,7 +322,7 @@
-
+
@@ -219,7 +332,7 @@
-
+
Template Based Segmentation
@@ -548,7 +661,7 @@
Content Part - used to align the content items
-
@@ -560,7 +673,7 @@
-
+