Skip to content

Commit 234d580

Browse files
FenkoAlexAlex FenkoPoytaLAtcadЛукин Валерий Николаевич
authored andcommitted
feat(*): new theme
BREAKING CHANGE: Feat/new theme (#1239) * feat(theme): add new theme * feat(theme): add theme to heading, link, plate * feat(theme): add new theme type * feat(theme): add some themed icons * feat(theme): revert icons * feat(theme): fix * feat(client): add new themes for input component (#1240) add input theme * feat(*): add new themes for button (#1243) * feat(*): add new themes for button * fix(package.json): fix peerDependencies Co-authored-by: Лукин Валерий Николаевич <[email protected]> * feat(theme): fix lint * feat(theme): fix input * feat(client): fix import and hover for input theme (#1244) fix input * feat(theme): add paragraph and label * feat(client): add new theme for tabs and tab-item (#1247) add tabs * feat(*): add new themes for label and notification (#1248) add notification * feat(*): add new themes for list, fix import styles heading (#1250) add list * Update src/input/input_theme_alfa-dark.css Co-authored-by: Igor Maslov <[email protected]> * Update src/input/input_theme_alfa-light.css Co-authored-by: Igor Maslov <[email protected]> * feat(theme): add special arui-demo version * feat(theme): add body dark theme * feat(theme): update css * feat(theme): update Plate and Button * feat(*): add themes for checkbox&checkbox-group&tag-button (#1261) * feat(*): add themes for checkbox&checkbox-group&tag-button * fix(*): fix code style * fix(*): fix css for icons * fix(*): update package-lock Co-authored-by: Лукин Валерий Николаевич <[email protected]> * feat(theme): fix test * feat(theme): try fix lint * feat(theme): fix mistake * feat(theme): fix ts compile * feat(theme): fix gemini * Feat/new theme components (#1260) * fix(client): add transparent and filled states * feat(client): add new theme for select * feat(client): add textarea and input-autocomplete * feat(*): add new themes and fix button hover state * feat(theme): fix lock-file Co-authored-by: Alex Fenko <[email protected]> * feat(*): add new themes for radio&radioGroup (#1263) Co-authored-by: Лукин Валерий Николаевич <[email protected]> * feat(*): add new themes for sidebar (#1264) Co-authored-by: Лукин Валерий Николаевич <[email protected]> * feat(client): add new theme for calendar (#1262) * feat(client): add new theme for calendar * feat(client): add new theme for calendar Co-authored-by: Alex Fenko <[email protected]> * feat(theme): fix gemini * feat(theme): up version * fix(client): padding for select and popup border (#1265) * feat(select): update select * feat(calendar): update calendar * feat(attach): update attach * fix(input): fix clear icon * fix(popup): del shadow * fix(link): fix link border color (#1271) * fix(link): fix link border color * fix(link): fix hovered & focus link color in alfa-white * fix(calendar): fix selected calendar day style in dark theme (#1272) * added box-shadow to popup elements in theme-dark (#1276) * fix(*): fix input styles for dark and color theme (#1278) * WIP: fix gemini tests (#1283) * fix(*): fix attach and button component * fix(*): fix components before sidebar * feat(test): update gemini BREAKING CHANGE Co-authored-by: Alex Fenko <[email protected]> Co-authored-by: PoytaL <[email protected]> Co-authored-by: Valeryi Lukin <[email protected]> Co-authored-by: Лукин Валерий Николаевич <[email protected]> Co-authored-by: Igor Maslov <[email protected]> Co-authored-by: Nadezzdi <[email protected]> Co-authored-by: Nadine <[email protected]> Co-authored-by: SNosenko <[email protected]> Co-authored-by: Aleksandr Dyuzhikov <[email protected]>
1 parent 435ae9e commit 234d580

File tree

430 files changed

+18270
-11915
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

430 files changed

+18270
-11915
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ yarn-error.log
1212
coverage/
1313
gemini-coverage/
1414
gemini-report/
15+
gemini/

gemini-utils/ok-icon/index.tsx

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import OkIcon from './ok-icon';
2+
import OkColorIcon from './ok-icon-color';
3+
4+
export {
5+
OkIcon,
6+
OkColorIcon,
7+
};
+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import React, { FC } from 'react';
2+
import {
3+
OkLColorIcon, OkMColorIcon, OkSColorIcon, OkXlColorIcon,
4+
} from '@alfalab/icons-classic';
5+
6+
const icons = {
7+
s: <OkSColorIcon />,
8+
l: <OkLColorIcon />,
9+
xl: <OkXlColorIcon />,
10+
m: <OkMColorIcon />,
11+
};
12+
13+
type Props = {
14+
size: string;
15+
}
16+
17+
const OkColorIcon: FC<Props> = ({ size }) => icons[size] || <OkMColorIcon />;
18+
19+
export default OkColorIcon;

gemini-utils/ok-icon/ok-icon.tsx

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import React, { FC } from 'react';
2+
import {
3+
OkLIcon, OkMIcon, OkSIcon, OkXlIcon,
4+
} from '@alfalab/icons-classic';
5+
6+
const icons = {
7+
s: <OkSIcon />,
8+
l: <OkLIcon />,
9+
xl: <OkXlIcon />,
10+
m: <OkMIcon />,
11+
};
12+
13+
type Props = {
14+
size: string;
15+
}
16+
17+
const OkIcon: FC<Props> = ({ size }) => icons[size] || <OkMIcon />;
18+
19+
export default OkIcon;

gemini/button.gemini.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import React from 'react';
12
import Button from '../src/button';
2-
import IconOk from '../src/icon/ui/ok';
33
import GeminiBox from '../gemini-utils/gemini-box/gemini-box';
4+
import { OkIcon } from '../gemini-utils/ok-icon';
45

56
const NAME = 'button';
67
const THEMES = ['alfa-on-color', 'alfa-on-white'];
@@ -22,7 +23,7 @@ geminiReact.suite(NAME, () => {
2223
const sizeSelector = `${NAME}_size_${size}`;
2324

2425
PROP_SETS
25-
.concat([{ icon: <IconOk size={ size } /> }])
26+
.concat([{ icon: <OkIcon size={ size } /> }])
2627
.forEach((set, index) => {
2728
const selector = `${themeSelector}.${sizeSelector}.${NAME}_prop-set_${index + 1}`;
2829

gemini/calendar-input.gemini.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import CalendarInput from '../src/calendar-input';
2-
import IconOk from '../src/icon/ui/ok';
32
import GeminiBox from '../gemini-utils/gemini-box/gemini-box';
3+
import { OkColorIcon } from '../gemini-utils/ok-icon';
44

55
const DATE = '12.04.2017';
66

@@ -19,7 +19,7 @@ function renderAddons(calendarInputSize) {
1919
}
2020

2121
return (
22-
<IconOk size={ iconSize } colored={ true } />
22+
<OkColorIcon size={ iconSize } />
2323
);
2424
}
2525

gemini/notification.gemini.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import IconOk from '../src/icon/ui/ok';
21
import Notification from '../src/notification';
2+
import { OkColorIcon } from '../gemini-utils/ok-icon';
33

44
const NAME = 'notification';
55

@@ -25,7 +25,7 @@ const PROP_SETS = [
2525
},
2626
{
2727
visible: true,
28-
icon: <IconOk name="action-ok" colored={ true } size="m" />,
28+
icon: <OkColorIcon size="m" />,
2929
status: 'ok',
3030
offset: 10,
3131
stickTo: 'left',

0 commit comments

Comments
 (0)