@codecademy/variance 0.21.1-alpha.d9da73.0 → 0.21.1
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/dist/createTheme/types.d.ts +7 -7
- package/dist/scales/createScaleLookup.d.ts +1 -1
- package/dist/types/config.d.ts +10 -10
- package/dist/types/properties.d.ts +5 -5
- package/dist/types/props.d.ts +7 -7
- package/dist/types/utils.d.ts +3 -3
- package/dist/utils/flattenScale.d.ts +5 -5
- package/dist/utils/serializeTokens.d.ts +2 -2
- package/package.json +3 -10
- package/dist/utils/__fixtures__/testConfig.js +0 -153
|
@@ -9,21 +9,21 @@ import { AbstractTheme } from '../types/theme';
|
|
|
9
9
|
*
|
|
10
10
|
* The resulting type is then rejoined with keys that cannot be mutated (breakpoints) as the next version of Theme
|
|
11
11
|
*/
|
|
12
|
-
export
|
|
12
|
+
export type MergeTheme<Base extends AbstractTheme, Next, Unmergable = Record<'breakpoints', Base['breakpoints']>> = Unmergable & Merge<Base, Next>;
|
|
13
13
|
/** This merges at 2 levels of depth */
|
|
14
|
-
export
|
|
14
|
+
export type Merge<A, B> = {
|
|
15
15
|
[K in keyof (A & B)]: K extends keyof B ? K extends keyof A ? AssignValueIfUnmergable<A[K], B[K]> : B[K] : K extends keyof A ? A[K] : never;
|
|
16
16
|
};
|
|
17
17
|
/** Extract mergable objects */
|
|
18
|
-
export
|
|
18
|
+
export type Mergable<T> = Exclude<T, ((...args: any) => any) | string | boolean | symbol | number | any[]>;
|
|
19
19
|
/** Return B if either A or B is unmergable */
|
|
20
|
-
export
|
|
20
|
+
export type AssignValueIfUnmergable<A, B> = Mergable<A> extends never ? B : Mergable<B> extends never ? B : Assign<A, B>;
|
|
21
21
|
/** Prefer all values from B */
|
|
22
|
-
export
|
|
22
|
+
export type Assign<A, B> = {
|
|
23
23
|
[K in keyof A | keyof B]: K extends keyof B ? B[K] : K extends keyof A ? A[K] : never;
|
|
24
24
|
};
|
|
25
25
|
/** These are keys that are consistent for all theme builds - they are loosely typed as they are not meant to be accessed directly */
|
|
26
|
-
export
|
|
26
|
+
export type PrivateThemeKeys = {
|
|
27
27
|
_variables: Record<string, CSSObject>;
|
|
28
28
|
_tokens: Record<string | number, any>;
|
|
29
29
|
};
|
|
@@ -39,4 +39,4 @@ export declare type PrivateThemeKeys = {
|
|
|
39
39
|
*
|
|
40
40
|
* `button-bg-hover`
|
|
41
41
|
* */
|
|
42
|
-
export
|
|
42
|
+
export type ColorModeConfig<Colors> = Record<string, Colors | Record<string, Colors> | Record<string, Colors | Record<string, Colors>>>;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Prop } from '../types/config';
|
|
2
2
|
import { ThemeProps } from '../types/props';
|
|
3
|
-
|
|
3
|
+
type GetScaleValue = (val: string | number, props: ThemeProps) => string | number | undefined;
|
|
4
4
|
export declare const createScaleLookup: (scale: Prop['scale']) => GetScaleValue;
|
|
5
5
|
export {};
|
package/dist/types/config.d.ts
CHANGED
|
@@ -2,8 +2,8 @@ import { Theme } from '@emotion/react';
|
|
|
2
2
|
import { DefaultCSSPropertyValue, PropertyTypes } from './properties';
|
|
3
3
|
import { AbstractProps, CSSObject, CSSPropMap, CSSProps, ResponsiveProp, ThemeProps } from './props';
|
|
4
4
|
import { AllUnionKeys, Key, KeyFromUnion } from './utils';
|
|
5
|
-
export
|
|
6
|
-
export
|
|
5
|
+
export type MapScale = Record<string | number, string | number>;
|
|
6
|
+
export type ArrayScale = readonly (string | number)[] & {
|
|
7
7
|
length: 0;
|
|
8
8
|
};
|
|
9
9
|
export interface BaseProperty {
|
|
@@ -23,9 +23,9 @@ export interface AbstractParser {
|
|
|
23
23
|
propNames: string[];
|
|
24
24
|
config: Record<string, AbstractPropTransformer>;
|
|
25
25
|
}
|
|
26
|
-
export
|
|
27
|
-
export
|
|
28
|
-
export
|
|
26
|
+
export type PropertyValues<Property extends keyof PropertyTypes, All extends boolean = false> = Exclude<PropertyTypes<All extends true ? DefaultCSSPropertyValue : never>[Property], All extends true ? never : object | any[]>;
|
|
27
|
+
export type ScaleValue<Config extends Prop> = Config['scale'] extends keyof Theme ? keyof Theme[Config['scale']] | PropertyValues<Config['property']> : Config['scale'] extends MapScale ? keyof Config['scale'] | PropertyValues<Config['property']> : Config['scale'] extends ArrayScale ? Config['scale'][number] | PropertyValues<Config['property']> : PropertyValues<Config['property'], true>;
|
|
28
|
+
export type Scale<Config extends Prop> = ResponsiveProp<ScaleValue<Config> | ((theme: Theme) => ScaleValue<Config>)>;
|
|
29
29
|
export interface TransformFn<P extends string, Config extends Prop> {
|
|
30
30
|
(value: Scale<Config> | Scale<Config>, prop: P, props: ThemeProps<{
|
|
31
31
|
[K in P]?: Scale<Config>;
|
|
@@ -35,7 +35,7 @@ export interface PropTransformer<P extends string, C extends Prop> extends Abstr
|
|
|
35
35
|
prop: P;
|
|
36
36
|
styleFn: TransformFn<P, C>;
|
|
37
37
|
}
|
|
38
|
-
export
|
|
38
|
+
export type TransformerMap<Config extends Record<string, Prop>> = {
|
|
39
39
|
[P in Key<keyof Config>]: PropTransformer<Key<P>, Config[P]>;
|
|
40
40
|
};
|
|
41
41
|
export interface Parser<Config extends Record<string, AbstractPropTransformer>> {
|
|
@@ -43,7 +43,7 @@ export interface Parser<Config extends Record<string, AbstractPropTransformer>>
|
|
|
43
43
|
propNames: (keyof Config)[];
|
|
44
44
|
config: Config;
|
|
45
45
|
}
|
|
46
|
-
export
|
|
46
|
+
export type Compose<Args extends AbstractParser[]> = {
|
|
47
47
|
[K in AllUnionKeys<Args[number]['config']>]: KeyFromUnion<Args[number]['config'], K>;
|
|
48
48
|
};
|
|
49
49
|
export interface Variant<P extends AbstractParser> {
|
|
@@ -60,12 +60,12 @@ export interface States<P extends AbstractParser> {
|
|
|
60
60
|
export interface CSS<P extends AbstractParser> {
|
|
61
61
|
<Props extends AbstractProps>(config: CSSProps<Props, SystemProps<P>>): (props: ThemeProps) => CSSObject;
|
|
62
62
|
}
|
|
63
|
-
export
|
|
63
|
+
export type ParserProps<Config extends Record<string, AbstractPropTransformer>> = ThemeProps<{
|
|
64
64
|
[P in keyof Config]?: Parameters<Config[P]['styleFn']>[2][Config[P]['prop']];
|
|
65
65
|
}>;
|
|
66
|
-
export
|
|
66
|
+
export type SystemProps<P extends AbstractParser> = {
|
|
67
67
|
[K in keyof Omit<Parameters<P>[0], 'theme'>]: Omit<Parameters<P>[0], 'theme'>[K];
|
|
68
68
|
};
|
|
69
|
-
export
|
|
69
|
+
export type VariantProps<T extends string, V> = {
|
|
70
70
|
[Key in T]?: V;
|
|
71
71
|
};
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { Globals, StandardProperties, VendorProperties } from 'csstype';
|
|
2
|
-
|
|
3
|
-
|
|
2
|
+
type ColorProperties = 'color' | `${string}Color`;
|
|
3
|
+
type ColorGlobals = {
|
|
4
4
|
[K in Extract<keyof StandardProperties, ColorProperties>]?: Globals | 'currentColor' | 'transparent' | (string & {});
|
|
5
5
|
};
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
type SizeProperties = 'left' | 'right' | 'top' | 'bottom' | 'inset' | 'width' | 'height' | `${string}${'Width' | 'Height'}`;
|
|
7
|
+
type SizeGlobals = {
|
|
8
8
|
[K in Extract<keyof StandardProperties, SizeProperties>]?: StandardProperties[K] | (number & {});
|
|
9
9
|
};
|
|
10
10
|
/** This is a placeholder type for CSS properties that may not have any specific global values (outlineOffset).
|
|
@@ -12,7 +12,7 @@ declare type SizeGlobals = {
|
|
|
12
12
|
*
|
|
13
13
|
* This ensures that autosuggestions will still work for literal types but still allow any string for certain properties.
|
|
14
14
|
*/
|
|
15
|
-
export
|
|
15
|
+
export type DefaultCSSPropertyValue = (string & {}) | 0;
|
|
16
16
|
export interface PropertyTypes<Overrides = DefaultCSSPropertyValue> extends Omit<StandardProperties<Overrides>, keyof ColorGlobals | keyof SizeGlobals>, ColorGlobals, SizeGlobals {
|
|
17
17
|
}
|
|
18
18
|
export interface VendorPropertyTypes<Overrides = DefaultCSSPropertyValue> extends VendorProperties<Overrides> {
|
package/dist/types/props.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Theme } from '@emotion/react';
|
|
2
2
|
import { AbstractParser, Scale } from './config';
|
|
3
3
|
import { CSSPropertyTypes } from './properties';
|
|
4
|
-
export
|
|
4
|
+
export type AbstractProps = ThemeProps<Record<string, unknown>>;
|
|
5
5
|
interface BreakpointKeys<T = string> {
|
|
6
6
|
xs: T;
|
|
7
7
|
sm: T;
|
|
@@ -13,7 +13,7 @@ export interface BreakpointCache {
|
|
|
13
13
|
map: BreakpointKeys;
|
|
14
14
|
array: string[];
|
|
15
15
|
}
|
|
16
|
-
export
|
|
16
|
+
export type ThemeProps<Props = {}> = Props & {
|
|
17
17
|
theme?: Theme;
|
|
18
18
|
};
|
|
19
19
|
export interface MediaQueryArray<T> {
|
|
@@ -32,16 +32,16 @@ export interface MediaQueryMap<T> {
|
|
|
32
32
|
lg?: T;
|
|
33
33
|
xl?: T;
|
|
34
34
|
}
|
|
35
|
-
export
|
|
35
|
+
export type ResponsiveProp<T> = T | MediaQueryMap<T> | MediaQueryArray<T>;
|
|
36
36
|
export interface CSSObject {
|
|
37
37
|
[key: string]: string | number | CSSObject | undefined;
|
|
38
38
|
}
|
|
39
|
-
export
|
|
39
|
+
export type CSSPropMap<Props, System> = {
|
|
40
40
|
[K in keyof Props]?: CSSProps<Props[K], System>;
|
|
41
41
|
};
|
|
42
|
-
export
|
|
42
|
+
export type CSSProps<Props, System> = {
|
|
43
43
|
[K in keyof Props]?: K extends keyof System ? System[K] : K extends keyof CSSPropertyTypes ? CSSPropertyTypes[K] : Omit<CSSPropertyTypes, keyof System> & Omit<System, 'theme'>;
|
|
44
44
|
};
|
|
45
|
-
export
|
|
46
|
-
export
|
|
45
|
+
export type StyleProps<T extends (args: AbstractProps) => CSSObject> = Parameters<T>[0];
|
|
46
|
+
export type ScaleValue<P extends AbstractParser, Prop extends keyof P['config']> = Scale<P['config'][Prop]>;
|
|
47
47
|
export {};
|
package/dist/types/utils.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export
|
|
2
|
-
export
|
|
3
|
-
export
|
|
1
|
+
export type AllUnionKeys<T> = T extends any ? keyof T : never;
|
|
2
|
+
export type KeyFromUnion<T, K> = T extends any ? K extends keyof T ? T[K] : never : never;
|
|
3
|
+
export type Key<T> = T extends string ? T : never;
|
|
@@ -2,19 +2,19 @@
|
|
|
2
2
|
* Returns an exhaustive list of all possible paths of an object T for keys K.
|
|
3
3
|
* Possibilities are returned as `k1.k2.k3`.
|
|
4
4
|
*/
|
|
5
|
-
export
|
|
5
|
+
export type FindPath<T, K extends keyof T, D extends string = '.'> = K extends string | number ? T[K] extends Record<string | number, any> ? T[K] extends ArrayLike<any> ? K | `${K}${D}${FindPath<T[K], Exclude<keyof T[K], keyof any[]>, D>}` : K | `${K}${D}${FindPath<T[K], keyof T[K], D>}` : K : never;
|
|
6
6
|
/** Returns valid paths of object T */
|
|
7
|
-
export
|
|
7
|
+
export type Path<T, D extends string = '.'> = FindPath<T, keyof T, D> | keyof T;
|
|
8
8
|
/** Returns the value of a valid path P `k1.k2.k3` in object T */
|
|
9
|
-
export
|
|
9
|
+
export type PathValue<T, P extends Path<T, D>, D extends string = '.'> = P extends `${infer K}${D}${infer Rest}` ? K extends keyof T ? Rest extends Path<T[K], D> ? PathValue<T[K], Rest, D> : never : never : P extends keyof T ? T[P] : never;
|
|
10
10
|
/** Check if path has a primitive end value and return only the union of end paths */
|
|
11
|
-
export
|
|
11
|
+
export type PathToLiteral<T, K extends Path<T, D>, D extends string = '.', Base extends string = ''> = PathValue<T, K, D> extends string | number ? K extends string | number ? K extends `${infer BasePath}${D}${Base}` ? BasePath : K : never : never;
|
|
12
12
|
/**
|
|
13
13
|
* Reduce all paths to a single map of paths with primitive values removing all extra non stateful paths
|
|
14
14
|
* { path: { sub: 1 } } => { 'path-sub': 1 }
|
|
15
15
|
*
|
|
16
16
|
*/
|
|
17
|
-
export
|
|
17
|
+
export type LiteralPaths<T extends Record<string | number, any>, D extends string = '.', Base extends string = ''> = {
|
|
18
18
|
[K in Path<T, D> as PathToLiteral<T, K, D, Base>]: PathValue<T, PathToLiteral<T, K, D>, D>;
|
|
19
19
|
};
|
|
20
20
|
export declare function flattenScale<T extends Record<string | number, any>, P extends string>(object: T, path?: P): LiteralPaths<T, '-', '_'>;
|
|
@@ -3,10 +3,10 @@ import { CSSObject } from '../types/props';
|
|
|
3
3
|
/**
|
|
4
4
|
* Returns an type of any object with { key: 'var(--key) }
|
|
5
5
|
*/
|
|
6
|
-
export
|
|
6
|
+
export type KeyAsVariable<T extends Record<string, any>, Prefix extends string> = {
|
|
7
7
|
[V in keyof T]: `var(--${Prefix}-${Extract<V, string>})`;
|
|
8
8
|
};
|
|
9
|
-
|
|
9
|
+
type SerializedTokensInput = Record<string, string | number | CSSObject | SerializedTokensInputRecursive>;
|
|
10
10
|
interface SerializedTokensInputRecursive {
|
|
11
11
|
[i: number]: SerializedTokensInput;
|
|
12
12
|
[i: string]: SerializedTokensInput;
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codecademy/variance",
|
|
3
3
|
"description": "Constraint based CSS in JS for building scalable design systems",
|
|
4
|
-
"version": "0.21.1
|
|
4
|
+
"version": "0.21.1",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"emotion",
|
|
7
7
|
"css",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"url": "git+https://github.com/Codecademy/gamut.git"
|
|
26
26
|
},
|
|
27
27
|
"scripts": {
|
|
28
|
-
"build": "nx build variance"
|
|
28
|
+
"build": "nx build @codecademy/variance"
|
|
29
29
|
},
|
|
30
30
|
"peerDependencies": {
|
|
31
31
|
"@emotion/react": "*",
|
|
@@ -35,12 +35,5 @@
|
|
|
35
35
|
"csstype": "^3.0.7",
|
|
36
36
|
"lodash": "^4.17.5"
|
|
37
37
|
},
|
|
38
|
-
"
|
|
39
|
-
"@emotion/jest": "^11.3.0",
|
|
40
|
-
"@emotion/styled": "^11.3.0",
|
|
41
|
-
"@types/react-test-renderer": "^17.0.2",
|
|
42
|
-
"react": "^17.0.2",
|
|
43
|
-
"react-test-renderer": "^17.0.2"
|
|
44
|
-
},
|
|
45
|
-
"gitHead": "2dc9984fe01f9c4668d5dbd0bfd5b803c10519d5"
|
|
38
|
+
"gitHead": "baa23988e9eb59834cafd89bbfd7923dfe1039d9"
|
|
46
39
|
}
|
|
@@ -1,153 +0,0 @@
|
|
|
1
|
-
export var testConfig = {
|
|
2
|
-
textColor: {
|
|
3
|
-
property: 'color'
|
|
4
|
-
},
|
|
5
|
-
bg: {
|
|
6
|
-
property: 'backgroundColor'
|
|
7
|
-
},
|
|
8
|
-
borderColor: {
|
|
9
|
-
property: 'borderColor'
|
|
10
|
-
},
|
|
11
|
-
borderColorX: {
|
|
12
|
-
property: 'borderColor',
|
|
13
|
-
properties: ['borderLeftColor', 'borderRightColor'],
|
|
14
|
-
scale: 'colors'
|
|
15
|
-
},
|
|
16
|
-
borderColorY: {
|
|
17
|
-
property: 'borderColor',
|
|
18
|
-
properties: ['borderTopColor', 'borderBottomColor'],
|
|
19
|
-
scale: 'colors'
|
|
20
|
-
},
|
|
21
|
-
borderColorLeft: {
|
|
22
|
-
property: 'borderLeftColor'
|
|
23
|
-
},
|
|
24
|
-
borderColorRight: {
|
|
25
|
-
property: 'borderRightColor'
|
|
26
|
-
},
|
|
27
|
-
borderColorTop: {
|
|
28
|
-
property: 'borderTopColor'
|
|
29
|
-
},
|
|
30
|
-
borderColorBottom: {
|
|
31
|
-
property: 'borderBottomColor'
|
|
32
|
-
},
|
|
33
|
-
border: {
|
|
34
|
-
property: 'border'
|
|
35
|
-
},
|
|
36
|
-
borderX: {
|
|
37
|
-
property: 'border',
|
|
38
|
-
properties: ['borderLeft', 'borderRight']
|
|
39
|
-
},
|
|
40
|
-
borderY: {
|
|
41
|
-
property: 'border',
|
|
42
|
-
properties: ['borderTop', 'borderBottom']
|
|
43
|
-
},
|
|
44
|
-
borderTop: {
|
|
45
|
-
property: 'borderTop'
|
|
46
|
-
},
|
|
47
|
-
borderRight: {
|
|
48
|
-
property: 'borderRight'
|
|
49
|
-
},
|
|
50
|
-
borderBottom: {
|
|
51
|
-
property: 'borderBottom'
|
|
52
|
-
},
|
|
53
|
-
borderLeft: {
|
|
54
|
-
property: 'borderLeft'
|
|
55
|
-
},
|
|
56
|
-
borderWidth: {
|
|
57
|
-
property: 'borderWidth'
|
|
58
|
-
},
|
|
59
|
-
borderWidthX: {
|
|
60
|
-
property: 'borderWidth',
|
|
61
|
-
properties: ['borderLeftWidth', 'borderRightWidth']
|
|
62
|
-
},
|
|
63
|
-
borderWidthY: {
|
|
64
|
-
property: 'borderWidth',
|
|
65
|
-
properties: ['borderTopWidth', 'borderBottomWidth']
|
|
66
|
-
},
|
|
67
|
-
borderRadius: {
|
|
68
|
-
property: 'borderRadius'
|
|
69
|
-
},
|
|
70
|
-
borderRadiusLeft: {
|
|
71
|
-
property: 'borderRadius',
|
|
72
|
-
properties: ['borderTopLeftRadius', 'borderBottomLeftRadius']
|
|
73
|
-
},
|
|
74
|
-
borderRadiusTop: {
|
|
75
|
-
property: 'borderRadius',
|
|
76
|
-
properties: ['borderTopLeftRadius', 'borderTopRightRadius']
|
|
77
|
-
},
|
|
78
|
-
borderRadiusBottom: {
|
|
79
|
-
property: 'borderRadius',
|
|
80
|
-
properties: ['borderBottomLeftRadius', 'borderBottomRightRadius']
|
|
81
|
-
},
|
|
82
|
-
borderRadiusRight: {
|
|
83
|
-
property: 'borderRadius',
|
|
84
|
-
properties: ['borderTopRightRadius', 'borderBottomRightRadius']
|
|
85
|
-
},
|
|
86
|
-
borderStyle: {
|
|
87
|
-
property: 'borderStyle'
|
|
88
|
-
},
|
|
89
|
-
borderStyleX: {
|
|
90
|
-
property: 'borderStyle',
|
|
91
|
-
properties: ['borderLeftStyle', 'borderRightStyle']
|
|
92
|
-
},
|
|
93
|
-
borderStyleY: {
|
|
94
|
-
property: 'borderStyle',
|
|
95
|
-
properties: ['borderTopStyle', 'borderBottomStyle']
|
|
96
|
-
},
|
|
97
|
-
flex: {
|
|
98
|
-
property: 'flex'
|
|
99
|
-
},
|
|
100
|
-
flexBasis: {
|
|
101
|
-
property: 'flexBasis'
|
|
102
|
-
},
|
|
103
|
-
p: {
|
|
104
|
-
property: 'padding'
|
|
105
|
-
},
|
|
106
|
-
px: {
|
|
107
|
-
property: 'padding',
|
|
108
|
-
properties: ['paddingLeft', 'paddingRight'],
|
|
109
|
-
scale: 'spacing'
|
|
110
|
-
},
|
|
111
|
-
py: {
|
|
112
|
-
property: 'padding',
|
|
113
|
-
properties: ['paddingTop', 'paddingBottom'],
|
|
114
|
-
scale: 'spacing'
|
|
115
|
-
},
|
|
116
|
-
pt: {
|
|
117
|
-
property: 'paddingTop'
|
|
118
|
-
},
|
|
119
|
-
pb: {
|
|
120
|
-
property: 'paddingBottom'
|
|
121
|
-
},
|
|
122
|
-
pr: {
|
|
123
|
-
property: 'paddingRight'
|
|
124
|
-
},
|
|
125
|
-
pl: {
|
|
126
|
-
property: 'paddingLeft'
|
|
127
|
-
},
|
|
128
|
-
m: {
|
|
129
|
-
property: 'margin'
|
|
130
|
-
},
|
|
131
|
-
mx: {
|
|
132
|
-
property: 'margin',
|
|
133
|
-
properties: ['marginLeft', 'marginRight'],
|
|
134
|
-
scale: 'spacing'
|
|
135
|
-
},
|
|
136
|
-
my: {
|
|
137
|
-
property: 'margin',
|
|
138
|
-
properties: ['marginTop', 'marginBottom'],
|
|
139
|
-
scale: 'spacing'
|
|
140
|
-
},
|
|
141
|
-
mt: {
|
|
142
|
-
property: 'marginTop'
|
|
143
|
-
},
|
|
144
|
-
mb: {
|
|
145
|
-
property: 'marginBottom'
|
|
146
|
-
},
|
|
147
|
-
mr: {
|
|
148
|
-
property: 'marginRight'
|
|
149
|
-
},
|
|
150
|
-
ml: {
|
|
151
|
-
property: 'marginLeft'
|
|
152
|
-
}
|
|
153
|
-
};
|