armtek-uikit-react 1.0.23 → 1.0.25
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.
- package/assets/Button.scss +54 -20
- package/assets/ButtonGroup.scss +27 -0
- package/package.json +1 -1
- package/ui/Button/Button.js +2 -2
package/assets/Button.scss
CHANGED
|
@@ -52,6 +52,7 @@
|
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
&.button_neutral {
|
|
55
|
+
color: #fff;
|
|
55
56
|
background: $color-neutral;
|
|
56
57
|
&:hover{
|
|
57
58
|
background: $color-neutral-dark;
|
|
@@ -64,6 +65,7 @@
|
|
|
64
65
|
}
|
|
65
66
|
}
|
|
66
67
|
&.button_black {
|
|
68
|
+
color: #fff;
|
|
67
69
|
background: $color-gray-900;
|
|
68
70
|
&:hover{
|
|
69
71
|
background: $color-neutral-dark;
|
|
@@ -198,21 +200,12 @@
|
|
|
198
200
|
|
|
199
201
|
|
|
200
202
|
.button_grouped_inline{
|
|
201
|
-
border-radius: 0;
|
|
202
|
-
&:first-child{
|
|
203
|
-
border-top-left-radius: $radius;
|
|
204
|
-
border-bottom-left-radius: $radius;
|
|
205
|
-
}
|
|
206
|
-
&:last-child{
|
|
207
|
-
border-top-right-radius: $radius;
|
|
208
|
-
border-bottom-right-radius: $radius;
|
|
209
|
-
}
|
|
210
203
|
&.button_contained{
|
|
211
204
|
&.button_primary + *{
|
|
212
205
|
border-left-color: $color-info-dark;
|
|
213
206
|
}
|
|
214
207
|
&.button_secondary + *{
|
|
215
|
-
border-left-color: $color-
|
|
208
|
+
border-left-color: $color-secondary-dark;
|
|
216
209
|
}
|
|
217
210
|
&.button_neutral + *{
|
|
218
211
|
border-left-color: $color-neutral-dark;
|
|
@@ -262,18 +255,59 @@
|
|
|
262
255
|
}
|
|
263
256
|
}
|
|
264
257
|
}
|
|
265
|
-
|
|
266
258
|
.button_grouped_column{
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
259
|
+
&.button_contained{
|
|
260
|
+
&.button_primary + *{
|
|
261
|
+
border-top-color: $color-info-dark;
|
|
262
|
+
}
|
|
263
|
+
&.button_secondary + *{
|
|
264
|
+
border-top-color: $color-secondary-dark;
|
|
265
|
+
}
|
|
266
|
+
&.button_neutral + *{
|
|
267
|
+
border-top-color: $color-neutral-dark;
|
|
268
|
+
}
|
|
269
|
+
&.button_black + *{
|
|
270
|
+
border-top-color: $color-neutral-dark;
|
|
271
|
+
}
|
|
270
272
|
}
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
273
|
+
&.button_outlined{
|
|
274
|
+
&.button_primary + *{
|
|
275
|
+
border-top-color: $color-info-dark;
|
|
276
|
+
}
|
|
277
|
+
&.button_primary:not(:last-child){
|
|
278
|
+
border-bottom: 0;
|
|
279
|
+
}
|
|
280
|
+
&.button_secondary + *{
|
|
281
|
+
border-top-color: $color-secondary;
|
|
282
|
+
}
|
|
283
|
+
&.button_secondary:not(:last-child){
|
|
284
|
+
border-bottom: 0;
|
|
285
|
+
}
|
|
286
|
+
&.button_neutral + *{
|
|
287
|
+
border-top-color: $color-neutral;
|
|
288
|
+
}
|
|
289
|
+
&.button_neutral:not(:last-child){
|
|
290
|
+
border-bottom: 0;
|
|
291
|
+
}
|
|
292
|
+
&.button_black + *{
|
|
293
|
+
border-top-color: $color-neutral;
|
|
294
|
+
}
|
|
295
|
+
&.button_black:not(:last-child){
|
|
296
|
+
border-bottom: 0;
|
|
297
|
+
}
|
|
274
298
|
}
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
299
|
+
&.button_transparent{
|
|
300
|
+
&.button_primary + *{
|
|
301
|
+
border-top-color: $color-gray-200;
|
|
302
|
+
}
|
|
303
|
+
&.button_secondary + *{
|
|
304
|
+
border-top-color: $color-gray-200;
|
|
305
|
+
}
|
|
306
|
+
&.button_neutral + *{
|
|
307
|
+
border-top-color: $color-gray-200;
|
|
308
|
+
}
|
|
309
|
+
&.button_black + *{
|
|
310
|
+
border-top-color: $color-gray-200;
|
|
311
|
+
}
|
|
278
312
|
}
|
|
279
313
|
}
|
package/assets/ButtonGroup.scss
CHANGED
|
@@ -6,7 +6,34 @@
|
|
|
6
6
|
}
|
|
7
7
|
.button_group_inline{
|
|
8
8
|
flex-direction: row;
|
|
9
|
+
& > * {
|
|
10
|
+
border-radius: 0;
|
|
11
|
+
&:first-child{
|
|
12
|
+
border-top-left-radius: $radius;
|
|
13
|
+
border-bottom-left-radius: $radius;
|
|
14
|
+
}
|
|
15
|
+
&:last-child{
|
|
16
|
+
border-top-right-radius: $radius;
|
|
17
|
+
border-bottom-right-radius: $radius;
|
|
18
|
+
}
|
|
19
|
+
}
|
|
9
20
|
}
|
|
10
21
|
.button_group_column{
|
|
11
22
|
flex-direction: column;
|
|
23
|
+
display: inline-block;
|
|
24
|
+
& > * {
|
|
25
|
+
border-radius: 0;
|
|
26
|
+
width: 100%;
|
|
27
|
+
&:not(:first-child){
|
|
28
|
+
border-top-color: transparent;
|
|
29
|
+
}
|
|
30
|
+
&:first-child{
|
|
31
|
+
border-top-left-radius: $radius;
|
|
32
|
+
border-top-right-radius: $radius;
|
|
33
|
+
}
|
|
34
|
+
&:last-child{
|
|
35
|
+
border-bottom-left-radius: $radius;
|
|
36
|
+
border-bottom-right-radius: $radius;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
12
39
|
}
|
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"name":"armtek-uikit-react","version":"1.0.
|
|
1
|
+
{"name":"armtek-uikit-react","version":"1.0.25","description":"Armtek UIKit for React","repository":{"type":"git","url":"ssh://git@gl.corp:10022/int/uikit/uikit_react.git"},"author":"","license":"ISC","dependencies":{"rc-slider":"^10.2.1","react":"*","react-datepicker":"^4.16.0","react-dom":"*"},"peerDependencies":{"react":"*","react-dom":"*"},"scripts":{"pub":"npm version patch && npm publish"}}
|
package/ui/Button/Button.js
CHANGED
|
@@ -3,7 +3,7 @@ import css from "./Button.module.scss";
|
|
|
3
3
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
4
4
|
import { jsxs as _jsxs } from "react/jsx-runtime";
|
|
5
5
|
import { Fragment as _Fragment } from "react/jsx-runtime";
|
|
6
|
-
const ButtonClasses = ['button', 'button_contained', 'button_transparent', 'button_outlined', 'button_primary', 'button_secondary', 'button_neutral', 'button_black', 'button__adornment', 'button__adornment_end', 'button__adornment_start', 'button_large', 'button_medium', 'button_small', 'button_icon', 'button_group', 'button_group_inline', 'button_group_column', 'button_grouped_inline', 'button_grouped_column'];
|
|
6
|
+
const ButtonClasses = ['Arm-button', 'button', 'button_contained', 'button_transparent', 'button_outlined', 'button_primary', 'button_secondary', 'button_neutral', 'button_black', 'button__adornment', 'button__adornment_end', 'button__adornment_start', 'button_large', 'button_medium', 'button_small', 'button_icon', 'button_group', 'button_group_inline', 'button_group_column', 'button_grouped_inline', 'button_grouped_column'];
|
|
7
7
|
|
|
8
8
|
// const css = getCssPrefix(ButtonClasses)
|
|
9
9
|
|
|
@@ -25,7 +25,7 @@ const Button = props => {
|
|
|
25
25
|
return /*#__PURE__*/_jsx(_Fragment, {
|
|
26
26
|
children: /*#__PURE__*/_jsxs(Component, {
|
|
27
27
|
...restProps,
|
|
28
|
-
className: clsx(css.button, css['button_' + size], css['button_' + variant], css['button_' + color], className, {
|
|
28
|
+
className: clsx('Arm-button', css.button, css['button_' + size], css['button_' + variant], css['button_' + color], className, {
|
|
29
29
|
[css['button_grouped_' + group]]: group,
|
|
30
30
|
[css.button_radius_none]: radius === false,
|
|
31
31
|
[css.button_radius_full]: radius === true
|