@openui5/themelib_sap_horizon 1.108.19 → 1.108.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (53) hide show
  1. package/THIRDPARTY.txt +1 -1
  2. package/package.json +18 -18
  3. package/src/sap/m/themes/sap_horizon/BusyIndicator.less +2 -2
  4. package/src/sap/m/themes/sap_horizon/Button.less +13 -26
  5. package/src/sap/m/themes/sap_horizon/IconTabBar.less +40 -17
  6. package/src/sap/m/themes/sap_horizon/InputBase.less +5 -1
  7. package/src/sap/m/themes/sap_horizon/MessageStrip.less +4 -12
  8. package/src/sap/m/themes/sap_horizon/Page.less +2 -1
  9. package/src/sap/m/themes/sap_horizon/RadioButton.less +0 -21
  10. package/src/sap/m/themes/sap_horizon/SearchField.less +8 -5
  11. package/src/sap/m/themes/sap_horizon/SegmentedButton.less +2 -3
  12. package/src/sap/m/themes/sap_horizon/ToggleButton.less +2 -19
  13. package/src/sap/m/themes/sap_horizon_dark/BusyIndicator.less +2 -2
  14. package/src/sap/m/themes/sap_horizon_dark/Button.less +13 -26
  15. package/src/sap/m/themes/sap_horizon_dark/IconTabBar.less +30 -7
  16. package/src/sap/m/themes/sap_horizon_dark/InputBase.less +5 -1
  17. package/src/sap/m/themes/sap_horizon_dark/MessageStrip.less +4 -12
  18. package/src/sap/m/themes/sap_horizon_dark/Page.less +2 -1
  19. package/src/sap/m/themes/sap_horizon_dark/RadioButton.less +0 -21
  20. package/src/sap/m/themes/sap_horizon_dark/SearchField.less +10 -6
  21. package/src/sap/m/themes/sap_horizon_dark/SegmentedButton.less +2 -3
  22. package/src/sap/m/themes/sap_horizon_dark/ToggleButton.less +2 -20
  23. package/src/sap/m/themes/sap_horizon_hcb/BusyIndicator.less +2 -2
  24. package/src/sap/m/themes/sap_horizon_hcb/Button.less +1 -1
  25. package/src/sap/m/themes/sap_horizon_hcb/Carousel.less +2 -2
  26. package/src/sap/m/themes/sap_horizon_hcb/Page.less +2 -1
  27. package/src/sap/m/themes/sap_horizon_hcb/SearchField.less +4 -4
  28. package/src/sap/m/themes/sap_horizon_hcw/BusyIndicator.less +2 -2
  29. package/src/sap/m/themes/sap_horizon_hcw/Button.less +1 -1
  30. package/src/sap/m/themes/sap_horizon_hcw/Carousel.less +2 -2
  31. package/src/sap/m/themes/sap_horizon_hcw/Page.less +2 -1
  32. package/src/sap/m/themes/sap_horizon_hcw/SearchField.less +4 -4
  33. package/src/sap/tnt/themes/sap_horizon/InfoLabel.less +28 -14
  34. package/src/sap/tnt/themes/sap_horizon_dark/InfoLabel.less +28 -14
  35. package/src/sap/tnt/themes/sap_horizon_hcb/InfoLabel.less +21 -6
  36. package/src/sap/tnt/themes/sap_horizon_hcw/InfoLabel.less +21 -6
  37. package/src/sap/ui/core/themes/sap_horizon/.theme +1 -1
  38. package/src/sap/ui/core/themes/sap_horizon/base.less +138 -137
  39. package/src/sap/ui/core/themes/sap_horizon/global.less +4 -0
  40. package/src/sap/ui/core/themes/sap_horizon_dark/.theme +1 -1
  41. package/src/sap/ui/core/themes/sap_horizon_dark/base.less +111 -110
  42. package/src/sap/ui/core/themes/sap_horizon_dark/global.less +5 -1
  43. package/src/sap/ui/core/themes/sap_horizon_hcb/.theme +1 -1
  44. package/src/sap/ui/core/themes/sap_horizon_hcb/base.less +15 -15
  45. package/src/sap/ui/core/themes/sap_horizon_hcw/.theme +1 -1
  46. package/src/sap/ui/core/themes/sap_horizon_hcw/base.less +14 -14
  47. package/src/sap/ui/layout/themes/sap_horizon_dark/Splitter.less +1 -1
  48. package/src/sap/ui/layout/themes/sap_horizon_hcb/BlockLayout.less +3 -1
  49. package/src/sap/ui/layout/themes/sap_horizon_hcb/Splitter.less +0 -1
  50. package/src/sap/ui/layout/themes/sap_horizon_hcw/BlockLayout.less +3 -1
  51. package/src/sap/ui/layout/themes/sap_horizon_hcw/Splitter.less +0 -1
  52. package/src/sap/ui/unified/themes/sap_horizon_hcb/ColorPicker.less +7 -2
  53. package/src/sap/ui/unified/themes/sap_horizon_hcw/ColorPicker.less +7 -2
package/src/sap/ui/core/themes/sap_horizon_dark/global.less CHANGED
@@ -1290,4 +1290,8 @@
1290
1290
  @sapUiUx3ShellApplicationImageURL: @sapUiGlobalLogo; // "Quick"
1291
1291
 
1292
1292
  // DEPRECATED: Title Alignment to start (left or right) or center (default) for Dialogs, Message Boxes, Popover, Page, etc.; possible values: 'start' or 'center'
1293
- @sapMTitleAlignment: Start;
1293
+ @sapMTitleAlignment: Start;
1294
+
1295
+ // @sapField_HorizonNGEnabled: 1 enables editable **Fields** to appear with dark grey backgroubd again,
1296
+ // and read-only fields to appear grey
1297
+ @sapField_HorizonNGEnabled: 1;
package/src/sap/ui/core/themes/sap_horizon_hcb/.theme CHANGED
@@ -6,7 +6,7 @@
6
6
  <copyright>OpenUI5
7
7
  * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
8
8
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
9
- <version>1.108.19</version>
9
+ <version>1.108.20</version>
10
10
 
11
11
  <documentation>SAPUI5 horizon high contrast black theme library.</documentation>
12
12
 
package/src/sap/ui/core/themes/sap_horizon_hcb/base.less CHANGED
@@ -1,11 +1,11 @@
1
1
  // /**
2
- // * Copyright (c) 2012-2020 SAP SE or an SAP affiliate company and Theming Base Content contributors. Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
3
- // * Theming Engine 1.23050.0-20230523090303+e385b420d426b24bae1dee2743785a1448185388
4
- // * data:{"sModified":"2023-05-25T10:12:25Z"}
2
+ // * Copyright (c) 2012-2023 SAP SE or an SAP affiliate company and Theming Base Content contributors. Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
3
+ // * Theming Engine 1.23061.0
4
+ // * data:{"sModified":"2023-09-11T07:13:37Z"}
5
5
  // */
6
6
 
7
7
 
8
- /******************* FILE /Base/baseLib/sap_horizon_hcb/base.less (Version 11.4.2) *******************/
8
+ /******************* FILE /Base/baseLib/sap_horizon_hcb/base.less (Version 11.6.8) *******************/
9
9
 
10
10
 
11
11
  // [Tags "SapInternal", "Base", "Dimension", "Protected"]
@@ -579,7 +579,7 @@
579
579
 
580
580
  // [Tags "!Protected"]
581
581
  // [Protected "!true"]
582
- @sapContent_Illustrative_Color4: #030303;
582
+ @sapContent_Illustrative_Color4: #fff;
583
583
 
584
584
  // [Tags "!Protected"]
585
585
  // [Protected "!true"]
@@ -766,7 +766,7 @@
766
766
 
767
767
  // [Tags "!Protected"]
768
768
  // [Protected "!true"]
769
- @sapShell_GroupTitleTextShadow: -0.0625 * @sapContent_GridSize 0 @sapShell_Background, 0 0.0625 * @sapContent_GridSize @sapShell_Background, 0.0625 * @sapContent_GridSize 0 @sapShell_Background, 0 -0.0625 * @sapContent_GridSize @sapShell_Background;
769
+ @sapShell_GroupTitleTextShadow: -0.0625rem 0 @sapShell_Background, 0 0.0625rem @sapShell_Background, 0.0625rem 0 @sapShell_Background, 0 -0.0625rem @sapShell_Background;
770
770
 
771
771
  // [Tags "!Protected"]
772
772
  // [Protected "!true"]
@@ -1102,7 +1102,7 @@
1102
1102
 
1103
1103
  // [Tags "!Protected"]
1104
1104
  // [Protected "!true"]
1105
- @sapButton_Hover_Background: @sapHighlightColor;
1105
+ @sapButton_Hover_Background: @sapHoverColor;
1106
1106
 
1107
1107
  // [Tags "!Protected"]
1108
1108
  // [Protected "!true"]
@@ -1793,10 +1793,10 @@
1793
1793
  // [Protected "!true"]
1794
1794
  @sapField_Hover_HelpBackground: @sapField_Background;
1795
1795
  @sapField_Hover_Shadow: none;
1796
- @sapField_Hover_InvalidShadow: none;
1797
- @sapField_Hover_WarningShadow: none;
1798
- @sapField_Hover_SuccessShadow: none;
1799
- @sapField_Hover_InformationShadow: none;
1796
+ @sapField_Hover_InvalidShadow: @sapField_InvalidShadow;
1797
+ @sapField_Hover_WarningShadow: @sapField_WarningShadow;
1798
+ @sapField_Hover_SuccessShadow: @sapField_SuccessShadow;
1799
+ @sapField_Hover_InformationShadow: @sapField_InformationShadow;
1800
1800
 
1801
1801
  // [Tags "!Protected"]
1802
1802
  // [Protected "!true"]
@@ -2016,7 +2016,7 @@
2016
2016
 
2017
2017
  // [Tags "!Protected"]
2018
2018
  // [Protected "!true"]
2019
- @sapList_Hover_Background: @sapHighlightColor;
2019
+ @sapList_Hover_Background: @sapHoverColor;
2020
2020
 
2021
2021
  // [Tags "!Protected"]
2022
2022
  // [Protected "!true"]
@@ -2332,7 +2332,7 @@
2332
2332
 
2333
2333
  // [Tags "!Protected"]
2334
2334
  // [Protected "!true"]
2335
- @sapObjectHeader_Hover_Background: @sapHighlightColor;
2335
+ @sapObjectHeader_Hover_Background: @sapHoverColor;
2336
2336
 
2337
2337
  // [Tags "!Protected"]
2338
2338
  // [Protected "!true"]
@@ -2344,7 +2344,7 @@
2344
2344
 
2345
2345
  // [Tags "!Protected"]
2346
2346
  // [Protected "!true"]
2347
- @sapObjectHeader_Title_FontSize: @sapFontHeader2Size;
2347
+ @sapObjectHeader_Title_FontSize: @sapFontHeader3Size;
2348
2348
 
2349
2349
  // [Tags "!Protected"]
2350
2350
  // [Protected "!true"]
@@ -2368,7 +2368,7 @@
2368
2368
 
2369
2369
  // [Tags "!Protected"]
2370
2370
  // [Protected "!true"]
2371
- @sapTile_Hover_Background: @sapHighlightColor;
2371
+ @sapTile_Hover_Background: @sapHoverColor;
2372
2372
 
2373
2373
  // [Tags "!Protected"]
2374
2374
  // [Protected "!true"]
package/src/sap/ui/core/themes/sap_horizon_hcw/.theme CHANGED
@@ -6,7 +6,7 @@
6
6
  <copyright>OpenUI5
7
7
  * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
8
8
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
9
- <version>1.108.19</version>
9
+ <version>1.108.20</version>
10
10
 
11
11
  <documentation>SAPUI5 horizon high contrast white theme library.</documentation>
12
12
 
package/src/sap/ui/core/themes/sap_horizon_hcw/base.less CHANGED
@@ -1,11 +1,11 @@
1
1
  // /**
2
- // * Copyright (c) 2012-2020 SAP SE or an SAP affiliate company and Theming Base Content contributors. Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
3
- // * Theming Engine 1.23050.0-20230523090303+e385b420d426b24bae1dee2743785a1448185388
4
- // * data:{"sModified":"2023-05-25T10:12:25Z"}
2
+ // * Copyright (c) 2012-2023 SAP SE or an SAP affiliate company and Theming Base Content contributors. Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
3
+ // * Theming Engine 1.23061.0
4
+ // * data:{"sModified":"2023-09-11T07:13:37Z"}
5
5
  // */
6
6
 
7
7
 
8
- /******************* FILE /Base/baseLib/sap_horizon_hcw/base.less (Version 11.4.2) *******************/
8
+ /******************* FILE /Base/baseLib/sap_horizon_hcw/base.less (Version 11.6.8) *******************/
9
9
 
10
10
 
11
11
  // [Tags "SapInternal", "Base", "Dimension", "Protected"]
@@ -766,7 +766,7 @@
766
766
 
767
767
  // [Tags "!Protected"]
768
768
  // [Protected "!true"]
769
- @sapShell_GroupTitleTextShadow: -0.0625 * @sapContent_GridSize 0 @sapShell_Background, 0 0.0625 * @sapContent_GridSize @sapShell_Background, 0.0625 * @sapContent_GridSize 0 @sapShell_Background, 0 -0.0625 * @sapContent_GridSize @sapShell_Background;
769
+ @sapShell_GroupTitleTextShadow: -0.0625rem 0 @sapShell_Background, 0 0.0625rem @sapShell_Background, 0.0625rem 0 @sapShell_Background, 0 -0.0625rem @sapShell_Background;
770
770
 
771
771
  // [Tags "!Protected"]
772
772
  // [Protected "!true"]
@@ -1102,7 +1102,7 @@
1102
1102
 
1103
1103
  // [Tags "!Protected"]
1104
1104
  // [Protected "!true"]
1105
- @sapButton_Hover_Background: @sapHighlightColor;
1105
+ @sapButton_Hover_Background: @sapHoverColor;
1106
1106
 
1107
1107
  // [Tags "!Protected"]
1108
1108
  // [Protected "!true"]
@@ -1793,10 +1793,10 @@
1793
1793
  // [Protected "!true"]
1794
1794
  @sapField_Hover_HelpBackground: @sapField_Background;
1795
1795
  @sapField_Hover_Shadow: none;
1796
- @sapField_Hover_InvalidShadow: none;
1797
- @sapField_Hover_WarningShadow: none;
1798
- @sapField_Hover_SuccessShadow: none;
1799
- @sapField_Hover_InformationShadow: none;
1796
+ @sapField_Hover_InvalidShadow: @sapField_InvalidShadow;
1797
+ @sapField_Hover_WarningShadow: @sapField_WarningShadow;
1798
+ @sapField_Hover_SuccessShadow: @sapField_SuccessShadow;
1799
+ @sapField_Hover_InformationShadow: @sapField_InformationShadow;
1800
1800
 
1801
1801
  // [Tags "!Protected"]
1802
1802
  // [Protected "!true"]
@@ -2016,7 +2016,7 @@
2016
2016
 
2017
2017
  // [Tags "!Protected"]
2018
2018
  // [Protected "!true"]
2019
- @sapList_Hover_Background: @sapHighlightColor;
2019
+ @sapList_Hover_Background: @sapHoverColor;
2020
2020
 
2021
2021
  // [Tags "!Protected"]
2022
2022
  // [Protected "!true"]
@@ -2332,7 +2332,7 @@
2332
2332
 
2333
2333
  // [Tags "!Protected"]
2334
2334
  // [Protected "!true"]
2335
- @sapObjectHeader_Hover_Background: @sapHighlightColor;
2335
+ @sapObjectHeader_Hover_Background: @sapHoverColor;
2336
2336
 
2337
2337
  // [Tags "!Protected"]
2338
2338
  // [Protected "!true"]
@@ -2344,7 +2344,7 @@
2344
2344
 
2345
2345
  // [Tags "!Protected"]
2346
2346
  // [Protected "!true"]
2347
- @sapObjectHeader_Title_FontSize: @sapFontHeader2Size;
2347
+ @sapObjectHeader_Title_FontSize: @sapFontHeader3Size;
2348
2348
 
2349
2349
  // [Tags "!Protected"]
2350
2350
  // [Protected "!true"]
@@ -2368,7 +2368,7 @@
2368
2368
 
2369
2369
  // [Tags "!Protected"]
2370
2370
  // [Protected "!true"]
2371
- @sapTile_Hover_Background: @sapHighlightColor;
2371
+ @sapTile_Hover_Background: @sapHoverColor;
2372
2372
 
2373
2373
  // [Tags "!Protected"]
2374
2374
  // [Protected "!true"]
package/src/sap/ui/layout/themes/sap_horizon_dark/Splitter.less CHANGED
@@ -1,5 +1,5 @@
1
1
  /* ================================================= */
2
- /* CSS for control sap.ui.layout/Splitter */
2
+ /* CSS for control sap.ui.layout/Splitter */
3
3
  /* Evening Horizon theme */
4
4
  /* ================================================= */
5
5
 
package/src/sap/ui/layout/themes/sap_horizon_hcb/BlockLayout.less CHANGED
@@ -3,6 +3,8 @@
3
3
  /* Horizon High Contrast Black theme */
4
4
  /* ========================================== */
5
5
 
6
+ @_sap_ui_layout_BlockLayout_FontSizeLandXL: @sapMFontHeader2Size;
7
+
6
8
  @_sap_ui_layout_BlockLayout_BackgroundDashboardMargin: 0.75rem;
7
9
  @_sap_ui_layout_BlockLayout_BackgroundDashboardEdgeChildMargin: 1rem;
8
10
  @_sap_ui_layout_BlockLayout_BackgroundDashboardAfterScrollbarMargin: 0.75rem;
@@ -85,7 +87,7 @@
85
87
  @_sap_ui_layout_BlockLayout_BlockColorAccentType8C: #164122; // Green 3
86
88
  @_sap_ui_layout_BlockLayout_BlockColorAccentType8D: #194C28; // Green 4
87
89
  @_sap_ui_layout_BlockLayout_BlockColorAccentType8E: #1F5E31; // Green 6
88
- @_sap_ui_layout_BlockLayout_BlockColorAccentType8F: #226635; // Green 7
90
+ @_sap_ui_layout_BlockLayout_BlockColorAccentType8F: #226635; // Green 7
89
91
 
90
92
  @_sap_ui_layout_BlockLayout_BlockColorAccentType9A: #032B37; // Cyan 1
91
93
  @_sap_ui_layout_BlockLayout_BlockColorAccentType9B: #033545; // Cyan 2
package/src/sap/ui/layout/themes/sap_horizon_hcb/Splitter.less CHANGED
@@ -5,7 +5,6 @@
5
5
 
6
6
  @_sap_ui_layout_Splitter_BarActiveDecorationColors: @sapUiObjectHeaderBorderColor, @sapUiObjectHeaderBorderColor;
7
7
  @_sap_ui_layout_Splitter_BarDecorationColors: @sapUiObjectHeaderBorderColor, fade(@sapUiObjectHeaderBorderColor, 0);
8
- @_sap_ui_layout_Splitter_BarBorder: 0.0625rem solid @sapUiGroupContentBorderColor;
9
8
  @_sap_ui_layout_Splitter_BarHoverIconBorderColor: @sapUiButtonLiteHoverBorderColor;
10
9
  @_sap_ui_layout_Splitter_BarHoverIconBackground: @sapUiButtonLiteHoverBackground;
11
10
 
package/src/sap/ui/layout/themes/sap_horizon_hcw/BlockLayout.less CHANGED
@@ -3,6 +3,8 @@
3
3
  /* Horizon High Contrast White theme */
4
4
  /* ========================================== */
5
5
 
6
+ @_sap_ui_layout_BlockLayout_FontSizeLandXL: @sapMFontHeader2Size;
7
+
6
8
  @_sap_ui_layout_BlockLayout_BackgroundDashboardMargin: 0.75rem;
7
9
  @_sap_ui_layout_BlockLayout_BackgroundDashboardEdgeChildMargin: 1rem;
8
10
  @_sap_ui_layout_BlockLayout_BackgroundDashboardAfterScrollbarMargin: 0.75rem;
@@ -85,7 +87,7 @@
85
87
  @_sap_ui_layout_BlockLayout_BlockColorAccentType8C: #84D025; // Green 3
86
88
  @_sap_ui_layout_BlockLayout_BlockColorAccentType8D: #7EC623; // Green 4
87
89
  @_sap_ui_layout_BlockLayout_BlockColorAccentType8E: #71B11F; // Green 6
88
- @_sap_ui_layout_BlockLayout_BlockColorAccentType8F: #69A51D; // Green 7
90
+ @_sap_ui_layout_BlockLayout_BlockColorAccentType8F: #69A51D; // Green 7
89
91
 
90
92
  @_sap_ui_layout_BlockLayout_BlockColorAccentType9A: #51DDF2; // Cyan 1
91
93
  @_sap_ui_layout_BlockLayout_BlockColorAccentType9B: #2DD6EF; // Cyan 2
package/src/sap/ui/layout/themes/sap_horizon_hcw/Splitter.less CHANGED
@@ -5,7 +5,6 @@
5
5
 
6
6
  @_sap_ui_layout_Splitter_BarActiveDecorationColors: @sapUiObjectHeaderBorderColor, @sapUiObjectHeaderBorderColor;
7
7
  @_sap_ui_layout_Splitter_BarDecorationColors: @sapUiObjectHeaderBorderColor, fade(@sapUiObjectHeaderBorderColor, 0);
8
- @_sap_ui_layout_Splitter_BarBorder: 0.0625rem solid @sapUiGroupContentBorderColor;
9
8
  @_sap_ui_layout_Splitter_BarHoverIconBorderColor: @sapUiButtonLiteHoverBorderColor;
10
9
  @_sap_ui_layout_Splitter_BarHoverIconBackground: @sapUiButtonLiteHoverBackground;
11
10
 
package/src/sap/ui/unified/themes/sap_horizon_hcb/ColorPicker.less CHANGED
@@ -20,7 +20,7 @@
20
20
  .sapUiColorPicker-ColorPickerSlider {
21
21
  .sapMSliderHandle {
22
22
  width: 1.0625rem;
23
- top: -0.50rem;
23
+ top: -0.5rem;
24
24
  border: 0.125rem solid @sapUiContentContrastShadowColor;
25
25
  background-color: transparent;
26
26
  box-shadow: inset 0 0 0 0.125rem @sapUiContentForegroundColor;
@@ -109,11 +109,16 @@
109
109
  }
110
110
  }
111
111
  .sapUnifiedColorPicker {
112
+ .sapMSliderInner:not(.sapMSliderInnerDisabled) .sapMSliderHandle:focus {
113
+ top: -0.375rem;
114
+ }
112
115
  .sapUiColorPicker-ColorPickerAlphaSlider,
113
116
  .sapUiColorPicker-ColorPickerSlider {
114
117
  .sapMSliderHandle {
115
- height: 1.25rem;
118
+ top: -0.375rem;
119
+ height: 1.25rem;
116
120
  }
121
+
117
122
  }
118
123
  }
119
124
  }
package/src/sap/ui/unified/themes/sap_horizon_hcw/ColorPicker.less CHANGED
@@ -20,7 +20,7 @@
20
20
  .sapUiColorPicker-ColorPickerSlider {
21
21
  .sapMSliderHandle {
22
22
  width: 1.0625rem;
23
- top: -0.50rem;
23
+ top: -0.5rem;
24
24
  border: 0.125rem solid @sapUiContentContrastShadowColor;
25
25
  background-color: transparent;
26
26
  box-shadow: inset 0 0 0 0.125rem @sapUiContentForegroundColor;
@@ -109,11 +109,16 @@
109
109
  }
110
110
  }
111
111
  .sapUnifiedColorPicker {
112
+ .sapMSliderInner:not(.sapMSliderInnerDisabled) .sapMSliderHandle:focus {
113
+ top: -0.375rem;
114
+ }
112
115
  .sapUiColorPicker-ColorPickerAlphaSlider,
113
116
  .sapUiColorPicker-ColorPickerSlider {
114
117
  .sapMSliderHandle {
115
- height: 1.25rem;
118
+ top: -0.375rem;
119
+ height: 1.25rem;
116
120
  }
121
+
117
122
  }
118
123
  }
119
124
  }