Skip to content

Commit 758907a

Browse files
rushirushi
authored
Merge branch 'master' into customize-switch
2 parents 25b0a84 + a764e06 commit 758907a

Some content is hidden

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

64 files changed

+7328
-3331
lines changed

‎.github/workflows/chromatic.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: "Chromatic"
2+
3+
on:
4+
push:
5+
pull_request_target:
6+
types: [assigned, opened, synchronize, reopened]
7+
8+
jobs:
9+
chromatic-deployment:
10+
# Operating System
11+
runs-on: ubuntu-latest
12+
# Job steps
13+
steps:
14+
- uses: actions/checkout@v1
15+
- name: Install dependencies
16+
run: npm ci
17+
18+
- name: Publish to Chromatic
19+
uses: chromaui/action@v1
20+
with:
21+
buildScriptName: build:storybook
22+
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}

‎.github/workflows/eslint-annotate.yml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Annotate ES Lint Results
2+
3+
on:
4+
push:
5+
pull_request_target:
6+
types: [assigned, opened, synchronize, reopened]
7+
8+
env:
9+
DISABLE_PROGRESS: true
10+
11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
13+
cancel-in-progress: true
14+
15+
jobs:
16+
GenerateReport:
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- uses: actions/checkout@v2
21+
with:
22+
token: "${{ secrets.ES_LINT_TOKEN }}"
23+
ref: ${{github.event.pull_request.head.sha}}
24+
repository: ${{github.event.pull_request.head.repo.full_name}}
25+
persist-credential: false
26+
27+
- name: Node.JS 16
28+
uses: actions/setup-node@v2
29+
with:
30+
node-version: 16
31+
cache: "npm"
32+
33+
# - run: git config --global url."https://${{ secrets.ES_LINT_TOKEN }}@github.com/".insteadOf ssh://[email protected]/
34+
35+
- name: Install Node Dependencies
36+
run: npm ci
37+
env:
38+
CI: TRUE
39+
40+
- name: Save Code Linting Report to JSON
41+
# This is to show failures in Github pull request using the action below
42+
run: npm run lint:report
43+
continue-on-error: true
44+
env:
45+
DISABLE_PROGRESS: true
46+
47+
- name: Annotate Code Linting Results
48+
uses: ataylorme/[email protected]
49+
with:
50+
repo-token: "${{ secrets.GITHUB_TOKEN }}"
51+
report-json: "eslint_report.json"
52+
53+
- name: Upload ESLint report
54+
uses: actions/upload-artifact@v2
55+
with:
56+
name: eslint_report.json
57+
path: eslint_report.json

‎.github/workflows/eslint.yml‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@ name: Run ES Lint
22

33
on:
44
push:
5-
pull_request:
6-
types: [assigned, opened, synchronize, reopened]
75
pull_request_target:
86
types: [assigned, opened, synchronize, reopened]
97

8+
env:
9+
DISABLE_PROGRESS: true
10+
11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
13+
cancel-in-progress: true
14+
1015
jobs:
1116
RunLint:
1217
runs-on: ubuntu-latest
@@ -28,24 +33,7 @@ jobs:
2833
env:
2934
CI: TRUE
3035

31-
- name: Test Code Linting
36+
- name: Lint Report
3237
# This is to show the failures in Github actions
3338
run: npm run lint
3439
continue-on-error: true
35-
36-
- name: Save Code Linting Report to JSON
37-
# This is to show failures in Github pull request using the action below
38-
run: npm run lint:report
39-
continue-on-error: true
40-
41-
- name: Annotate Code Linting Results
42-
uses: ataylorme/[email protected]
43-
with:
44-
repo-token: "${{ secrets.GITHUB_TOKEN }}"
45-
report-json: "eslint_report.json"
46-
47-
- name: Upload ESLint report
48-
uses: actions/upload-artifact@v2
49-
with:
50-
name: eslint_report.json
51-
path: eslint_report.json

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Xola UI Kit
22

3-
React component library for the next generation of Xola apps. See a preview at https://ui.xola.io
3+
Xola's React component library with Tailwind CSS for the next generation of Xola apps. See a preview at https://ui.xola.io
44

55
### Requirements
66

‎index.css‎

Lines changed: 57 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -5,72 +5,74 @@
55
@tailwind components;
66
@tailwind utilities;
77

8-
html {
9-
/* Never change this default! */
10-
font-size: 14px;
11-
}
8+
@layer base {
9+
html {
10+
/* Never change this default! */
11+
@apply text-black text-base;
12+
}
1213

13-
a {
14-
@apply text-primary hover:underline;
15-
}
14+
a {
15+
@apply text-primary hover:underline;
16+
}
1617

17-
button:focus {
18-
@apply outline-none;
19-
}
18+
button:focus {
19+
@apply outline-none;
20+
}
2021

21-
h1 {
22-
@apply text-2xl; /* 24px */
23-
@apply font-bold;
24-
@apply leading-p1 tracking-tightest;
25-
}
22+
h1 {
23+
@apply text-2xl; /* 24px */
24+
@apply font-bold;
25+
@apply leading-p1 tracking-tightest;
26+
}
2627

27-
h2 {
28-
@apply text-xl; /* 21px */
29-
@apply font-bold;
30-
@apply leading-p1 tracking-tightest;
31-
}
28+
h2 {
29+
@apply text-xl; /* 21px */
30+
@apply font-bold;
31+
@apply leading-p1 tracking-tightest;
32+
}
3233

33-
h3 {
34-
@apply text-lg; /* 18px */
35-
@apply font-bold;
36-
@apply tracking-tightest;
37-
}
34+
h3 {
35+
@apply text-lg; /* 18px */
36+
@apply font-bold;
37+
@apply tracking-tightest;
38+
}
3839

39-
h4 {
40-
@apply text-md; /* 16 px */
41-
@apply leading-p2 tracking-tightest;
42-
}
40+
h4 {
41+
@apply text-md; /* 16 px */
42+
@apply leading-p2 tracking-tightest;
43+
}
4344

44-
h5 {
45-
@apply text-base; /* 14 px */
46-
@apply leading-p2 tracking-tightest;
47-
}
45+
h5 {
46+
@apply text-base; /* 14 px */
47+
@apply leading-p2 tracking-tightest;
48+
}
4849

49-
h6 {
50-
@apply text-sm; /* 14 px */
51-
@apply leading-p3 tracking-tightest;
52-
}
50+
h6 {
51+
@apply text-sm; /* 14 px */
52+
@apply leading-p3 tracking-tightest;
53+
}
5354

54-
.p1 {
55-
@apply text-md; /* 16px */
56-
@apply leading-p1 tracking-tightest;
57-
}
55+
.p1 {
56+
@apply text-md; /* 16px */
57+
@apply leading-p1 tracking-tightest;
58+
}
5859

59-
.p2 {
60-
@apply text-base; /* 14px */
61-
@apply leading-p2 tracking-tightest;
62-
}
60+
.p2 {
61+
@apply text-base; /* 14px */
62+
@apply leading-p2 tracking-tightest;
63+
}
6364

64-
.p3 {
65-
@apply text-sm; /* 12px */
66-
@apply leading-p3 tracking-tightest;
67-
}
65+
.p3 {
66+
@apply text-sm; /* 12px */
67+
@apply leading-p3 tracking-tightest;
68+
}
6869

69-
.ui-badge .icon {
70-
position: relative;
71-
top: -1px;
72-
}
70+
.ui-badge .icon {
71+
position: relative;
72+
top: -1px;
73+
}
7374

74-
.font-bold {
75-
@apply antialiased;
75+
.font-bold {
76+
@apply antialiased;
77+
}
7678
}

‎index.d.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ export {
129129
QuestionnaireIcon,
130130
RangeSlider,
131131
ReceiptIcon,
132+
RelativeDateRange,
132133
RefreshIcon,
133134
RosterIcon,
134135
RoundedSquareIcon,

0 commit comments

Comments
 (0)