Skip to content

Commit 940ceb4

Browse files
yceffortyceffort
authored
Merge pull request #11 from titicacadev/bugfix/condition-check-image-carousel
🐛 캐러셀 & 이미지 오버레이 버그 수정
2 parents e5f62cb + bc6b8b4 commit 940ceb4

File tree

13 files changed

+31
-31
lines changed

13 files changed

+31
-31
lines changed

‎docs/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"name": "@titicaca/triple-frontend-docs",
3-
"version": "1.0.0-alpha.4",
3+
"version": "1.0.0-alpha.5",
44
"private": true,
55
"description": "Documentation project for triple-frontend packages",
66
"scripts": {
77
"dev": "start-storybook -p 6006 -s ./public",
88
"build": "build-storybook -s ./public"
99
},
1010
"dependencies": {
11-
"@titicaca/triple-author": "^1.0.0-alpha.4",
12-
"@titicaca/triple-design-system": "^1.0.0-alpha.4",
13-
"@titicaca/triple-document": "^1.0.0-alpha.4",
14-
"@titicaca/triple-poi": "^1.0.0-alpha.4"
11+
"@titicaca/triple-author": "^1.0.0-alpha.5",
12+
"@titicaca/triple-design-system": "^1.0.0-alpha.5",
13+
"@titicaca/triple-document": "^1.0.0-alpha.5",
14+
"@titicaca/triple-poi": "^1.0.0-alpha.5"
1515
},
1616
"devDependencies": {
1717
"@storybook/addon-actions": "^5.0.3",

‎lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
"packages/*",
55
"tests"
66
],
7-
"version": "1.0.0-alpha.4"
7+
"version": "1.0.0-alpha.5"
88
}

‎packages/triple-author/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@titicaca/triple-author",
3-
"version": "1.0.0-alpha.4",
3+
"version": "1.0.0-alpha.5",
44
"description": "Triple Author UI elements",
55
"homepage": "https://github.com/titicacadev/triple-frontend#readme",
66
"main": "lib/index.js",
@@ -15,6 +15,6 @@
1515
"url": "https://github.com/titicacadev/triple-frontend/issues"
1616
},
1717
"dependencies": {
18-
"@titicaca/triple-design-system": "^1.0.0-alpha.4"
18+
"@titicaca/triple-design-system": "^1.0.0-alpha.5"
1919
}
2020
}

‎packages/triple-design-system/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@titicaca/triple-design-system",
3-
"version": "1.0.0-alpha.4",
3+
"version": "1.0.0-alpha.5",
44
"description": "Triple Design System Library",
55
"main": "lib/index.js",
66
"types": "lib/index.d.ts",
@@ -23,7 +23,7 @@
2323
},
2424
"homepage": "https://github.com/titicacadev/triple-design-system#readme",
2525
"dependencies": {
26-
"@titicaca/triple-view-utilities": "^1.0.0-alpha.4",
26+
"@titicaca/triple-view-utilities": "^1.0.0-alpha.5",
2727
"nuka-carousel": "4.4.1",
2828
"react-addons-css-transition-group": "^15.6.2",
2929
"react-input-mask": "^2.0.4"

‎packages/triple-design-system/src/elements/image.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import * as CSS from 'csstype'
77
type OverlayType = 'gradient' | 'dark'
88

99
const OverlayStyle: { [key in OverlayType]: InterpolationValue[] } = {
10-
gradient: css`
10+
dark: css`
1111
background-color: rgba(0, 0, 0, 0.8);
1212
`,
13-
dark: css`
13+
gradient: css`
1414
background-image: linear-gradient(
1515
to bottom,
1616
rgba(0, 0, 0, 0.6),

‎packages/triple-document/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@titicaca/triple-document",
3-
"version": "1.0.0-alpha.4",
3+
"version": "1.0.0-alpha.5",
44
"description": "TripleDocument: Formatted Content System",
55
"main": "lib/index.js",
66
"files": [
@@ -15,7 +15,7 @@
1515
},
1616
"homepage": "https://github.com/titicacadev/triple-frontend#readme",
1717
"dependencies": {
18-
"@titicaca/triple-design-system": "^1.0.0-alpha.4",
19-
"@titicaca/triple-poi": "^1.0.0-alpha.4"
18+
"@titicaca/triple-design-system": "^1.0.0-alpha.5",
19+
"@titicaca/triple-poi": "^1.0.0-alpha.5"
2020
}
2121
}

‎packages/triple-image-carousel/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@titicaca/triple-image-carousel",
3-
"version": "1.0.0-alpha.4",
3+
"version": "1.0.0-alpha.5",
44
"description": "Triple Image Carousel",
55
"main": "lib/index.js",
66
"files": [
@@ -15,7 +15,7 @@
1515
},
1616
"homepage": "https://github.com/titicacadev/triple-frontend#readme",
1717
"dependencies": {
18-
"@titicaca/triple-design-system": "^1.0.0-alpha.4",
18+
"@titicaca/triple-design-system": "^1.0.0-alpha.5",
1919
"nuka-carousel": "4.4.1"
2020
}
2121
}

‎packages/triple-image-carousel/src/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ export const ImagePager = ({
8080
ImageSource={ImageSource}
8181
borderRadius={0}
8282
onClick={onImageClick && ((e) => onImageClick(e, image))}
83-
overlay={i === images.length - 1 ? { lastPageOverlayContent } : null}
83+
overlay={(i === images.length - 1 && lastPageOverlayContent) || null}
8484
overlayType="dark"
8585
/>
8686
)

‎packages/triple-poi/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@titicaca/triple-poi",
3-
"version": "1.0.0-alpha.4",
3+
"version": "1.0.0-alpha.5",
44
"description": "Triple POI UI Elements",
55
"main": "lib/index.js",
66
"files": [
@@ -15,7 +15,7 @@
1515
},
1616
"homepage": "https://github.com/titicacadev/triple-frontend#readme",
1717
"dependencies": {
18-
"@titicaca/triple-design-system": "^1.0.0-alpha.4",
19-
"@titicaca/triple-view-utilities": "^1.0.0-alpha.4"
18+
"@titicaca/triple-design-system": "^1.0.0-alpha.5",
19+
"@titicaca/triple-view-utilities": "^1.0.0-alpha.5"
2020
}
2121
}

‎packages/triple-product/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@titicaca/triple-product",
3-
"version": "1.0.0-alpha.4",
3+
"version": "1.0.0-alpha.5",
44
"description": "Triple Product UI Elements",
55
"main": "lib/index.js",
66
"files": [
@@ -15,7 +15,7 @@
1515
},
1616
"homepage": "https://github.com/titicacadev/triple-frontend#readme",
1717
"dependencies": {
18-
"@titicaca/triple-design-system": "^1.0.0-alpha.4",
19-
"@titicaca/triple-view-utilities": "^1.0.0-alpha.4"
18+
"@titicaca/triple-design-system": "^1.0.0-alpha.5",
19+
"@titicaca/triple-view-utilities": "^1.0.0-alpha.5"
2020
}
2121
}

‎packages/triple-review/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@titicaca/triple-review",
3-
"version": "1.0.0-alpha.4",
3+
"version": "1.0.0-alpha.5",
44
"description": "UI Components for User Reviews from Triple Service",
55
"homepage": "https://github.com/titicacadev/triple-frontend#readme",
66
"main": "lib/index.js",
@@ -15,6 +15,6 @@
1515
"url": "https://github.com/titicacadev/triple-frontend/issues"
1616
},
1717
"dependencies": {
18-
"@titicaca/triple-design-system": "^1.0.0-alpha.4"
18+
"@titicaca/triple-design-system": "^1.0.0-alpha.5"
1919
}
2020
}

‎packages/triple-view-utilities/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@titicaca/triple-view-utilities",
3-
"version": "1.0.0-alpha.4",
3+
"version": "1.0.0-alpha.5",
44
"description": "Utilities for Triple view libraries and applications",
55
"main": "lib/index.js",
66
"files": [

‎tests/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@titicaca/triple-frontend-tests",
3-
"version": "1.0.0-alpha.4",
3+
"version": "1.0.0-alpha.5",
44
"private": true,
55
"description": "Triple Design Systems Test",
66
"scripts": {
@@ -25,9 +25,9 @@
2525
"webpack-cli": "^3.1.2"
2626
},
2727
"dependencies": {
28-
"@titicaca/triple-author": "^1.0.0-alpha.4",
29-
"@titicaca/triple-design-system": "^1.0.0-alpha.4",
30-
"@titicaca/triple-document": "^1.0.0-alpha.4",
28+
"@titicaca/triple-author": "^1.0.0-alpha.5",
29+
"@titicaca/triple-design-system": "^1.0.0-alpha.5",
30+
"@titicaca/triple-document": "^1.0.0-alpha.5",
3131
"koa": "^2.5.3",
3232
"koa-static": "^5.0.0",
3333
"react": "^16.4.2",

0 commit comments

Comments
 (0)