@salesforcedevs/dx-components 1.3.241-ux-alpha1 → 1.3.242-alpha2

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 (29) hide show
  1. package/lwc.config.json +0 -1
  2. package/package.json +1 -1
  3. package/src/assets/icons/salesforcebrand-sprite/svg/symbols.svg +2 -2
  4. package/src/modules/dx/codeBlock/codeBlock.html +1 -1
  5. package/src/modules/dx/codeBlock/codeBlock.ts +60 -6
  6. package/src/modules/dx/dropdownOption/dropdownOption.css +3 -5
  7. package/src/modules/dx/popover/popover.css +2 -2
  8. package/src/modules/dx/searchResults/coveo.css +1 -1
  9. package/src/modules/dx/sidebar/sidebar.css +5 -8
  10. package/src/modules/dx/sidebar/sidebar.html +3 -28
  11. package/src/modules/dx/sidebar/sidebar.ts +42 -2
  12. package/src/modules/dx/sidebarOld/sidebarOld.css +0 -1
  13. package/src/modules/dx/sidebarOld/sidebarOld.html +2 -22
  14. package/src/modules/dx/sidebarOld/sidebarOld.ts +38 -0
  15. package/src/modules/dx/sidebarSearchResult/sidebarSearchResult.css +4 -26
  16. package/src/modules/dx/tab/tab.css +20 -15
  17. package/src/modules/dx/treeItem/treeItem.css +2 -2
  18. package/src/modules/dx/treeTile/treeTile.css +28 -37
  19. package/src/modules/dx/treeTile/treeTile.html +6 -6
  20. package/src/modules/dx/treeTile/treeTile.ts +1 -2
  21. package/src/modules/dxBaseElements/headerBase/headerBase.ts +1 -1
  22. package/src/modules/dxBaseElements/sidebarBase/sidebarBase.ts +1 -96
  23. package/src/modules/dxConstants/brands/brands.ts +1 -1
  24. package/src/modules/dxHelpers/commonHeader/commonHeader.css +1 -2
  25. package/src/modules/dxHelpers/commonSidebar/commonSidebar.css +13 -36
  26. package/src/modules/dxHelpers/commonTreeItem/commonTreeItem.css +3 -22
  27. package/src/modules/dx/sidebarFooterNav/sidebarFooterNav.css +0 -52
  28. package/src/modules/dx/sidebarFooterNav/sidebarFooterNav.html +0 -55
  29. package/src/modules/dx/sidebarFooterNav/sidebarFooterNav.ts +0 -106
package/lwc.config.json CHANGED
@@ -78,7 +78,6 @@
78
78
  "dx/select",
79
79
  "dx/sidebar",
80
80
  "dx/sidebarOld",
81
- "dx/sidebarFooterNav",
82
81
  "dx/skipNavLink",
83
82
  "dx/socials",
84
83
  "dx/spinner",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@salesforcedevs/dx-components",
3
- "version": "1.3.241-ux-alpha1",
3
+ "version": "1.3.242-alpha2",
4
4
  "description": "DX Lightning web components",
5
5
  "license": "MIT",
6
6
  "engines": {
@@ -272,7 +272,7 @@
272
272
  </g>
273
273
  </g>
274
274
  </symbol>
275
- <symbol id="data-cloud" viewBox="0 0 56 56" xmlns="http://www.w3.org/2000/svg" style="fill:#fff">
275
+ <symbol id="data" viewBox="0 0 56 56" xmlns="http://www.w3.org/2000/svg" style="fill:#fff">
276
276
  <defs>
277
277
  <style>.acls-2,.acls-4{stroke-width:0}.acls-2{fill:#8a8ed1}.acls-4{fill:#fff}</style>
278
278
  </defs>
@@ -927,7 +927,7 @@
927
927
  </clipPath>
928
928
  </defs>
929
929
  </symbol>
930
- <symbol fill="none" id="data-cloud" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56">
930
+ <symbol fill="none" id="data" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 56">
931
931
  <path fill="#8a8ed1" d="m28,4C14.77,4,4,14.77,4,28c0,7.9,3.84,14.93,9.76,19.3.7-4.58,3.55-8.46,7.5-10.56-2.61-2.02-4.29-5.17-4.29-8.71,0-6.08,4.95-11.03,11.03-11.03s11.03,4.95,11.03,11.03c0,3.54-1.69,6.69-4.29,8.71,3.95,2.1,6.8,5.98,7.5,10.56,5.92-4.37,9.77-11.4,9.77-19.31,0-13.23-10.77-24-24-24Z"/>
932
932
  <path fill="#8a8ed1" d="m11.07,18.3c.69-1.2,2.21-1.61,3.41-.92,1.2.68,1.61,2.21.93,3.41h0c-.46.81-1.3,1.26-2.17,1.26-.42,0-.85-.11-1.24-.34-1.2-.68-1.61-2.21-.92-3.41Z"/>
933
933
  <path fill="#8a8ed1" d="m8.49,28.06c0-1.38,1.11-2.5,2.49-2.51,1.38,0,2.51,1.11,2.51,2.5s-1.11,2.5-2.49,2.5h-.01c-1.38,0-2.5-1.11-2.5-2.49Z"/>
@@ -11,7 +11,7 @@
11
11
  <div class="toolbar-item">
12
12
  <dx-dropdown
13
13
  small="true"
14
- options={allLanguages}
14
+ options={supportedLanguages}
15
15
  value={selectedLanguageId}
16
16
  onchange={onLanguageChange}
17
17
  >
@@ -44,11 +44,12 @@ export default class CodeBlock extends LightningElement {
44
44
  @api language: string = "";
45
45
  // if it is true, it renders code as is coming instead of wrapping it into html/xml comments tags.
46
46
  @api isEncoded = false;
47
+ @api showLanguageDropdown!: boolean;
48
+ private codeWithLanguages: { id: string; value: string }[] = [];
47
49
 
48
50
  private markupLangs = ["visualforce", "html", "xml"];
49
51
  private _codeBlockRendered: boolean = false;
50
52
  private componentLoaded: boolean = false;
51
- private showLanguageDropdown: boolean = false;
52
53
  private copyBtnText: string = "Click to copy";
53
54
  private selectedLanguageLabel: string = "";
54
55
  private selectedLanguageId: string = "";
@@ -98,17 +99,62 @@ export default class CodeBlock extends LightningElement {
98
99
  set codeBlock(value: string) {
99
100
  this._codeBlockRendered = false;
100
101
  let match;
101
- this._codeBlock = (
102
- (match = preTagRegexp.exec(value.trim())) === null
103
- ? value.trim()
104
- : match[1]
105
- ).trim();
102
+ if (this.showLanguageDropdown) {
103
+ let selectedLangBasedCode = "";
104
+ try {
105
+ const parsedValue = value && JSON.parse(value);
106
+ this.codeWithLanguages = parsedValue;
107
+ if (typeof parsedValue === "object" && parsedValue !== null) {
108
+ this.selectedLanguageId = this.language;
109
+ if (this.selectedLanguageId) {
110
+ const selectedCode = this.codeWithLanguages.filter(
111
+ (obj) => obj.id === this.selectedLanguageId
112
+ );
113
+ if (selectedCode.length > 0) {
114
+ selectedLangBasedCode = selectedCode[0].value;
115
+ }
116
+ }
117
+ const supportedLanguages = parsedValue.map(
118
+ (obj: { id: string }) => obj.id
119
+ );
120
+ this._supportedLanguages = this.allLanguages.filter(
121
+ (lang) => supportedLanguages.includes(lang.id)
122
+ );
123
+ }
124
+ } catch (error) {
125
+ //console.log('Value is not a valid JSON string:', value);
126
+ }
127
+ this._codeBlock = (
128
+ (match = preTagRegexp.exec(selectedLangBasedCode.trim())) ===
129
+ null
130
+ ? selectedLangBasedCode.trim()
131
+ : match[1]
132
+ ).trim();
133
+ } else {
134
+ this._codeBlock = (
135
+ (match = preTagRegexp.exec(value.trim())) === null
136
+ ? value.trim()
137
+ : match[1]
138
+ ).trim();
139
+ }
106
140
  }
107
141
 
108
142
  get codeBlock(): string {
109
143
  return this._codeBlock;
110
144
  }
111
145
 
146
+ _supportedLanguages: CodeBlockLanguage[] = [];
147
+ @api
148
+ get supportedLanguages(): CodeBlockLanguage[] {
149
+ return this._supportedLanguages;
150
+ }
151
+ set supportedLanguages(value: string) {
152
+ const codeblockSupportedLanguages = JSON.parse(value);
153
+ this._supportedLanguages = this.allLanguages.filter((lang) =>
154
+ codeblockSupportedLanguages.includes(lang.id)
155
+ );
156
+ }
157
+
112
158
  @track private theme: CodeBlockTheme | null = null;
113
159
 
114
160
  @wire(getLocalStorageData, { key: "dx-codeblock-theme" })
@@ -223,6 +269,14 @@ export default class CodeBlock extends LightningElement {
223
269
  ) || this.allLanguages[0];
224
270
  this.selectedLanguageLabel = this.selectedLanguage.label;
225
271
  this.selectedLanguageId = this.selectedLanguage.id;
272
+ if (this.showLanguageDropdown) {
273
+ const selectedCode = this.codeWithLanguages.filter(
274
+ (codeObj) => codeObj.id === this.selectedLanguageId
275
+ );
276
+ if (selectedCode.length > 0) {
277
+ this._codeBlock = selectedCode[0].value;
278
+ }
279
+ }
226
280
  this.formatCodeBlock();
227
281
 
228
282
  gtmTrack(newLang, "custEv_ctaLinkClick", {
@@ -38,7 +38,7 @@
38
38
  }
39
39
 
40
40
  .option:active {
41
- background: var(--dx-g-cloud-blue-vibrant-95) !important;
41
+ background: var(--dx-g-blue-vibrant-95) !important;
42
42
  }
43
43
 
44
44
  .option:not(.option-active):hover {
@@ -46,9 +46,7 @@
46
46
  }
47
47
 
48
48
  .option-active {
49
- --dx-c-dropdown-option-label-color: var(--dx-g-blue-vibrant-50);
50
-
51
- background: var(--dx-g-cloud-blue-vibrant-95);
49
+ background: var(--dx-g-blue-vibrant-95);
52
50
  }
53
51
 
54
52
  .option_details {
@@ -69,7 +67,7 @@
69
67
  color: var(--dx-c-dropdown-option-label-color, var(--dx-g-blue-vibrant-50));
70
68
  display: flex;
71
69
  align-items: center;
72
- font-weight: var(--dx-c-dropdown-option-font-weight, var(--dx-g-font-bold));
70
+ font-weight: var(--dx-g-font-bold);
73
71
  font-size: var(--dx-c-dropdown-option-font-size, var(--dx-g-text-base));
74
72
  }
75
73
 
@@ -28,7 +28,7 @@
28
28
  max-height: 65vh;
29
29
  padding: var(--popover-padding);
30
30
  overflow-y: auto;
31
- transition: var(--popover-transition);
31
+ transition: opacity 0.2s linear, transform 0.2s linear;
32
32
  transition-delay: 0.02s;
33
33
  transform: translateY(var(--dx-g-spacing-xs));
34
34
  opacity: 0;
@@ -41,7 +41,7 @@
41
41
 
42
42
  .popover-container_open .popover {
43
43
  opacity: 1;
44
- transform: var(--popover-container-open-transform);
44
+ transform: translateY(0);
45
45
  }
46
46
 
47
47
  .popover-overridewidth {
@@ -7944,7 +7944,7 @@ select.coveo-dropdown::-ms-expand {
7944
7944
 
7945
7945
  @font-face {
7946
7946
  font-family: "Lato";
7947
- src: url('https://static.cloud.coveo.com/searchui/v2.10113/0/fonts/lato.woff2'), url('https://staticdev.cloud.coveo.com/searchui/v2.10113/0/fonts/lato.woff2'), url('../fonts/lato.woff2'), url('https://static.cloud.coveo.com/searchui/v2.10113/0/fonts/lato.woff'), url('https://staticdev.cloud.coveo.com/searchui/v2.10113/0/fonts/lato.woff'), url('../fonts/lato.woff');
7947
+ src: url('https://static.cloud.coveo.com/searchui/v2.10115/0/fonts/lato.woff2'), url('https://staticdev.cloud.coveo.com/searchui/v2.10115/0/fonts/lato.woff2'), url('../fonts/lato.woff2'), url('https://static.cloud.coveo.com/searchui/v2.10115/0/fonts/lato.woff'), url('https://staticdev.cloud.coveo.com/searchui/v2.10115/0/fonts/lato.woff'), url('../fonts/lato.woff');
7948
7948
  font-weight: normal;
7949
7949
  font-style: normal;
7950
7950
  }
@@ -15,7 +15,7 @@ dx-empty-state {
15
15
 
16
16
  .sidebar-content {
17
17
  overflow-y: auto;
18
- padding: var(--dx-g-spacing-sm) 0 var(--dx-g-spacing-md);
18
+ padding-bottom: var(--dx-g-spacing-md);
19
19
  }
20
20
 
21
21
  .loading-skeleton {
@@ -53,13 +53,6 @@ dx-empty-state {
53
53
  --dx-c-button-secondary-color-hover: var(--dx-g-gray-80);
54
54
  }
55
55
 
56
- .results-heading {
57
- --dx-g-text-body-color: var(--sds-g-gray-14);
58
-
59
- margin-bottom: var(--dx-g-spacing-sm);
60
- font-weight: var(--dx-g-font-bold);
61
- }
62
-
63
56
  @media (max-width: 768px) {
64
57
  :host {
65
58
  width: 100%;
@@ -68,4 +61,8 @@ dx-empty-state {
68
61
  .loading-skeleton {
69
62
  width: 100%;
70
63
  }
64
+
65
+ .sidebar-content-tree {
66
+ padding: 0 var(--dx-g-spacing-sm);
67
+ }
71
68
  }
@@ -22,10 +22,7 @@
22
22
  </div>
23
23
  </div>
24
24
 
25
- <div
26
- class="sidebar-header padding-horizontal"
27
- show-shadow={showBoxShadow}
28
- >
25
+ <div class="sidebar-header padding-horizontal">
29
26
  <div class="header" if:false={mobile}>
30
27
  <h2 class="dx-text-display-6 header-title">{header}</h2>
31
28
  <slot name="header"></slot>
@@ -45,7 +42,7 @@
45
42
  ></dx-sidebar-search>
46
43
  </div>
47
44
  <h2
48
- class="results-heading dx-text-body-3"
45
+ class="results-heading dx-text-display-8"
49
46
  if:true={showResultsHeading}
50
47
  >
51
48
  Results
@@ -86,7 +83,7 @@
86
83
  size="small"
87
84
  ></dx-empty-state>
88
85
  </div>
89
- <div class={sidebarContentClass} onscroll={handleScroll}>
86
+ <div class="sidebar-content sidebar-content-tree">
90
87
  <dx-tree
91
88
  for:each={trees}
92
89
  for:item="tree"
@@ -98,27 +95,5 @@
98
95
  onselecteditemrendered={onSelectedItemRendered}
99
96
  ></dx-tree>
100
97
  </div>
101
-
102
- <template if:false={mobile}>
103
- <div if:true={hasSidebarFooter} class="footer-nav">
104
- <dx-sidebar-footer-nav
105
- lang-value-path={langValuePath}
106
- language={language}
107
- languages={languages}
108
- bail-href={bailHref}
109
- bail-label={bailLabel}
110
- ></dx-sidebar-footer-nav>
111
- </div>
112
- </template>
113
-
114
- <template if:true={mobile}>
115
- <div if:true={hasMobileSidebarFooter} class="footer-nav">
116
- <dx-sidebar-footer-nav
117
- lang-value-path={langValuePath}
118
- language={language}
119
- languages={languages}
120
- ></dx-sidebar-footer-nav>
121
- </div>
122
- </template>
123
98
  </div>
124
99
  </template>
@@ -15,6 +15,15 @@ export default class Sidebar extends SidebarBase {
15
15
  @api coveoAdvancedQueryConfig!: string;
16
16
  @api header: string = "";
17
17
 
18
+ @api
19
+ get value() {
20
+ return this._value;
21
+ }
22
+
23
+ set value(value) {
24
+ this._value = value;
25
+ }
26
+
18
27
  @api
19
28
  get trees() {
20
29
  return this._trees;
@@ -43,10 +52,16 @@ export default class Sidebar extends SidebarBase {
43
52
  )?.setInputValue(searchTerm);
44
53
  }
45
54
 
55
+ private expanded: boolean = true;
56
+ private _value?: string = undefined;
57
+
46
58
  @track
47
59
  private _trees!: Array<TreeNode>;
60
+
61
+ private mobile: boolean = true;
48
62
  private matchMedia!: MediaQueryList;
49
63
  private valueToLabel: { [key: string]: string } = {};
64
+
50
65
  private isSearchLoading: boolean = false;
51
66
  private searchValue: string | null = null;
52
67
  private searchResults: SidebarSearchResult[] = [];
@@ -156,6 +171,32 @@ export default class Sidebar extends SidebarBase {
156
171
  this.matchMedia.removeEventListener("change", this.onMediaChange);
157
172
  }
158
173
 
174
+ private onMediaChange = (event: MediaQueryListEvent | MediaQueryList) => {
175
+ this.mobile = event.matches;
176
+ this.expanded = !this.mobile;
177
+ };
178
+
179
+ private onSelect(event: CustomEvent) {
180
+ this._value = event.detail.name;
181
+
182
+ if (this.mobile) {
183
+ this.onToggleClick();
184
+ }
185
+ }
186
+
187
+ private onToggleClick() {
188
+ this.expanded = !this.expanded;
189
+ this.dispatchEvent(
190
+ new CustomEvent("togglesidebar", {
191
+ detail: {
192
+ open: this.expanded,
193
+ bubbles: true,
194
+ composed: true
195
+ }
196
+ })
197
+ );
198
+ }
199
+
159
200
  private makeKey(): string {
160
201
  return Math.random().toString(36).substring(7);
161
202
  }
@@ -175,7 +216,7 @@ export default class Sidebar extends SidebarBase {
175
216
  this.isSearchLoading = e.detail;
176
217
  }
177
218
 
178
- private onSidebarSearchContentScroll(scrollEvent) {
219
+ private onSidebarSearchContentScroll() {
179
220
  if (this.isSearchLoading) {
180
221
  return;
181
222
  }
@@ -192,7 +233,6 @@ export default class Sidebar extends SidebarBase {
192
233
  this.requestedFetchMoreResults = true;
193
234
  search.fetchMoreResults();
194
235
  }
195
- this.handleScroll(scrollEvent);
196
236
  }
197
237
 
198
238
  private initializeSearchScrollPosition() {
@@ -2,7 +2,6 @@
2
2
 
3
3
  .sidebar-content {
4
4
  overflow-y: auto;
5
- padding-top: var(--dx-g-spacing-sm);
6
5
  }
7
6
 
8
7
  dx-empty-state {
@@ -23,7 +23,7 @@
23
23
  </div>
24
24
 
25
25
  <template if:true={expanded}>
26
- <div class="padding-horizontal" show-shadow={showBoxShadow}>
26
+ <div class="padding-horizontal">
27
27
  <div class="header" if:false={mobile}>
28
28
  <h2 class="dx-text-display-6 header-title">{header}</h2>
29
29
  <slot name="header"></slot>
@@ -48,9 +48,8 @@
48
48
  </div>
49
49
  </div>
50
50
  <div
51
- class={sidebarContentClass}
51
+ class="sidebar-content sidebar-content-tree"
52
52
  if:true={anyResultMatch}
53
- onscroll={handleScroll}
54
53
  >
55
54
  <dx-tree
56
55
  for:each={filteredTrees}
@@ -71,25 +70,6 @@
71
70
  suggestions={emptyStateSuggestions}
72
71
  if:false={anyResultMatch}
73
72
  ></dx-empty-state>
74
- <div if:true={hasMobileSidebarFooter} class="footer-nav">
75
- <dx-sidebar-footer-nav
76
- lang-value-path={langValuePath}
77
- language={language}
78
- languages={languages}
79
- ></dx-sidebar-footer-nav>
80
- </div>
81
- </template>
82
-
83
- <template if:false={mobile}>
84
- <div if:true={hasSidebarFooter} class="footer-nav">
85
- <dx-sidebar-footer-nav
86
- lang-value-path={langValuePath}
87
- language={language}
88
- languages={languages}
89
- bail-href={bailHref}
90
- bail-label={bailLabel}
91
- ></dx-sidebar-footer-nav>
92
- </div>
93
73
  </template>
94
74
  </div>
95
75
  </template>
@@ -11,6 +11,15 @@ const MOBILE_SIZE_MATCH = "768px";
11
11
  export default class Sidebar extends SidebarBase {
12
12
  @api header: string = "";
13
13
 
14
+ @api
15
+ get value() {
16
+ return this._value;
17
+ }
18
+
19
+ set value(value) {
20
+ this._value = value;
21
+ }
22
+
14
23
  @api
15
24
  get trees() {
16
25
  return this._trees;
@@ -28,10 +37,13 @@ export default class Sidebar extends SidebarBase {
28
37
  this.assignFilteredTrees();
29
38
  }
30
39
 
40
+ private expanded: boolean = true;
31
41
  private _searchTimeout?: number;
42
+ private _value?: string = undefined;
32
43
  private _trees!: Array<TreeNode>;
33
44
 
34
45
  private filteredTrees: Array<{ key: string; tree: TreeNode }> = [];
46
+ private mobile: boolean = true;
35
47
  private searchText: string = "";
36
48
  private matchMedia!: MediaQueryList;
37
49
  private valueToLabel: { [key: string]: string } = {};
@@ -89,6 +101,32 @@ export default class Sidebar extends SidebarBase {
89
101
  this.matchMedia.removeEventListener("change", this.onMediaChange);
90
102
  }
91
103
 
104
+ private onMediaChange = (event: MediaQueryListEvent | MediaQueryList) => {
105
+ this.mobile = event.matches;
106
+ this.expanded = !this.mobile;
107
+ };
108
+
109
+ private onSelect(event: CustomEvent) {
110
+ this._value = event.detail.name;
111
+
112
+ if (this.mobile) {
113
+ this.onToggleClick();
114
+ }
115
+ }
116
+
117
+ private onToggleClick() {
118
+ this.expanded = !this.expanded;
119
+ this.dispatchEvent(
120
+ new CustomEvent("togglesidebar", {
121
+ detail: {
122
+ open: this.expanded,
123
+ bubbles: true,
124
+ composed: true
125
+ }
126
+ })
127
+ );
128
+ }
129
+
92
130
  /*
93
131
  * Debouncing this method: Do not apply searchText filter as long as this
94
132
  * function is being called to avoid running the recursivity logic very often.
@@ -8,51 +8,29 @@ a {
8
8
  }
9
9
 
10
10
  .sidebar-item {
11
- padding: var(--dx-g-spacing-smd) var(--dx-g-spacing-lg)
12
- var(--dx-g-spacing-smd) var(--dx-g-spacing-2xl);
13
- }
14
-
15
- .sidebar-item:focus-visible {
16
- margin: 0 calc(var(--dx-g-spacing-2xs) + 1px);
17
- outline: 2px solid var(--dx-g-blue-vibrant-40);
18
- border-radius: 2px;
11
+ padding: var(--dx-g-spacing-smd) var(--dx-g-spacing-md);
19
12
  }
20
13
 
21
14
  .search-text {
22
- font-size: var(--dx-g-text-sm);
15
+ font-size: var(--dx-g-text-xs);
23
16
  font-family: var(--dx-g-font-sans);
24
- line-height: var(--dx-g-text-lg);
25
- font-weight: var(--dx-g-font-bold);
17
+ line-height: 18px;
26
18
  overflow-wrap: break-word;
27
19
  }
28
20
 
29
21
  .description {
30
22
  -webkit-line-clamp: 3;
31
23
  overflow-wrap: break-word;
32
-
33
- --dx-g-text-body-color: var(--dx-g-blue-vibrant-20);
34
-
35
- font-weight: var(--dx-g-font-normal);
36
24
  }
37
25
 
38
26
  .title {
39
27
  color: var(--dx-g-text-heading-color);
40
28
  }
41
29
 
42
- .title:hover {
43
- color: var(--dx-g-blue-vibrant-50);
44
- }
45
-
46
30
  .bold {
47
31
  font-weight: 700;
48
32
  }
49
33
 
50
34
  a > *:not(:last-child) {
51
- margin-bottom: var(--dx-g-spacing-xs);
52
- }
53
-
54
- @media (max-width: 768px) {
55
- .sidebar-item {
56
- padding: var(--dx-g-spacing-smd) var(--dx-g-spacing-lg);
57
- }
35
+ margin-bottom: 2px;
58
36
  }
@@ -11,13 +11,22 @@ a {
11
11
  );
12
12
 
13
13
  position: relative;
14
- height: calc(var(--dx-g-spacing-3xl) - 4px);
14
+ display: flex;
15
+ align-items: center;
16
+ height: var(--dx-g-spacing-xl);
17
+ font-family: var(--dx-g-font-display);
18
+ white-space: nowrap;
19
+ color: var(--dx-g-blue-vibrant-20);
20
+ transition: var(--dx-g-transition-hue-1x);
21
+ cursor: pointer;
22
+ outline-offset: -1px;
15
23
  }
16
24
 
17
25
  .nav-list-item_default {
18
- padding: calc(var(--dx-g-spacing-sm) + 2px) var(--dx-g-spacing-md);
19
- justify-content: center;
20
- display: flex;
26
+ border: 0;
27
+ border-radius: var(--dx-g-spacing-md);
28
+ font-size: var(--dx-g-text-sm);
29
+ padding: 0 var(--horizontal-spacing);
21
30
  }
22
31
 
23
32
  .nav-list-item_small {
@@ -37,6 +46,8 @@ button.nav-list-item_small > dx-icon {
37
46
  margin-left: var(--dx-g-spacing-xs);
38
47
  }
39
48
 
49
+ .nav-list-item_default:hover,
50
+ .nav-list-item_default:active,
40
51
  :host([aria-expanded="true"]) button.nav-list-item_default {
41
52
  background: var(
42
53
  --dx-g-brand-current-button-color-background-inactive,
@@ -65,10 +76,11 @@ button.nav-list-item:active > dx-icon,
65
76
  }
66
77
 
67
78
  .nav-list-item_default.state-active {
68
- color: var(--dx-g-blue-vibrant-50);
69
- font-family: var(--dx-g-font-sans);
70
- font-size: var(--dx-g-text-base);
71
- border-bottom: var(--dx-g-spacing-xs) solid var(--dx-g-blue-vibrant-50);
79
+ background: var(
80
+ --dx-g-brand-current-button-color-background-active,
81
+ var(--dx-g-brand-default-button-color-background-active)
82
+ );
83
+ color: var(--dx-g-brand-current-color, var(--dx-g-brand-default-color));
72
84
  }
73
85
 
74
86
  @media (max-width: 1160px) {
@@ -88,10 +100,3 @@ button.nav-list-item:active > dx-icon,
88
100
  );
89
101
  }
90
102
  }
91
-
92
- @media (max-width: 768px) {
93
- .nav-list-item {
94
- height: var(--dx-g-spacing-3xl);
95
- display: flex;
96
- }
97
- }
@@ -14,8 +14,8 @@ button:focus {
14
14
  }
15
15
 
16
16
  .tree-children-loading {
17
- margin: var(--dx-g-spacing-sm) var(--dx-g-spacing-lg) var(--dx-g-spacing-md)
18
- var(--dx-g-spacing-2xl);
17
+ margin: var(--dx-g-spacing-sm) var(--dx-g-spacing-md) var(--dx-g-spacing-md)
18
+ var(--dx-g-spacing-md);
19
19
  }
20
20
 
21
21
  @media (max-width: 768px) {