@ui5/webcomponents 0.0.0-1929d08ff → 0.0.0-1acdb5da5

package/src/i18n/messagebundle_vi.properties

@@ -21,6 +21,8 @@ AVATAR_GROUP_MOVE=Nhấn các phím MŨI TÊN để di chuyển.
 
 BADGE_DESCRIPTION=Biểu tượng
 
+BREADCRUMB_ITEM_POS={0} của {1}
+
 BREADCRUMBS_ARIA_LABEL=Lưu vết trong định hướng
 
 BREADCRUMBS_OVERFLOW_ARIA_LABEL=Thêm
@@ -57,6 +59,20 @@ COLOR_PALETTE_DIALOG_TITLE=Thay đổi màu
 
 COLOR_PALETTE_MORE_COLORS_TEXT=Nhiều màu hơn...
 
+COLORPICKER_ALPHA_SLIDER=Kiểm soát Alpha
+
+COLORPICKER_HUE_SLIDER=Kiểm soát sắc độ màu
+
+COLORPICKER_HEX=Thập lục phân
+
+COLORPICKER_RED=Đỏ
+
+COLORPICKER_GREEN=Xanh lá cây
+
+COLORPICKER_BLUE=Xanh da trời
+
+COLORPICKER_ALPHA=Alpha
+
 DATEPICKER_OPEN_ICON_TITLE=Mở trình chọn
 
 DATEPICKER_DATE_DESCRIPTION=Nhập ngày
@@ -73,6 +89,8 @@ FILEUPLOADER_TITLE=Tải lên tập tin
 
 GROUP_HEADER_TEXT=Tiêu đề nhóm
 
+SELECT_ROLE_DESCRIPTION=Hộp danh sách
+
 SELECT_OPTIONS=Lựa chọn các tùy chọn
 
 INPUT_SUGGESTIONS=Có sẵn đề xuất
@@ -95,6 +113,8 @@ LIST_ITEM_SELECTED=Được chọn
 
 LIST_ITEM_NOT_SELECTED=Không được chọn
 
+LIST_ITEM_GROUP_HEADER=Tiêu đề nhóm
+
 ARIA_LABEL_LIST_ITEM_CHECKBOX=Chế độ đa lựa chọn
 
 ARIA_LABEL_LIST_ITEM_RADIO_BUTTON=Lựa chọn mục.
@@ -147,13 +167,9 @@ SEGMENTEDBUTTONITEM_ARIA_DESCRIPTION=Nút được phân đoạn
 
 SLIDER_ARIA_DESCRIPTION=Điều khiển thanh trượt
 
-SWITCH_ON=Bật
-
-SWITCH_OFF=Tắt
-
 LOAD_MORE_TEXT=Thêm
 
-TABLE_HEADER_ROW_TEXT=Hàng tiêu đề
+TABLE_HEADER_ROW_INFORMATION=Hàng tiêu đề 1 trong {0}
 
 TABLE_ROW_POSITION={0} của {1}
 
@@ -163,6 +179,16 @@ ARIA_LABEL_ROW_SELECTION=Lựa chọn mục
 
 ARIA_LABEL_SELECT_ALL_CHECKBOX=Lựa chọn tất cả hàng
 
+TAB_ARIA_DESIGN_POSITIVE=Dương
+
+TAB_ARIA_DESIGN_NEGATIVE=Âm
+
+TAB_ARIA_DESIGN_CRITICAL=Tới hạn
+
+TAB_ARIA_DESIGN_NEUTRAL=Trung tính
+
+TAB_SPLIT_ROLE_DESCRIPTION=Thẻ có menu phụ
+
 TABCONTAINER_NEXT_ICON_ACC_NAME=Kế tiếp
 
 TABCONTAINER_PREVIOUS_ICON_ACC_NAME=Trước
@@ -171,6 +197,10 @@ TABCONTAINER_OVERFLOW_MENU_TITLE=Trình đơn tràn
 
 TABCONTAINER_END_OVERFLOW=Thêm
 
+TABCONTAINER_POPOVER_CANCEL_BUTTON=Hủy
+
+TABCONTAINER_SUBTABS_DESCRIPTION=Nhấn phím mũi tên xuống để mở menu phụ
+
 TEXTAREA_CHARACTERS_LEFT=còn lại {0} ký tự
 
 TEXTAREA_CHARACTERS_EXCEEDED={0} ký tự quá giới hạn
@@ -181,16 +211,12 @@ TIMEPICKER_MINUTES_LABEL=Phút
 
 TIMEPICKER_SECONDS_LABEL=Giây
 
-TIMEPICKER_PERIODS_LABEL=AM/PM
-
 TIMEPICKER_SUBMIT_BUTTON=OK
 
 TIMEPICKER_CANCEL_BUTTON=Hủy
 
 TIMEPICKER_INPUT_DESCRIPTION=Nhập thời gian
 
-DURATION_INPUT_DESCRIPTION=Nhập khoảng thời gian
-
 DATETIME_PICKER_DATE_BUTTON=Ngày
 
 DATETIME_PICKER_TIME_BUTTON=Thời gian
@@ -213,6 +239,14 @@ TREE_ITEM_EXPAND_NODE=Mở rộng nút
 
 TREE_ITEM_COLLAPSE_NODE=Thu gọn nút
 
+VALUE_STATE_TYPE_ERROR=Đánh giá tình trạng lỗi
+
+VALUE_STATE_TYPE_WARNING=Đánh giá tình trạng cảnh báo
+
+VALUE_STATE_TYPE_SUCCESS=Đánh giá tình trạng thành công
+
+VALUE_STATE_TYPE_INFORMATION=Thông tin tình trạng giá trị
+
 VALUE_STATE_ERROR=Mục nhập không hợp lệ
 
 VALUE_STATE_WARNING=Cảnh báo được phát hành
@@ -231,6 +265,10 @@ DAY_PICKER_NON_WORKING_DAY=Ngày không làm việc
 
 DAY_PICKER_TODAY=Hôm nay
 
+MONTH_PICKER_DESCRIPTION=Trình chọn tháng
+
+YEAR_PICKER_DESCRIPTION=Trình chọn năm
+
 STEPINPUT_DEC_ICON_TITLE=Giảm
 
 STEPINPUT_INC_ICON_TITLE=Tăng
@@ -239,3 +277,6 @@ SPLIT_BUTTON_DESCRIPTION=Nút phân chia
 
 SPLIT_BUTTON_KEYBOARD_HINT=Nhấn Phím cách hoặc Enter để kích hoạt thao tác mặc định và Alt + Mũi tên xuống hoặc F4 để kích hoạt thao tác mũi tên
 
+MENU_BACK_BUTTON_ARIA_LABEL=Quay lại
+
+MENU_CLOSE_BUTTON_ARIA_LABEL=Từ chối

package/src/i18n/messagebundle_zh_CN.properties

@@ -21,6 +21,8 @@ AVATAR_GROUP_MOVE=按箭头键进行移动。
 
 BADGE_DESCRIPTION=徽章
 
+BREADCRUMB_ITEM_POS={0} / {1}
+
 BREADCRUMBS_ARIA_LABEL=位置指示节点跟踪
 
 BREADCRUMBS_OVERFLOW_ARIA_LABEL=更多
@@ -29,9 +31,9 @@ BREADCRUMBS_CANCEL_BUTTON=取消
 
 BUSY_INDICATOR_TITLE=请稍候
 
-BUTTON_ARIA_TYPE_ACCEPT=肯定操作
+BUTTON_ARIA_TYPE_ACCEPT=积极操作
 
-BUTTON_ARIA_TYPE_REJECT=否定操作
+BUTTON_ARIA_TYPE_REJECT=消极操作
 
 BUTTON_ARIA_TYPE_EMPHASIZED=加重
 
@@ -57,6 +59,20 @@ COLOR_PALETTE_DIALOG_TITLE=更改颜色
 
 COLOR_PALETTE_MORE_COLORS_TEXT=更多颜色...
 
+COLORPICKER_ALPHA_SLIDER=Alpha 控制
+
+COLORPICKER_HUE_SLIDER=色度控制
+
+COLORPICKER_HEX=十六进制
+
+COLORPICKER_RED=红色
+
+COLORPICKER_GREEN=绿色
+
+COLORPICKER_BLUE=蓝色
+
+COLORPICKER_ALPHA=Alpha
+
 DATEPICKER_OPEN_ICON_TITLE=打开选取器
 
 DATEPICKER_DATE_DESCRIPTION=日期输入
@@ -73,6 +89,8 @@ FILEUPLOADER_TITLE=上载文件
 
 GROUP_HEADER_TEXT=组抬头
 
+SELECT_ROLE_DESCRIPTION=列表框
+
 SELECT_OPTIONS=选择选项
 
 INPUT_SUGGESTIONS=有可用建议
@@ -95,6 +113,8 @@ LIST_ITEM_SELECTED=已选择
 
 LIST_ITEM_NOT_SELECTED=未选择
 
+LIST_ITEM_GROUP_HEADER=组抬头
+
 ARIA_LABEL_LIST_ITEM_CHECKBOX=多重选择模式
 
 ARIA_LABEL_LIST_ITEM_RADIO_BUTTON=项目选择。
@@ -147,13 +167,9 @@ SEGMENTEDBUTTONITEM_ARIA_DESCRIPTION=分段式按钮
 
 SLIDER_ARIA_DESCRIPTION=滑块手柄
 
-SWITCH_ON=开
-
-SWITCH_OFF=关
-
 LOAD_MORE_TEXT=更多
 
-TABLE_HEADER_ROW_TEXT=抬头行
+TABLE_HEADER_ROW_INFORMATION=抬头行 1 / {0}
 
 TABLE_ROW_POSITION={0} / {1}
 
@@ -163,6 +179,16 @@ ARIA_LABEL_ROW_SELECTION=项目选择
 
 ARIA_LABEL_SELECT_ALL_CHECKBOX=选择所有行
 
+TAB_ARIA_DESIGN_POSITIVE=积极
+
+TAB_ARIA_DESIGN_NEGATIVE=消极
+
+TAB_ARIA_DESIGN_CRITICAL=临界
+
+TAB_ARIA_DESIGN_NEUTRAL=中性
+
+TAB_SPLIT_ROLE_DESCRIPTION=含有子项目的标签
+
 TABCONTAINER_NEXT_ICON_ACC_NAME=下一个
 
 TABCONTAINER_PREVIOUS_ICON_ACC_NAME=上一个
@@ -171,6 +197,10 @@ TABCONTAINER_OVERFLOW_MENU_TITLE=溢出菜单
 
 TABCONTAINER_END_OVERFLOW=更多
 
+TABCONTAINER_POPOVER_CANCEL_BUTTON=取消
+
+TABCONTAINER_SUBTABS_DESCRIPTION=按下箭头键打开子项目菜单
+
 TEXTAREA_CHARACTERS_LEFT=剩余 {0} 个字符
 
 TEXTAREA_CHARACTERS_EXCEEDED=超过限制 {0} 个字符
@@ -181,16 +211,12 @@ TIMEPICKER_MINUTES_LABEL=分钟
 
 TIMEPICKER_SECONDS_LABEL=秒
 
-TIMEPICKER_PERIODS_LABEL=AM/PM
-
 TIMEPICKER_SUBMIT_BUTTON=确定
 
 TIMEPICKER_CANCEL_BUTTON=取消
 
 TIMEPICKER_INPUT_DESCRIPTION=时间输入
 
-DURATION_INPUT_DESCRIPTION=持续时间输入
-
 DATETIME_PICKER_DATE_BUTTON=日期
 
 DATETIME_PICKER_TIME_BUTTON=时间
@@ -213,6 +239,14 @@ TREE_ITEM_EXPAND_NODE=展开节点
 
 TREE_ITEM_COLLAPSE_NODE=折叠节点
 
+VALUE_STATE_TYPE_ERROR=值状态错误
+
+VALUE_STATE_TYPE_WARNING=值状态警告
+
+VALUE_STATE_TYPE_SUCCESS=值状态成功
+
+VALUE_STATE_TYPE_INFORMATION=值状态信息
+
 VALUE_STATE_ERROR=无效输入
 
 VALUE_STATE_WARNING=已发出警告
@@ -231,6 +265,10 @@ DAY_PICKER_NON_WORKING_DAY=非工作日
 
 DAY_PICKER_TODAY=今天
 
+MONTH_PICKER_DESCRIPTION=月份选取器
+
+YEAR_PICKER_DESCRIPTION=年度选取器
+
 STEPINPUT_DEC_ICON_TITLE=减少
 
 STEPINPUT_INC_ICON_TITLE=增加
@@ -239,3 +277,6 @@ SPLIT_BUTTON_DESCRIPTION=拆分按钮
 
 SPLIT_BUTTON_KEYBOARD_HINT=按空格键或 Enter 触发缺省操作，按 Alt + 向下箭头或 F4 触发箭头操作
 
+MENU_BACK_BUTTON_ARIA_LABEL=返回
+
+MENU_CLOSE_BUTTON_ARIA_LABEL=拒绝

package/src/i18n/messagebundle_zh_TW.properties

@@ -21,6 +21,8 @@ AVATAR_GROUP_MOVE=按箭頭鍵以移動。
 
 BADGE_DESCRIPTION=徽章
 
+BREADCRUMB_ITEM_POS={0}/{1}
+
 BREADCRUMBS_ARIA_LABEL=路徑指引追蹤
 
 BREADCRUMBS_OVERFLOW_ARIA_LABEL=更多
@@ -57,6 +59,20 @@ COLOR_PALETTE_DIALOG_TITLE=更改色彩
 
 COLOR_PALETTE_MORE_COLORS_TEXT=更多色彩...
 
+COLORPICKER_ALPHA_SLIDER=Alpha 控制
+
+COLORPICKER_HUE_SLIDER=色調控制
+
+COLORPICKER_HEX=十六進位
+
+COLORPICKER_RED=紅色
+
+COLORPICKER_GREEN=綠色
+
+COLORPICKER_BLUE=藍色
+
+COLORPICKER_ALPHA=Alpha
+
 DATEPICKER_OPEN_ICON_TITLE=開啟選擇器
 
 DATEPICKER_DATE_DESCRIPTION=日期輸入
@@ -73,6 +89,8 @@ FILEUPLOADER_TITLE=上傳檔案
 
 GROUP_HEADER_TEXT=群組表頭
 
+SELECT_ROLE_DESCRIPTION=清單方塊
+
 SELECT_OPTIONS=選擇選項
 
 INPUT_SUGGESTIONS=可用建議
@@ -95,6 +113,8 @@ LIST_ITEM_SELECTED=已勾選
 
 LIST_ITEM_NOT_SELECTED=未選擇
 
+LIST_ITEM_GROUP_HEADER=群組表頭
+
 ARIA_LABEL_LIST_ITEM_CHECKBOX=多重選擇模式
 
 ARIA_LABEL_LIST_ITEM_RADIO_BUTTON=項目選擇。
@@ -147,13 +167,9 @@ SEGMENTEDBUTTONITEM_ARIA_DESCRIPTION=區段按鈕
 
 SLIDER_ARIA_DESCRIPTION=滑桿控點
 
-SWITCH_ON=開啟
-
-SWITCH_OFF=關閉
-
 LOAD_MORE_TEXT=較多
 
-TABLE_HEADER_ROW_TEXT=表頭列
+TABLE_HEADER_ROW_INFORMATION=表頭列 1/{0}
 
 TABLE_ROW_POSITION={0}/{1}
 
@@ -163,6 +179,16 @@ ARIA_LABEL_ROW_SELECTION=項目選擇
 
 ARIA_LABEL_SELECT_ALL_CHECKBOX=選擇所有列
 
+TAB_ARIA_DESIGN_POSITIVE=正面
+
+TAB_ARIA_DESIGN_NEGATIVE=負面
+
+TAB_ARIA_DESIGN_CRITICAL=重要
+
+TAB_ARIA_DESIGN_NEUTRAL=一般
+
+TAB_SPLIT_ROLE_DESCRIPTION=含子項目的索引標籤
+
 TABCONTAINER_NEXT_ICON_ACC_NAME=下一步
 
 TABCONTAINER_PREVIOUS_ICON_ACC_NAME=上一步
@@ -171,6 +197,10 @@ TABCONTAINER_OVERFLOW_MENU_TITLE=溢位功能表
 
 TABCONTAINER_END_OVERFLOW=更多
 
+TABCONTAINER_POPOVER_CANCEL_BUTTON=取消
+
+TABCONTAINER_SUBTABS_DESCRIPTION=按向下鍵以開啟子項目功能表
+
 TEXTAREA_CHARACTERS_LEFT=剩下 {0} 個字元
 
 TEXTAREA_CHARACTERS_EXCEEDED=超過 {0} 個字元
@@ -181,16 +211,12 @@ TIMEPICKER_MINUTES_LABEL=分
 
 TIMEPICKER_SECONDS_LABEL=秒
 
-TIMEPICKER_PERIODS_LABEL=早上/下午
-
 TIMEPICKER_SUBMIT_BUTTON=成功
 
 TIMEPICKER_CANCEL_BUTTON=取消
 
 TIMEPICKER_INPUT_DESCRIPTION=時間輸入
 
-DURATION_INPUT_DESCRIPTION=持續期輸入
-
 DATETIME_PICKER_DATE_BUTTON=日期
 
 DATETIME_PICKER_TIME_BUTTON=時間
@@ -213,6 +239,14 @@ TREE_ITEM_EXPAND_NODE=展開節點
 
 TREE_ITEM_COLLAPSE_NODE=收縮節點
 
+VALUE_STATE_TYPE_ERROR=值狀態 (錯誤)
+
+VALUE_STATE_TYPE_WARNING=值狀態 (警告)
+
+VALUE_STATE_TYPE_SUCCESS=值狀態 (成功)
+
+VALUE_STATE_TYPE_INFORMATION=值狀態資訊
+
 VALUE_STATE_ERROR=無效輸入項
 
 VALUE_STATE_WARNING=已發出警告
@@ -231,6 +265,10 @@ DAY_PICKER_NON_WORKING_DAY=非工作日
 
 DAY_PICKER_TODAY=今天
 
+MONTH_PICKER_DESCRIPTION=月份選擇器
+
+YEAR_PICKER_DESCRIPTION=年份選擇器
+
 STEPINPUT_DEC_ICON_TITLE=減少
 
 STEPINPUT_INC_ICON_TITLE=增加
@@ -239,3 +277,6 @@ SPLIT_BUTTON_DESCRIPTION=分割按鈕
 
 SPLIT_BUTTON_KEYBOARD_HINT=按下空格鍵或 Enter 以驅動預設動作，以及 Alt + 向下箭頭或 F4 以驅動箭頭動作
 
+MENU_BACK_BUTTON_ARIA_LABEL=返回
+
+MENU_CLOSE_BUTTON_ARIA_LABEL=拒絕

package/src/themes/Avatar.css

@@ -1,6 +1,7 @@
 :host(:not([hidden])) {
 	display: inline-block;
 	box-sizing: border-box;
+	position: relative;
 }
 
 /*The ui5_hovered class is set by FileUploader to indicate hover state of the control*/
@@ -26,18 +27,13 @@
 	color: var(--ui5-avatar-initials-color);
 }
 
-/* Shapes */
-:host([shape="Square"]),
-:host([shape="Square"]) ::slotted(*){
-	border-radius: .25rem;
-}
-
-:host([shape="Square"]) .ui5-avatar-root {
-	border-radius: inherit;
-}
-
-:host([shape="Square"]) .ui5-avatar-img {
-	border-radius: inherit;
+.ui5-avatar-root {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	outline: none;
+	height: 100%;
+	width: 100%;
 }
 
 /* Sizes */
@@ -81,147 +77,191 @@
 
 /* Icon */
 :host .ui5-avatar-icon {
-	height: 1.5rem;
-	width: 1.5rem;
+	height: var(--_ui5_avatar_fontsize_S);
+	width: var(--_ui5_avatar_fontsize_S);
 	color: inherit;
 }
 
 :host([_size="XS"]) .ui5-avatar-icon,
 :host([size="XS"]) .ui5-avatar-icon {
-	height: 1rem;
-	width: 1rem;
+	height: var(--_ui5_avatar_icon_XS);
+	width: var(--_ui5_avatar_icon_XS);
 }
 
 :host([_size="S"]) .ui5-avatar-icon,
 :host([size="S"]) .ui5-avatar-icon {
-	height: 1.5rem;
-	width: 1.5rem;
+	height: var(--_ui5_avatar_icon_S);
+	width: var(--_ui5_avatar_icon_S);
 }
 
 :host([_size="M"]) .ui5-avatar-icon,
 :host([size="M"]) .ui5-avatar-icon {
-	height: 2rem;
-	width: 2rem;
+	height: var(--_ui5_avatar_icon_M);
+	width: var(--_ui5_avatar_icon_M);
 }
 
 :host([_size="L"]) .ui5-avatar-icon,
 :host([size="L"]) .ui5-avatar-icon {
-	height: 2.5rem;
-	width: 2.5rem;
+	height: var(--_ui5_avatar_icon_L);
+	width: var(--_ui5_avatar_icon_L);
 }
 
 :host([_size="XL"]) .ui5-avatar-icon,
 :host([size="XL"]) .ui5-avatar-icon {
-	height: 3rem;
-	width: 3rem;
+	height: var(--_ui5_avatar_icon_XL);
+	width: var(--_ui5_avatar_icon_XL);
 }
 
 ::slotted(*) {
 	border-radius: 50%;
     width: 100%;
     height: 100%;
+	pointer-events: none;
+}
+
+/* Shapes */
+:host([shape="Square"]) {
+	border-radius: var(--ui5-avatar-border-radius);
+}
+
+:host([shape="Square"]) ::slotted(*) {
+	border-radius: calc(var(--ui5-avatar-border-radius) - var(--ui5-avatar-border-radius-img-deduction));
 }
 
 :host(:not([color-scheme])),
 :host(:not([_has-image])),
 :host([_color-scheme="Accent6"]),
-:host([color-scheme="Accent6"]) {
+:host([ui5-avatar][color-scheme="Accent6"]) {
 	background-color: var(--ui5-avatar-accent6);
 	color: var(--ui5-avatar-accent6-color);
+	border-color: var(--ui5-avatar-accent6-border-color);
 }
 
 :host([_color-scheme="Accent1"]),
-:host([color-scheme="Accent1"]) {
+:host([ui5-avatar][color-scheme="Accent1"]) {
 	background-color: var(--ui5-avatar-accent1);
 	color: var(--ui5-avatar-accent1-color);
+	border-color: var(--ui5-avatar-accent1-border-color);
 }
 
 :host([_color-scheme="Accent2"]),
-:host([color-scheme="Accent2"]) {
+:host([ui5-avatar][color-scheme="Accent2"]) {
 	background-color: var(--ui5-avatar-accent2);
 	color: var(--ui5-avatar-accent2-color);
+	border-color: var(--ui5-avatar-accent2-border-color);
 }
 
 :host([_color-scheme="Accent3"]),
-:host([color-scheme="Accent3"]) {
+:host([ui5-avatar][color-scheme="Accent3"]) {
 	background-color: var(--ui5-avatar-accent3);
 	color: var(--ui5-avatar-accent3-color);
+	border-color: var(--ui5-avatar-accent3-border-color);
 }
 
 :host([_color-scheme="Accent4"]),
-:host([color-scheme="Accent4"]) {
+:host([ui5-avatar][color-scheme="Accent4"]) {
 	background-color: var(--ui5-avatar-accent4);
 	color: var(--ui5-avatar-accent4-color);
+	border-color: var(--ui5-avatar-accent4-border-color);
 }
 
 :host([_color-scheme="Accent5"]),
-:host([color-scheme="Accent5"]) {
+:host([ui5-avatar][color-scheme="Accent5"]) {
 	background-color: var(--ui5-avatar-accent5);
 	color: var(--ui5-avatar-accent5-color);
+	border-color: var(--ui5-avatar-accent5-border-color);
 }
 
 :host([_color-scheme="Accent7"]),
-:host([color-scheme="Accent7"]) {
+:host([ui5-avatar][color-scheme="Accent7"]) {
 	background-color: var(--ui5-avatar-accent7);
 	color: var(--ui5-avatar-accent7-color);
+	border-color: var(--ui5-avatar-accent7-border-color);
 }
 
 :host([_color-scheme="Accent8"]),
-:host([color-scheme="Accent8"]) {
+:host([ui5-avatar][color-scheme="Accent8"]) {
 	background-color: var(--ui5-avatar-accent8);
 	color: var(--ui5-avatar-accent8-color);
+	border-color: var(--ui5-avatar-accent8-border-color);
 }
 
 :host([_color-scheme="Accent9"]),
-:host([color-scheme="Accent9"]) {
+:host([ui5-avatar][color-scheme="Accent9"]) {
 	background-color: var(--ui5-avatar-accent9);
 	color: var(--ui5-avatar-accent9-color);
+	border-color: var(--ui5-avatar-accent9-border-color);
 }
 
 :host([_color-scheme="Accent10"]),
-:host([color-scheme="Accent10"]) {
+:host([ui5-avatar][color-scheme="Accent10"]) {
 	background-color: var(--ui5-avatar-accent10);
 	color: var(--ui5-avatar-accent10-color);
+	border-color: var(--ui5-avatar-accent10-border-color);
 }
 
 :host([_color-scheme="Placeholder"]),
-:host([color-scheme="Placeholder"]) {
+:host([ui5-avatar][color-scheme="Placeholder"]) {
 	background-color: var(--ui5-avatar-placeholder);
 	color: var(--ui5-avatar-placeholder-color);
+	border-color: var(--ui5-avatar-placeholder-border-color);
 }
 
 :host([_has-image]) {
 	background-color: transparent;
+	vertical-align: middle;
 }
 
-:host([image-fit-type="Contain"]) .ui5-avatar-img {
-	background-size: contain;
+.ui5-avatar-initials {
+	color: inherit;
 }
 
-.ui5-avatar-root {
-	display: flex;
-	align-items: center;
+/* Slotted Badge */
+::slotted([slot="badge"]) {
+	position: absolute;
+	bottom: 0;
+	right: 0;
+	width: 1.125rem;
+	height: 1.125rem;
+	background: var(--sapButton_Emphasized_Background);
+	border: var(--sapButton_Emphasized_Background);
+	border-radius: 1rem;
+	color: var(--sapContent_BadgeTextColor);
 	justify-content: center;
-	outline: none;
+	font-family: "72override", var(--sapFontFamily);
+	font-size: var(--sapFontSmallSize);
 }
 
-.ui5-avatar-root,
-.ui5-avatar-img {
-	height: 100%;
-	width: 100%;
-	border-radius: 50%;
+::slotted([ui5-badge][slot="badge"]) {
+	padding: 0.1875rem;
 }
 
-.ui5-avatar-img {
-	background-repeat: no-repeat;
-	background-position: center;
-	background-size: cover;
+:host([_size="L"]) ::slotted([slot="badge"]),
+:host([size="L"]) ::slotted([slot="badge"]) {
+	width: 1.25rem;
+	height: 1.25rem;
 }
 
-.ui5-avatar-initials {
-	color: inherit;
+:host([_size="XL"]) ::slotted([slot="badge"]),
+:host([size="XL"]) ::slotted([slot="badge"]) {
+	padding: 0.375rem;
+	width: 1.75rem;
+	height: 1.75rem;
 }
 
-::slotted(*) {
-	pointer-events: none;
+:host([shape="Square"]) ::slotted([slot="badge"]) {
+	bottom: -0.125rem;
+	right: -0.125rem;
+}
+
+:host([_size="L"][shape="Square"]) ::slotted([slot="badge"]),
+:host([size="L"][shape="Square"]) ::slotted([slot="badge"]) {
+	bottom: -0.1875rem;
+	right: -0.1875rem;
+}
+
+:host([_size="XL"][shape="Square"]) ::slotted([slot="badge"]),
+:host([size="XL"][shape="Square"]) ::slotted([slot="badge"]) {
+	bottom: -0.25rem;
+	right: -0.25rem;
 }