Skip to content

Commit

Permalink
fix background and upgrade version for release
Browse files Browse the repository at this point in the history
  • Loading branch information
saramiap committed Apr 30, 2024
1 parent c48f765 commit 9bb8789
Show file tree
Hide file tree
Showing 16 changed files with 76 additions and 70 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
8 changes: 4 additions & 4 deletions examples/mobile/android/link-assets-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
"data": [
{
"path": "../../node_modules/@trilogy-ds/assets/lib/fonts/ttf/poppins-bold.ttf",
"sha1": "da39a3ee5e6b4b0d3255bfef95601890afd80709"
"sha1": "875cf0cecd647bcf22e79d633d868c1b1ec98dfa"
},
{
"path": "../../node_modules/@trilogy-ds/assets/lib/fonts/ttf/poppins-medium.ttf",
"sha1": "da39a3ee5e6b4b0d3255bfef95601890afd80709"
"sha1": "283f21b44efbdbf276ba802be2d949a36bbc4233"
},
{
"path": "../../node_modules/@trilogy-ds/assets/lib/fonts/ttf/poppins-regular.ttf",
"sha1": "da39a3ee5e6b4b0d3255bfef95601890afd80709"
"sha1": "fdd3002e7d814ee47c1c1b8487c72c6bbb3a2d00"
},
{
"path": "../../node_modules/@trilogy-ds/assets/lib/fonts/ttf/poppins-semibold.ttf",
"sha1": "da39a3ee5e6b4b0d3255bfef95601890afd80709"
"sha1": "8a4ace9392d06bcb7f8ea2f5169b07e4c383a90d"
}
]
}
8 changes: 4 additions & 4 deletions examples/mobile/ios/link-assets-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
"data": [
{
"path": "../../node_modules/@trilogy-ds/assets/lib/fonts/ttf/poppins-bold.ttf",
"sha1": "da39a3ee5e6b4b0d3255bfef95601890afd80709"
"sha1": "875cf0cecd647bcf22e79d633d868c1b1ec98dfa"
},
{
"path": "../../node_modules/@trilogy-ds/assets/lib/fonts/ttf/poppins-medium.ttf",
"sha1": "da39a3ee5e6b4b0d3255bfef95601890afd80709"
"sha1": "283f21b44efbdbf276ba802be2d949a36bbc4233"
},
{
"path": "../../node_modules/@trilogy-ds/assets/lib/fonts/ttf/poppins-regular.ttf",
"sha1": "da39a3ee5e6b4b0d3255bfef95601890afd80709"
"sha1": "fdd3002e7d814ee47c1c1b8487c72c6bbb3a2d00"
},
{
"path": "../../node_modules/@trilogy-ds/assets/lib/fonts/ttf/poppins-semibold.ttf",
"sha1": "da39a3ee5e6b4b0d3255bfef95601890afd80709"
"sha1": "8a4ace9392d06bcb7f8ea2f5169b07e4c383a90d"
}
]
}
32 changes: 16 additions & 16 deletions examples/mobile/ios/mobile.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@

/* Begin PBXBuildFile section */
00E356F31AD99517003FC87E /* mobileTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* mobileTests.m */; };
1042F44948434C5BBBBBA927 /* poppins-semibold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E82D29C4001E4B98A04752C8 /* poppins-semibold.ttf */; };
13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
3371BE20F7DD0B74E30764D1 /* libPods-mobile-mobileTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DF92BD080ABE1C428CC6C27 /* libPods-mobile-mobileTests.a */; };
51711AA02FDC4A3EAC72F2E8 /* poppins-regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 39412D012C7B42729E7025B4 /* poppins-regular.ttf */; };
577149A71B0C41A8822613D2 /* poppins-medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C2D59AFCCD8348ADB003F0F4 /* poppins-medium.ttf */; };
80C4062C8BC347587BEB983C /* libPods-mobile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 482FF49AB0073B44D856E475 /* libPods-mobile.a */; };
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
99DA179A6F8E47A3B2958B07 /* poppins-bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 64A035288FD84C999C9653A9 /* poppins-bold.ttf */; };
38CC72CCB89541D9BB981D47 /* poppins-bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3F0B14C312F049EC96BE998E /* poppins-bold.ttf */; };
86C9997DE0514596B2DF011F /* poppins-medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5A52BB194E1C46D990E75A5E /* poppins-medium.ttf */; };
21CB18AB12064015ACCED963 /* poppins-regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 12742FEDB2044517AA235D2F /* poppins-regular.ttf */; };
800F25BB93064DF9B6A345F1 /* poppins-semibold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FC45F2891F654F61B834167D /* poppins-semibold.ttf */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -42,16 +42,16 @@
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = mobile/main.m; sourceTree = "<group>"; };
13F3ECF40D54B87EA2D14D2D /* Pods-mobile.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-mobile.debug.xcconfig"; path = "Target Support Files/Pods-mobile/Pods-mobile.debug.xcconfig"; sourceTree = "<group>"; };
2DF92BD080ABE1C428CC6C27 /* libPods-mobile-mobileTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-mobile-mobileTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
39412D012C7B42729E7025B4 /* poppins-regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "poppins-regular.ttf"; path = "../../../node_modules/@trilogy-ds/assets/lib/fonts/ttf/poppins-regular.ttf"; sourceTree = "<group>"; };
482FF49AB0073B44D856E475 /* libPods-mobile.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-mobile.a"; sourceTree = BUILT_PRODUCTS_DIR; };
64A035288FD84C999C9653A9 /* poppins-bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "poppins-bold.ttf"; path = "../../../node_modules/@trilogy-ds/assets/lib/fonts/ttf/poppins-bold.ttf"; sourceTree = "<group>"; };
74F5C4D2108852BC1E7491EC /* Pods-mobile-mobileTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-mobile-mobileTests.debug.xcconfig"; path = "Target Support Files/Pods-mobile-mobileTests/Pods-mobile-mobileTests.debug.xcconfig"; sourceTree = "<group>"; };
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = mobile/LaunchScreen.storyboard; sourceTree = "<group>"; };
84EFA559DA33BE4E7F84E533 /* Pods-mobile-mobileTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-mobile-mobileTests.release.xcconfig"; path = "Target Support Files/Pods-mobile-mobileTests/Pods-mobile-mobileTests.release.xcconfig"; sourceTree = "<group>"; };
C136A1CF80277E7F9C861A8C /* Pods-mobile.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-mobile.release.xcconfig"; path = "Target Support Files/Pods-mobile/Pods-mobile.release.xcconfig"; sourceTree = "<group>"; };
C2D59AFCCD8348ADB003F0F4 /* poppins-medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "poppins-medium.ttf"; path = "../../../node_modules/@trilogy-ds/assets/lib/fonts/ttf/poppins-medium.ttf"; sourceTree = "<group>"; };
E82D29C4001E4B98A04752C8 /* poppins-semibold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "poppins-semibold.ttf"; path = "../../../node_modules/@trilogy-ds/assets/lib/fonts/ttf/poppins-semibold.ttf"; sourceTree = "<group>"; };
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
3F0B14C312F049EC96BE998E /* poppins-bold.ttf */ = {isa = PBXFileReference; name = "poppins-bold.ttf"; path = "../../../node_modules/@trilogy-ds/assets/lib/fonts/ttf/poppins-bold.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
5A52BB194E1C46D990E75A5E /* poppins-medium.ttf */ = {isa = PBXFileReference; name = "poppins-medium.ttf"; path = "../../../node_modules/@trilogy-ds/assets/lib/fonts/ttf/poppins-medium.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
12742FEDB2044517AA235D2F /* poppins-regular.ttf */ = {isa = PBXFileReference; name = "poppins-regular.ttf"; path = "../../../node_modules/@trilogy-ds/assets/lib/fonts/ttf/poppins-regular.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
FC45F2891F654F61B834167D /* poppins-semibold.ttf */ = {isa = PBXFileReference; name = "poppins-semibold.ttf"; path = "../../../node_modules/@trilogy-ds/assets/lib/fonts/ttf/poppins-semibold.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -149,10 +149,10 @@
9453D6895A8A4C60A85663D3 /* Resources */ = {
isa = PBXGroup;
children = (
64A035288FD84C999C9653A9 /* poppins-bold.ttf */,
C2D59AFCCD8348ADB003F0F4 /* poppins-medium.ttf */,
39412D012C7B42729E7025B4 /* poppins-regular.ttf */,
E82D29C4001E4B98A04752C8 /* poppins-semibold.ttf */,
3F0B14C312F049EC96BE998E /* poppins-bold.ttf */,
5A52BB194E1C46D990E75A5E /* poppins-medium.ttf */,
12742FEDB2044517AA235D2F /* poppins-regular.ttf */,
FC45F2891F654F61B834167D /* poppins-semibold.ttf */,
);
name = Resources;
sourceTree = "<group>";
Expand Down Expand Up @@ -263,10 +263,10 @@
files = (
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
99DA179A6F8E47A3B2958B07 /* poppins-bold.ttf in Resources */,
577149A71B0C41A8822613D2 /* poppins-medium.ttf in Resources */,
51711AA02FDC4A3EAC72F2E8 /* poppins-regular.ttf in Resources */,
1042F44948434C5BBBBBA927 /* poppins-semibold.ttf in Resources */,
38CC72CCB89541D9BB981D47 /* poppins-bold.ttf in Resources */,
86C9997DE0514596B2DF011F /* poppins-medium.ttf in Resources */,
21CB18AB12064015ACCED963 /* poppins-regular.ttf in Resources */,
800F25BB93064DF9B6A345F1 /* poppins-semibold.ttf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/assets/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trilogy-ds/assets",
"version": "0.0.1-beta.12",
"version": "0.0.1-beta.13",
"description": "Trilogy assets include all Open Source Fonts & Icons",
"author": "Bouygues Telecom",
"type": "module",
Expand Down
2 changes: 1 addition & 1 deletion packages/react/components/card/Card.native.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const Card = ({
floating,
onClick,
skeleton,
backgroundColor = TrilogyColor.WHITE,
backgroundColor = TrilogyColor.BACKGROUND,
reversed,
fullheight,
active,
Expand Down
38 changes: 22 additions & 16 deletions packages/react/components/card/CardProps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,28 @@ import { JustifiableProps } from '../../objects/facets/Justifiable'
*/

export enum CardMarkup {
DIV = 'div',
A = 'a',
DIV = "div",
A = "a",
}

export type CardMarkupValues = keyof typeof CardMarkup
export interface CardProps extends AlignableProps, Fullheight, JustifiableProps, Clickable, Accessibility {
children?: React.ReactNode
flat?: boolean
horizontal?: boolean
floating?: boolean
skeleton?: boolean
className?: string
onClick?: ClickEvent
markup?: CardMarkup | CardMarkupValues
backgroundColor?: TrilogyColor.WHITE | 'transparent'
reversed?: boolean
to?: string
active?: boolean
export type CardMarkupValues = keyof typeof CardMarkup;

export interface CardProps
extends AlignableProps,
Fullheight,
JustifiableProps,
Clickable,
Accessibility {
children?: React.ReactNode;
flat?: boolean;
horizontal?: boolean;
floating?: boolean;
skeleton?: boolean;
className?: string;
onClick?: ClickEvent;
markup?: CardMarkup | CardMarkupValues;
backgroundColor?: TrilogyColor.BACKGROUND | "transparent";
reversed?: boolean;
to?: string;
active?: boolean;
}
40 changes: 20 additions & 20 deletions packages/react/components/card/content/CardContentProps.ts
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
import { ButtonMarkup, ButtonMarkupValues, ButtonVariant, ButtonVariantValues } from '../../button/ButtonEnum'
import { TitleLevels, TitleLevelValues } from '../../title/TitleEnum'
import { TextLevelValues } from '../../text/TextEnum'
import { ClickEvent } from '../../../events/OnClickEvent'
import { Accessibility, Clickable, TrilogyColor } from '../../../objects'
import { ButtonMarkup, ButtonMarkupValues, ButtonVariant, ButtonVariantValues, } from "../../button/ButtonEnum"
import { TitleLevels, TitleLevelValues } from "../../title/TitleEnum"
import { TextLevelValues } from "../../text/TextEnum"
import { ClickEvent } from "../../../events/OnClickEvent"
import { Accessibility, Clickable, TrilogyColor } from "../../../objects"

/**
* Card Content Interface
*/
export interface CardContentProps extends Clickable, Accessibility {
children?: React.ReactNode
titleSup?: string
titleSupLevel?: TextLevelValues
title?: string
titleLevel?: TitleLevels | TitleLevelValues
buttonText?: string
text?: string
textLevel?: TextLevelValues
buttonVariant?: ButtonVariant | ButtonVariantValues
buttonClick?: ClickEvent
className?: string
buttonMarkup?: ButtonMarkup | ButtonMarkupValues
onClick?: ClickEvent
children?: React.ReactNode;
titleSup?: string;
titleSupLevel?: TextLevelValues;
title?: string;
titleLevel?: TitleLevels | TitleLevelValues;
buttonText?: string;
text?: string;
textLevel?: TextLevelValues;
buttonVariant?: ButtonVariant | ButtonVariantValues;
buttonClick?: ClickEvent;
className?: string;
buttonMarkup?: ButtonMarkup | ButtonMarkupValues;
onClick?: ClickEvent;

floating?: boolean
backgroundColor?: TrilogyColor.WHITE | 'transparent'
floating?: boolean;
backgroundColor?: TrilogyColor.BACKGROUND | "transparent";
}
2 changes: 1 addition & 1 deletion packages/react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trilogy-ds/react",
"version": "0.0.1-beta.12",
"version": "0.0.1-beta.13",
"type": "module",
"author": "Bouygues Telecom",
"files": [
Expand Down
2 changes: 1 addition & 1 deletion packages/react/version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const version = "0.0.1-beta.12"
export const version = "0.0.1-beta.13"
2 changes: 1 addition & 1 deletion packages/styles/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trilogy-ds/styles",
"version": "0.0.1-beta.12",
"version": "0.0.1-beta.13",
"author": "Bouygues Telecom",
"license": "UNLICENSED",
"files": [
Expand Down
2 changes: 1 addition & 1 deletion packages/vanilla/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trilogy-ds/vanilla",
"version": "0.0.1-beta.12",
"version": "0.0.1-beta.13",
"author": "Bouygues Telecom",
"main": "lib/trilogy-ds-vanilla.js",
"scripts": {
Expand Down

0 comments on commit 9bb8789

Please sign in to comment.