@syncfusion/ej2-navigations 20.3.60 → 20.4.40

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 (226) hide show
  1. package/.eslintrc.json +16 -1
  2. package/CHANGELOG.md +26 -0
  3. package/dist/ej2-navigations.min.js +2 -2
  4. package/dist/ej2-navigations.umd.min.js +2 -2
  5. package/dist/ej2-navigations.umd.min.js.map +1 -1
  6. package/dist/es6/ej2-navigations.es2015.js +263 -212
  7. package/dist/es6/ej2-navigations.es2015.js.map +1 -1
  8. package/dist/es6/ej2-navigations.es5.js +260 -209
  9. package/dist/es6/ej2-navigations.es5.js.map +1 -1
  10. package/dist/global/ej2-navigations.min.js +2 -2
  11. package/dist/global/ej2-navigations.min.js.map +1 -1
  12. package/dist/global/index.d.ts +1 -1
  13. package/package.json +12 -12
  14. package/src/accordion/accordion.js +20 -19
  15. package/src/appbar/appbar-model.d.ts +15 -15
  16. package/src/appbar/appbar.d.ts +15 -15
  17. package/src/appbar/appbar.js +3 -3
  18. package/src/breadcrumb/breadcrumb-model.d.ts +1 -1
  19. package/src/breadcrumb/breadcrumb.js +10 -5
  20. package/src/carousel/carousel.js +10 -10
  21. package/src/common/menu-base.js +19 -12
  22. package/src/menu/menu.js +2 -2
  23. package/src/sidebar/sidebar.d.ts +1 -0
  24. package/src/sidebar/sidebar.js +6 -2
  25. package/src/tab/tab-model.d.ts +9 -0
  26. package/src/tab/tab.d.ts +9 -0
  27. package/src/tab/tab.js +28 -18
  28. package/src/toolbar/toolbar-model.d.ts +9 -0
  29. package/src/toolbar/toolbar.d.ts +11 -0
  30. package/src/toolbar/toolbar.js +132 -123
  31. package/src/treeview/treeview-model.d.ts +133 -45
  32. package/src/treeview/treeview.d.ts +135 -48
  33. package/src/treeview/treeview.js +30 -14
  34. package/styles/accordion/_bootstrap-dark-definition.scss +100 -0
  35. package/styles/accordion/_bootstrap-definition.scss +100 -0
  36. package/styles/accordion/_bootstrap4-definition.scss +95 -1
  37. package/styles/accordion/_bootstrap5-definition.scss +99 -3
  38. package/styles/accordion/_fabric-dark-definition.scss +100 -0
  39. package/styles/accordion/_fabric-definition.scss +100 -0
  40. package/styles/accordion/_fluent-definition.scss +98 -2
  41. package/styles/accordion/_fusionnew-definition.scss +99 -3
  42. package/styles/accordion/_highcontrast-definition.scss +98 -3
  43. package/styles/accordion/_highcontrast-light-definition.scss +98 -3
  44. package/styles/accordion/_layout.scss +25 -91
  45. package/styles/accordion/_material-dark-definition.scss +100 -0
  46. package/styles/accordion/_material-definition.scss +100 -0
  47. package/styles/accordion/_material3-definition.scss +99 -3
  48. package/styles/accordion/_tailwind-definition.scss +99 -2
  49. package/styles/accordion/_theme.scss +184 -345
  50. package/styles/accordion/bootstrap-dark.css +202 -16
  51. package/styles/accordion/bootstrap.css +202 -16
  52. package/styles/accordion/bootstrap4.css +171 -17
  53. package/styles/accordion/bootstrap5-dark.css +202 -13
  54. package/styles/accordion/bootstrap5.css +202 -13
  55. package/styles/accordion/fabric-dark.css +209 -11
  56. package/styles/accordion/fabric.css +209 -11
  57. package/styles/accordion/fluent-dark.css +217 -5
  58. package/styles/accordion/fluent.css +217 -5
  59. package/styles/accordion/highcontrast-light.css +186 -52
  60. package/styles/accordion/highcontrast.css +186 -52
  61. package/styles/accordion/material-dark.css +210 -16
  62. package/styles/accordion/material.css +209 -15
  63. package/styles/accordion/tailwind-dark.css +199 -8
  64. package/styles/accordion/tailwind.css +199 -8
  65. package/styles/bootstrap-dark.css +999 -145
  66. package/styles/bootstrap.css +986 -132
  67. package/styles/bootstrap4.css +888 -167
  68. package/styles/bootstrap5-dark.css +949 -179
  69. package/styles/bootstrap5.css +949 -179
  70. package/styles/context-menu/_layout.scss +0 -3
  71. package/styles/context-menu/bootstrap5-dark.css +0 -1
  72. package/styles/context-menu/bootstrap5.css +0 -1
  73. package/styles/context-menu/fluent-dark.css +0 -1
  74. package/styles/context-menu/fluent.css +0 -1
  75. package/styles/context-menu/tailwind-dark.css +0 -1
  76. package/styles/context-menu/tailwind.css +0 -1
  77. package/styles/fabric-dark.css +1068 -232
  78. package/styles/fabric.css +1067 -231
  79. package/styles/fluent-dark.css +1014 -123
  80. package/styles/fluent.css +1012 -121
  81. package/styles/h-scroll/_bootstrap-dark-definition.scss +8 -0
  82. package/styles/h-scroll/_bootstrap-definition.scss +8 -0
  83. package/styles/h-scroll/_bootstrap4-definition.scss +8 -0
  84. package/styles/h-scroll/_bootstrap5-definition.scss +8 -0
  85. package/styles/h-scroll/_fabric-dark-definition.scss +8 -0
  86. package/styles/h-scroll/_fabric-definition.scss +8 -0
  87. package/styles/h-scroll/_fluent-definition.scss +8 -0
  88. package/styles/h-scroll/_fusionnew-definition.scss +8 -0
  89. package/styles/h-scroll/_highcontrast-definition.scss +6 -1
  90. package/styles/h-scroll/_highcontrast-light-definition.scss +6 -1
  91. package/styles/h-scroll/_layout.scss +1 -4
  92. package/styles/h-scroll/_material-dark-definition.scss +8 -0
  93. package/styles/h-scroll/_material-definition.scss +8 -0
  94. package/styles/h-scroll/_material3-definition.scss +8 -0
  95. package/styles/h-scroll/_tailwind-definition.scss +8 -0
  96. package/styles/h-scroll/_theme.scss +12 -40
  97. package/styles/h-scroll/bootstrap-dark.css +13 -0
  98. package/styles/h-scroll/bootstrap.css +13 -0
  99. package/styles/h-scroll/bootstrap4.css +7 -0
  100. package/styles/h-scroll/bootstrap5-dark.css +12 -0
  101. package/styles/h-scroll/bootstrap5.css +12 -0
  102. package/styles/h-scroll/fabric-dark.css +15 -2
  103. package/styles/h-scroll/fabric.css +15 -2
  104. package/styles/h-scroll/fluent-dark.css +13 -0
  105. package/styles/h-scroll/fluent.css +13 -0
  106. package/styles/h-scroll/highcontrast-light.css +8 -7
  107. package/styles/h-scroll/highcontrast.css +10 -9
  108. package/styles/h-scroll/icons/_fabric-dark.scss +2 -2
  109. package/styles/h-scroll/icons/_fabric.scss +2 -2
  110. package/styles/h-scroll/icons/_highcontrast.scss +2 -2
  111. package/styles/h-scroll/material-dark.css +13 -2
  112. package/styles/h-scroll/material.css +13 -2
  113. package/styles/h-scroll/tailwind-dark.css +12 -0
  114. package/styles/h-scroll/tailwind.css +12 -0
  115. package/styles/highcontrast-light.css +918 -369
  116. package/styles/highcontrast.css +925 -370
  117. package/styles/material-dark.css +1184 -114
  118. package/styles/material.css +1162 -92
  119. package/styles/menu/_theme.scss +1 -1
  120. package/styles/menu/fluent-dark.css +1 -1
  121. package/styles/menu/fluent.css +1 -1
  122. package/styles/tab/_bootstrap-dark-definition.scss +271 -15
  123. package/styles/tab/_bootstrap-definition.scss +266 -9
  124. package/styles/tab/_bootstrap4-definition.scss +266 -9
  125. package/styles/tab/_bootstrap5-definition.scss +270 -13
  126. package/styles/tab/_fabric-dark-definition.scss +270 -13
  127. package/styles/tab/_fabric-definition.scss +270 -13
  128. package/styles/tab/_fluent-definition.scss +269 -12
  129. package/styles/tab/_fusionnew-definition.scss +268 -11
  130. package/styles/tab/_highcontrast-definition.scss +271 -14
  131. package/styles/tab/_highcontrast-light-definition.scss +271 -14
  132. package/styles/tab/_layout.scss +295 -988
  133. package/styles/tab/_material-dark-definition.scss +266 -9
  134. package/styles/tab/_material-definition.scss +266 -9
  135. package/styles/tab/_material3-definition.scss +268 -11
  136. package/styles/tab/_tailwind-definition.scss +267 -10
  137. package/styles/tab/_theme.scss +305 -843
  138. package/styles/tab/bootstrap-dark.css +587 -109
  139. package/styles/tab/bootstrap.css +574 -96
  140. package/styles/tab/bootstrap4.css +546 -114
  141. package/styles/tab/bootstrap5-dark.css +523 -134
  142. package/styles/tab/bootstrap5.css +523 -134
  143. package/styles/tab/fabric-dark.css +614 -199
  144. package/styles/tab/fabric.css +612 -197
  145. package/styles/tab/fluent-dark.css +546 -102
  146. package/styles/tab/fluent.css +546 -102
  147. package/styles/tab/highcontrast-light.css +520 -250
  148. package/styles/tab/highcontrast.css +520 -244
  149. package/styles/tab/icons/_bootstrap-dark.scss +0 -33
  150. package/styles/tab/icons/_bootstrap.scss +0 -33
  151. package/styles/tab/icons/_bootstrap4.scss +0 -26
  152. package/styles/tab/icons/_bootstrap5.scss +0 -37
  153. package/styles/tab/icons/_fabric-dark.scss +0 -33
  154. package/styles/tab/icons/_fabric.scss +0 -33
  155. package/styles/tab/icons/_fluent.scss +0 -33
  156. package/styles/tab/icons/_fusionnew.scss +0 -37
  157. package/styles/tab/icons/_highcontrast-light.scss +0 -37
  158. package/styles/tab/icons/_highcontrast.scss +0 -26
  159. package/styles/tab/icons/_material-dark.scss +0 -37
  160. package/styles/tab/icons/_material.scss +0 -37
  161. package/styles/tab/icons/_material3.scss +0 -37
  162. package/styles/tab/icons/_tailwind.scss +0 -37
  163. package/styles/tab/material-dark.css +705 -54
  164. package/styles/tab/material.css +705 -54
  165. package/styles/tab/tailwind-dark.css +706 -71
  166. package/styles/tab/tailwind.css +706 -71
  167. package/styles/tailwind-dark.css +1145 -99
  168. package/styles/tailwind.css +1144 -98
  169. package/styles/toolbar/_bootstrap-dark-definition.scss +93 -0
  170. package/styles/toolbar/_bootstrap-definition.scss +93 -0
  171. package/styles/toolbar/_bootstrap4-definition.scss +94 -1
  172. package/styles/toolbar/_bootstrap5-definition.scss +94 -8
  173. package/styles/toolbar/_fabric-dark-definition.scss +92 -3
  174. package/styles/toolbar/_fabric-definition.scss +92 -3
  175. package/styles/toolbar/_fluent-definition.scss +96 -8
  176. package/styles/toolbar/_fusionnew-definition.scss +94 -8
  177. package/styles/toolbar/_highcontrast-definition.scss +93 -4
  178. package/styles/toolbar/_highcontrast-light-definition.scss +93 -4
  179. package/styles/toolbar/_layout.scss +48 -177
  180. package/styles/toolbar/_material-dark-definition.scss +93 -0
  181. package/styles/toolbar/_material-definition.scss +93 -0
  182. package/styles/toolbar/_material3-definition.scss +94 -8
  183. package/styles/toolbar/_tailwind-definition.scss +94 -6
  184. package/styles/toolbar/_theme.scss +169 -278
  185. package/styles/toolbar/bootstrap-dark.css +196 -19
  186. package/styles/toolbar/bootstrap.css +196 -19
  187. package/styles/toolbar/bootstrap4.css +164 -36
  188. package/styles/toolbar/bootstrap5-dark.css +210 -29
  189. package/styles/toolbar/bootstrap5.css +210 -29
  190. package/styles/toolbar/fabric-dark.css +219 -9
  191. package/styles/toolbar/fabric.css +220 -10
  192. package/styles/toolbar/fluent-dark.css +233 -10
  193. package/styles/toolbar/fluent.css +233 -10
  194. package/styles/toolbar/highcontrast-light.css +199 -43
  195. package/styles/toolbar/highcontrast.css +200 -44
  196. package/styles/toolbar/material-dark.css +233 -19
  197. package/styles/toolbar/material.css +233 -19
  198. package/styles/toolbar/tailwind-dark.css +224 -15
  199. package/styles/toolbar/tailwind.css +223 -14
  200. package/styles/treeview/_material-definition.scss +1 -1
  201. package/styles/treeview/_theme.scss +11 -1
  202. package/styles/treeview/fluent-dark.css +2 -2
  203. package/styles/treeview/material.css +2 -2
  204. package/styles/treeview/tailwind.css +2 -2
  205. package/styles/v-scroll/_highcontrast-definition.scss +0 -1
  206. package/styles/v-scroll/_highcontrast-light-definition.scss +0 -1
  207. package/styles/v-scroll/_theme.scss +0 -26
  208. package/styles/v-scroll/bootstrap5-dark.css +2 -2
  209. package/styles/v-scroll/bootstrap5.css +2 -2
  210. package/styles/v-scroll/fabric-dark.css +2 -2
  211. package/styles/v-scroll/fabric.css +2 -2
  212. package/styles/v-scroll/fluent-dark.css +2 -2
  213. package/styles/v-scroll/fluent.css +2 -2
  214. package/styles/v-scroll/highcontrast-light.css +2 -14
  215. package/styles/v-scroll/highcontrast.css +2 -14
  216. package/styles/v-scroll/icons/_bootstrap5.scss +2 -2
  217. package/styles/v-scroll/icons/_fabric-dark.scss +2 -2
  218. package/styles/v-scroll/icons/_fabric.scss +2 -2
  219. package/styles/v-scroll/icons/_fluent.scss +2 -2
  220. package/styles/v-scroll/icons/_fusionnew.scss +2 -2
  221. package/styles/v-scroll/icons/_highcontrast-light.scss +2 -2
  222. package/styles/v-scroll/icons/_highcontrast.scss +2 -2
  223. package/styles/v-scroll/icons/_material3.scss +2 -2
  224. package/styles/v-scroll/icons/_tailwind.scss +2 -2
  225. package/styles/v-scroll/tailwind-dark.css +2 -2
  226. package/styles/v-scroll/tailwind.css +2 -2
@@ -49,112 +49,73 @@
49
49
  background: $tbar-default-bg;
50
50
  box-shadow: $tbar-btn-box-shadow;
51
51
  color: $tbar-default-font;
52
+ border: $tbar-ext-btn-border;
52
53
 
53
54
  .e-toolbar-item .e-tbar-btn-text {
54
55
  color: $tbar-default-font;
55
56
  }
56
- @if $tbar-skin == 'bootstrap' {
57
- margin: 1px 0;
58
- }
59
-
60
- @if $tbar-skin == 'highcontrast' {
61
- border: 2px $tbar-border-type $ext-tbar-btn-border-color;
62
- }
63
57
 
64
58
  &:focus {
65
59
  background: $tbar-focus-bg;
66
- border-color: $tbar-focus-border-color;
67
60
  border-radius: $tbar-btn-border-radius;
68
61
  color: $tbar-hover-font-color;
62
+ border-color: $tbar-btn-focus-border-color;
63
+ border-style: $tbar-border-nav-type;
64
+ border-width: $tbar-btn-hover-border-size;
65
+ box-shadow: $tbar-ext-btn-focus-box-shadow;
69
66
 
70
- @if $tbar-skin == 'bootstrap' {
71
- border: 1px solid $tbar-focus-border-color;
72
- margin: 0;
67
+ .e-icons {
68
+ color: $tbar-ext-btn-icon-hover-font;
73
69
  }
74
70
 
75
- @if $tbar-skin == 'bootstrap4' {
76
- border: 1px solid $tbar-focus-border-color;
77
- box-shadow: $tbar-focus-btn-box-shadow;
78
- }
79
-
80
- @if $tbar-skin == 'bootstrap5' {
81
- .e-toolbar-item .e-tbar-btn-text,
82
- .e-icons {
83
- color: $tbar-active-icon-color;
84
- }
85
- }
86
-
87
- @if $tbar-skin == 'highcontrast' {
88
- border: $tbar-dash-border;
89
-
90
- &:active {
91
- background: $ext-tbar-btn-focus-active-bg-color;
92
- }
71
+ .e-tbar-btn-text {
72
+ color: $tbar-ext-btn-text-hover-font;
93
73
  }
94
74
  }
95
75
 
96
76
  &:hover {
97
77
  background: $tbar-hover-bg;
98
- border-color: $tbar-hover-border-color;
99
78
  border-radius: $tbar-btn-border-radius;
100
79
  color: $tbar-hover-font-color;
80
+ border-color: $tbar-ext-btn-hover-border-color;
81
+ border-style: $tbar-border-nav-type;
82
+ border-width: $tbar-ext-btn-hover-border-size;
101
83
 
102
- @if $tbar-skin == 'bootstrap' {
103
- border: 1px solid $tbar-hover-border-color;
104
- }
105
-
106
- @if $tbar-skin == 'highcontrast' {
107
- border: 2px $tbar-border-type $ext-tbar-btn-hover-border-color;
84
+ &:active {
108
85
 
109
86
  .e-icons {
110
- color: $tbar-hover-font;
87
+ color: $tbar-ext-btn-icon-hover-active-font;
111
88
  }
112
89
 
113
- &:focus {
114
-
115
- .e-icons,
116
- .e-tbar-btn-text {
117
- color: $tbar-hover-font;
118
- }
90
+ .e-tbar-btn-text {
91
+ color: $tbar-ext-btn-text-hover-active-font;
119
92
  }
93
+ }
120
94
 
121
- &:active {
122
-
123
- .e-icons,
124
- .e-tbar-btn-text {
125
- color: $tbar-select-font;
126
- }
127
- }
95
+ .e-icons {
96
+ color: $tbar-ext-btn-icon-hover-font;
128
97
  }
129
98
 
130
- @if $tbar-skin == 'bootstrap5' {
131
- .e-toolbar-item .e-tbar-btn-text,
132
- .e-icons {
133
- color: $tbar-active-icon-color;
134
- }
99
+ .e-tbar-btn-text {
100
+ color: $tbar-ext-btn-text-hover-font;
135
101
  }
136
102
  }
137
103
 
138
104
  &:active {
139
105
  background: $tbar-btn-press-bg;
140
- border-color: $tbar-press-border-color;
141
106
  border-radius: $tbar-btn-border-radius;
142
107
  box-shadow: $tbar-btn-pressed-box-shadow;
143
108
  color: $tbar-btn-active-font-color;
109
+ border-color: $tbar-press-border-color;
110
+ border-style: $tbar-border-nav-type;
111
+ border-width: $tbar-ext-btn-active-border-size;
144
112
 
145
- @if $tbar-skin == 'bootstrap' {
146
- border-left: 1px solid $tbar-press-border-color;
113
+ .e-icons {
114
+ color: $tbar-ext-btn-icon-active-font;
147
115
  }
148
- @if $tbar-skin == 'highcontrast' {
149
- .e-icons,
150
- .e-tbar-btn-text {
151
- color: $tbar-pressed-font;
152
- }
153
- }
154
- @if $tbar-skin == 'bootstrap5' {
155
- .e-icons {
156
- color: $tbar-active-icon-color;
157
- }
116
+
117
+ .e-tbar-btn-text {
118
+ color: $tbar-ext-btn-text-active-font;
158
119
  }
159
120
  }
160
121
  }
@@ -163,9 +124,6 @@
163
124
 
164
125
  .e-tbar-btn.e-btn .e-icons {
165
126
  color: $tbar-default-icon-color;
166
- @if $tbar-skin == 'bootstrap5' {
167
- padding-bottom: 4px;
168
- }
169
127
  }
170
128
 
171
129
  .e-toolbar-pop {
@@ -175,45 +133,65 @@
175
133
 
176
134
  .e-toolbar-item {
177
135
 
178
- @if $tbar-skin == 'bootstrap4' {
179
- .e-tbar-btn:hover,
180
- .e-tbar-btn:active,
181
- .e-tbar-btn:focus {
182
- background: $primary;
183
- box-shadow: none;
184
- color: $primary-font;
136
+ .e-tbar-btn {
137
+ background: $tbar-popup-btn-bg;
138
+ }
185
139
 
186
- .e-icons,
187
- .e-tbar-btn-text {
188
- color: inherit;
189
- }
140
+ .e-tbar-btn:hover {
141
+ background: $tbar-popup-btn-hover-bg;
142
+ box-shadow: $tbar-popup-btn-hover-box-shadow;
143
+ color: $tbar-popup-btn-hover-color;
144
+ border-color: $tbar-hover-border-color;
145
+ border-style: $tbar-border-nav-type;
146
+ border-width: $tbar-popup-btn-hover-border-size;
147
+
148
+ .e-icons {
149
+ color: $tbar-popup-btn-hover-icons-color;
190
150
  }
191
151
 
192
- .e-tbar-btn {
193
- background: $tbar-popup-btn-bg-color;
152
+ .e-tbar-btn-text {
153
+ color: $tbar-popup-btn-hover-text-color;
194
154
  }
195
155
  }
196
156
 
197
- @if $tbar-skin == 'tailwind' or $tbar-skin == 'bootstrap5' {
198
- .e-tbar-btn {
199
- background: $tbar-popup-btn-bg-color;
157
+ .e-tbar-btn:active {
158
+ background: $tbar-popup-btn-active-bg;
159
+ box-shadow: $tbar-popup-btn-active-box-shadow;
160
+ color: $tbar-popup-btn-active-color;
161
+ border-color: $tbar-press-border-color;
162
+ border-style: $tbar-border-nav-type;
163
+ border-width: $tbar-popup-btn-hover-border-size;
200
164
 
201
- &:focus {
202
- background: $tbar-focus-bg;
203
- }
165
+ .e-icons {
166
+ color: $tbar-popup-btn-active-icons-color;
167
+ }
204
168
 
205
- &:hover {
206
- background: $tbar-hover-bg;
207
- }
169
+ .e-tbar-btn-text {
170
+ color: $tbar-popup-btn-active-text-color;
208
171
  }
209
172
  }
210
173
 
211
- @if $tbar-skin == 'highcontrast' or $tbar-skin == 'fabric' or $tbar-skin == 'FluentUI' {
212
- .e-btn:focus {
213
- outline: none;
174
+ .e-tbar-btn:focus {
175
+ background: $tbar-popup-btn-focus-bg;
176
+ box-shadow: $tbar-popup-btn-focus-box-shadow;
177
+ color: $tbar-popup-btn-focus-color;
178
+ border-color: $tbar-btn-focus-border-color;
179
+ border-style: $tbar-border-nav-type;
180
+ border-width: $tbar-popup-btn-hover-border-size;
181
+
182
+ .e-icons {
183
+ color: $tbar-popup-btn-focus-icons-color;
184
+ }
185
+
186
+ .e-tbar-btn-text {
187
+ color: $tbar-popup-btn-focus-text-color;
214
188
  }
215
189
  }
216
190
 
191
+ .e-btn:focus {
192
+ outline: $tbar-popup-btn-focus-outline;
193
+ }
194
+
217
195
  &:not(.e-separator) {
218
196
  background: $tbar-item-pop-bg-color;
219
197
  }
@@ -229,25 +207,22 @@
229
207
  .e-hor-nav.e-nav-active,
230
208
  .e-hor-nav.e-nav-active:not(.e-expended-nav) {
231
209
  background: $tbar-pressed-bg;
232
- border: $tbar-nav-press-border;
233
210
  box-shadow: $tbar-nav-pressed-box-shadow;
211
+ border-color: $tbar-popup-nav-pressed-border-color;
212
+ border-style: $tbar-border-nav-type;
213
+ border-width: $tbar-popup-nav-pressed-border-size;
234
214
 
235
- @if $tbar-skin != 'bootstrap4' {
236
- border-left: $border-size $tbar-border-nav-active-type $tbar-pressed-bg;
237
- }
238
-
239
- @if $tbar-skin == 'highcontrast' {
240
- &:focus {
241
- border: $tbar-dash-border;
242
- }
215
+ &:focus {
216
+ border-color: $tbar-popup-nav-pressed-focus-border-color;
217
+ border-style: $tbar-border-nav-type;
218
+ border-width: $tbar-popup-nav-pressed-focus-border-size;
243
219
  }
244
220
 
245
221
  .e-icons {
246
222
  color: $tbar-active-font-color;
247
- @if $tbar-skin == 'bootstrap4' {
248
- &:active {
249
- color: inherit;
250
- }
223
+
224
+ &:active {
225
+ color: $tbar-popup-nav-pressed-icons-active-color;
251
226
  }
252
227
  }
253
228
  }
@@ -257,87 +232,33 @@
257
232
  background: $tbar-items-default-bg;
258
233
  box-shadow: $tbar-btn-box-shadow;
259
234
  color: $tbar-default-font;
260
-
261
- @if $tbar-skin == 'bootstrap' {
262
- margin: 1px 0;
263
- }
264
-
265
- @if $tbar-skin == 'highcontrast' {
266
- border: 2px $tbar-border-type $tbar-btn-border-color;
267
- }
235
+ border: $tbar-btn-border;
268
236
 
269
237
  &:focus {
270
238
  background: $tbar-focus-bg;
271
- @if $tbar-skin == 'bootstrap4' {
272
- box-shadow: $tbar-focus-btn-box-shadow;
273
- }
274
- @if $tbar-skin == 'bootstrap' or $tbar-skin == 'bootstrap4' {
275
- border: 1px solid $tbar-focus-border-color;
276
- margin: 0;
277
- }
278
- border-color: $tbar-focus-border-color;
279
239
  border-radius: $tbar-btn-border-radius;
280
240
  color: $tbar-hover-font;
281
- @if $tbar-skin == 'highcontrast' {
282
- border: $tbar-dash-border;
241
+ border-color: $tbar-btn-focus-border-color;
242
+ border-style: $tbar-border-nav-type;
243
+ border-width: $tbar-btn-hover-border-size;
244
+ box-shadow: $tbar-ext-btn-focus-box-shadow;
283
245
 
284
- &:active {
285
- background: $tbar-btn-focus-active-bg-color;
286
- }
246
+ .e-icons {
247
+ color: $tbar-btn-icons-focus-color;
287
248
  }
288
- @if $tbar-skin == 'bootstrap5' {
289
- .e-icons,
290
- .e-tbar-btn-text {
291
- color: $tbar-active-icon-color;
292
- padding-bottom: 4px;
293
- }
249
+
250
+ .e-tbar-btn-text {
251
+ color: $tbar-btn-text-focus-color;
294
252
  }
295
253
  }
296
254
 
297
255
  &:hover {
298
256
  background: $tbar-hover-bg;
299
- @if $tbar-skin == 'bootstrap' or $tbar-skin == 'bootstrap4' {
300
- border: 1px solid $tbar-hover-border-color;
301
- }
302
257
  border-color: $tbar-hover-border-color;
258
+ border-style: $tbar-border-nav-type;
259
+ border-width: $tbar-btn-hover-border-size;
303
260
  border-radius: $tbar-btn-border-radius;
304
261
  color: $tbar-hover-font;
305
-
306
- @if $tbar-skin == 'bootstrap4' {
307
- .e-icons,
308
- .e-tbar-btn-text {
309
- color: inherit;
310
- }
311
- }
312
-
313
- @if $tbar-skin == 'highcontrast' {
314
- border: 2px $tbar-border-type $tbar-btn-hover-border-color;
315
-
316
- .e-icons {
317
- color: $tbar-hover-font;
318
- }
319
-
320
- &:focus {
321
- .e-icons,
322
- .e-tbar-btn-text {
323
- color: $tbar-hover-font;
324
- }
325
- }
326
-
327
- &:active {
328
- .e-icons,
329
- .e-tbar-btn-text {
330
- color: $tbar-select-font;
331
- }
332
- }
333
- }
334
- @if $tbar-skin == 'bootstrap5' {
335
- .e-icons,
336
- .e-tbar-btn-text {
337
- color: $tbar-active-icon-color;
338
- padding-bottom: 4px;
339
- }
340
- }
341
262
  }
342
263
  }
343
264
 
@@ -348,14 +269,7 @@
348
269
 
349
270
  &.e-overlay {
350
271
  background: $tbar-default-bg;
351
-
352
- @if $tbar-skin == 'highcontrast' {
353
- opacity: 1;
354
- }
355
-
356
- @if $tbar-skin == 'bootstrap4' {
357
- opacity: .65;
358
- }
272
+ opacity: $tbar-btn-overlay-opacity;
359
273
 
360
274
  .e-tbar-btn-text {
361
275
  color: $tbar-default-font-overlay;
@@ -366,24 +280,51 @@
366
280
  }
367
281
  }
368
282
 
369
- @if $tbar-skin != 'bootstrap5' {
370
- @if $tbar-skin != 'highcontrast' and $tbar-skin != 'bootstrap4' {
283
+ .e-tbar-btn-text {
284
+ color: $tbar-btn-text-color;
285
+ }
286
+
287
+ .e-tbar-btn {
288
+
289
+ &.e-flat.e-active {
371
290
  .e-tbar-btn-text {
372
- color: $tbar-default-font;
291
+ color: $tbar-btn-pressed-text-color;
373
292
  }
374
- }
375
- }
376
293
 
377
- @if $tbar-skin == 'bootstrap4' {
378
- .e-tbar-btn {
379
- &:hover,
380
294
  &:focus {
381
- .e-icons,
295
+ box-shadow: $tbar-btn-pressed-focus-box-shadow;
296
+ }
297
+ }
298
+
299
+ &:hover {
300
+ .e-icons {
301
+ color: $tbar-btn-icons-focus-color;
302
+ }
303
+
304
+ .e-tbar-btn-text {
305
+ color: $tbar-btn-text-focus-color;
306
+ }
307
+
308
+ &:active {
309
+ .e-icons {
310
+ color: $tbar-btn-hover-active-icons-color;
311
+ }
312
+
382
313
  .e-tbar-btn-text {
383
- color: inherit;
314
+ color: $tbar-btn-hover-active-text-color;
384
315
  }
385
316
  }
386
317
  }
318
+
319
+ &:focus {
320
+ .e-icons {
321
+ color: $tbar-btn-icons-focus-color;
322
+ }
323
+
324
+ .e-tbar-btn-text {
325
+ color: $tbar-btn-text-focus-color;
326
+ }
327
+ }
387
328
  }
388
329
 
389
330
  &.e-separator {
@@ -417,13 +358,11 @@
417
358
  @include tbar-btn-animation;
418
359
  }
419
360
 
420
- @if $tbar-skin == 'bootstrap' or $tbar-skin == 'bootstrap4' {
421
- &.e-nav-active {
422
- &:active,
423
- &:focus,
424
- &:hover {
425
- border-bottom-right-radius: 0;
426
- }
361
+ &.e-nav-active {
362
+ &:active,
363
+ &:focus,
364
+ &:hover {
365
+ border-bottom-right-radius: $tbar-popup-nav-active-border-bottom-right-radius;
427
366
  }
428
367
  }
429
368
 
@@ -431,13 +370,10 @@
431
370
  border: $tbar-nav-press-border;
432
371
  box-shadow: $tbar-nav-pressed-box-shadow;
433
372
  color: $tbar-select-font;
373
+ background: $tbar-popup-nav-active-bg;
434
374
 
435
- @if $tbar-skin == 'bootstrap4' {
436
- background: $tbar-hover-bg;
437
-
438
- .e-icons {
439
- color: inherit;
440
- }
375
+ .e-icons {
376
+ color: $tbar-popup-nav-active-icons-color;
441
377
  }
442
378
 
443
379
  &::after {
@@ -446,68 +382,37 @@
446
382
  }
447
383
 
448
384
  &:hover {
449
- background: $tbar-hover-bg;
385
+ background: $tbar-popup-nav-hover-bg;
450
386
  border-left: $tbar-nav-hover-border;
387
+ color: $tbar-popup-nav-hover-color;
451
388
 
452
- @if $tbar-skin == 'bootstrap4' {
453
- background: $tbar-popup-hover-bg;
454
-
455
- .e-icons {
456
- color: inherit;
457
- }
389
+ .e-icons {
390
+ color: $tbar-popup-nav-hover-icons-color;
458
391
  }
459
392
 
460
- @if $tbar-skin == 'bootstrap5' {
461
- color: $tbar-active-icon-color;
462
-
463
- .e-icons {
464
- color: inherit;
465
- }
393
+ &:not(.e-nav-active) {
394
+ border-color: $tbar-popup-nav-hover-border-color;
395
+ border-style: $tbar-border-nav-type;
396
+ border-width: $tbar-popup-nav-hover-border-size;
466
397
  }
467
- @else {
468
- color: $tbar-hover-font;
469
- }
470
-
471
- @if $tbar-skin == 'highcontrast' {
472
- &:not(.e-nav-active) {
473
- border: 2px $tbar-border-type $tbar-nav-hover-color;
474
- }
475
398
 
476
- &:active {
477
- background: $tbar-nav-hover-active-bg-color;
478
- border: 0;
479
- }
399
+ &:active {
400
+ background: $tbar-popup-nav-hover-active-bg;
401
+ border-color: $tbar-popup-nav-hover-active-border-color;
402
+ border-style: $tbar-border-nav-type;
403
+ border-width: $tbar-popup-nav-hover-active-border-size;
480
404
  }
481
405
  }
482
406
 
483
407
  &:focus {
484
- background: $tbar-hover-bg;
485
- border-left: $tbar-nav-focus-border;
408
+ background: $tbar-popup-nav-focus-bg;
409
+ color: $tbar-popup-nav-focus-color;
410
+ border-color: $tbar-popup-nav-focus-border-color;
411
+ border-style: $tbar-border-nav-type;
412
+ border-width: $tbar-popup-nav-focus-border-size;
486
413
 
487
- @if $tbar-skin != 'bootstrap' {
488
- border-color: $tbar-pressed-border;
489
- }
490
-
491
- @if $tbar-skin == 'bootstrap4' {
492
- .e-icons {
493
- color: inherit;
494
- }
495
- }
496
-
497
- @if $tbar-skin == 'bootstrap5' {
498
- color: $tbar-active-icon-color;
499
-
500
- .e-icons {
501
- color: inherit;
502
- }
503
- }
504
- @else {
505
- color: $tbar-pressed-font;
506
- }
507
-
508
- @if $tbar-skin == 'highcontrast' {
509
- background: inherit;
510
- border: $tbar-dash-border;
414
+ .e-icons {
415
+ color: $tbar-popup-nav-hover-icons-color;
511
416
  }
512
417
  }
513
418
  }
@@ -515,34 +420,20 @@
515
420
  .e-tbar-btn {
516
421
 
517
422
  &:active {
518
- background: $tbar-press-bg;
519
- @if $tbar-skin == 'bootstrap5' {
520
- background: $tbar-active-bg;
521
- }
522
- @if $tbar-skin == 'bootstrap' {
523
- border-left: 1px solid $tbar-press-border-color;
524
- }
423
+ background: $tbar-btn-active-bg;
525
424
  border-color: $tbar-press-border-color;
425
+ border-style: $tbar-border-nav-type;
426
+ border-width: $tbar-btn-active-border-size;
526
427
  border-radius: $tbar-btn-border-radius;
527
428
  box-shadow: $tbar-btn-pressed-box-shadow;
528
429
  color: $tbar-press-font;
529
430
 
530
- @if $tbar-skin == 'bootstrap4' {
531
- background: $tbar-active-btn-bg;
532
- border: 1px solid $tbar-active-border-color;
533
-
534
- .e-icons,
535
- .e-tbar-btn-text {
536
- color: inherit;
537
- }
431
+ .e-icons {
432
+ color: $tbar-btn-active-icons-color;
538
433
  }
539
- @if $tbar-skin == 'highcontrast' {
540
- color: $tbar-pressed-font;
541
434
 
542
- .e-icons,
543
- .e-tbar-btn-text {
544
- color: $tbar-pressed-font;
545
- }
435
+ .e-tbar-btn-text {
436
+ color: $tbar-btn-active-text-color;
546
437
  }
547
438
  }
548
439
  }