Merge branch 'hotfix/remove-color-from-typograhies' into main

Giveth · Oct 11, 2021 · cb58fc9 · cb58fc9
2 parents a3608aa + 477e869
commit cb58fc9
Show file tree

Hide file tree

Showing 20 changed files with 2 additions and 37 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@giveth/ui-design-system",
-  "version": "0.1.1",
+  "version": "1.0.1",
   "files": [
     "dist"
   ],

diff --git a/src/components/typography/ButtonText.tsx b/src/components/typography/ButtonText.tsx
@@ -1,5 +1,4 @@
 import styled from "styled-components";
-import { brandColors } from "../../common/colors";
 
 export interface IButtonTextProps {
     size?: 'small' | 'medium' | 'large';

diff --git a/src/components/typography/GLink.tsx b/src/components/typography/GLink.tsx
@@ -1,5 +1,4 @@
 import styled from "styled-components";
-import { brandColors } from "../../common/colors";
 
 export interface IGLinkProps {
     size?: 'Tiny' | 'Small' | 'Medium' | 'Big';
@@ -24,6 +23,4 @@ export const GLink = styled.a<IGLinkProps>`
                 break;
         }
     }}
-    
-    color: ${brandColors.deep[900]};
 `;
diff --git a/src/components/typography/Overline.tsx b/src/components/typography/Overline.tsx
@@ -1,5 +1,4 @@
 import styled from "styled-components";
-import { brandColors } from "../../common/colors";
 
 export interface IOverlineProps {
     styleType?: 'Small' | 'Regular' | 'Italic';
@@ -20,5 +19,4 @@ export const Overline = styled.a<IOverlineProps>`
                 break;
         }
     }}
-    color: ${brandColors.deep[900]};
 `;
diff --git a/src/components/typography/body/Caption.tsx b/src/components/typography/body/Caption.tsx
@@ -1,5 +1,4 @@
 import styled from "styled-components";
-import { brandColors } from "../../../common/colors";
 
 export interface ICaptionProps {
     medium?: boolean;
@@ -12,5 +11,4 @@ export const Caption = styled.div<ICaptionProps>`
     font-weight: ${props => props.medium ? 500 : 400};
     font-size: 14px;
     line-height: 150%;
-    color: ${brandColors.deep[900]};
 `;
diff --git a/src/components/typography/body/Lead.tsx b/src/components/typography/body/Lead.tsx
@@ -1,5 +1,4 @@
 import styled from "styled-components";
-import { brandColors } from "../../../common/colors";
 
 export const Lead = styled.div`
     /* Body/Lead */
@@ -8,5 +7,4 @@ export const Lead = styled.div`
     font-weight: normal;
     font-size: 20px;
     line-height: 150%;
-    color: ${brandColors.deep[900]};
 `;
diff --git a/src/components/typography/body/P.tsx b/src/components/typography/body/P.tsx
@@ -1,5 +1,4 @@
 import styled from "styled-components";
-import { brandColors } from "../../../common/colors";
 
 export const P = styled.div`
     /* Body/P */
@@ -8,5 +7,4 @@ export const P = styled.div`
     font-weight: normal;
     font-size: 16px;
     line-height: 150%;
-    color: ${brandColors.deep[900]};
 `;
diff --git a/src/components/typography/body/SemiTitle.tsx b/src/components/typography/body/SemiTitle.tsx
@@ -1,5 +1,4 @@
 import styled from "styled-components";
-import { brandColors } from "../../../common/colors";
 
 export const SemiTitle = styled.div`
     /* Body/SEMI-TITLE */
@@ -9,5 +8,4 @@ export const SemiTitle = styled.div`
     font-size: 16px;
     line-height: 150%;
     text-transform: uppercase;
-    color: ${brandColors.deep[900]};
 `;
diff --git a/src/components/typography/body/Subline.tsx b/src/components/typography/body/Subline.tsx
@@ -1,5 +1,4 @@
 import styled from "styled-components";
-import { brandColors } from "../../../common/colors";
 
 export const Subline = styled.div`
     /* Body/Subline */
@@ -8,5 +7,4 @@ export const Subline = styled.div`
     font-weight: normal;
     font-size: 12px;
     line-height: 150%;
-    color: ${brandColors.deep[900]};
 `;
diff --git a/src/components/typography/body/Title.tsx b/src/components/typography/body/Title.tsx
@@ -1,5 +1,4 @@
 import styled from "styled-components";
-import { brandColors } from "../../../common/colors";
 
 export const Title = styled.div`
     /* Body/Title */
@@ -9,5 +8,4 @@ export const Title = styled.div`
     font-size: 32px;
     line-height: 42px;
     letter-spacing: -0.01em;
-    color: ${brandColors.deep[900]};
 `;
diff --git a/src/components/typography/displays/D1.tsx b/src/components/typography/displays/D1.tsx
@@ -1,5 +1,4 @@
 import styled from "styled-components";
-import { brandColors } from "../../../common/colors";
 
 export const D1 = styled.div`
     /* Display/D1 */
@@ -9,5 +8,4 @@ export const D1 = styled.div`
     font-size: 107px;
     line-height: 130%;
     letter-spacing: -0.04em;
-    color: ${brandColors.deep[900]};
 `;
diff --git a/src/components/typography/displays/D2.tsx b/src/components/typography/displays/D2.tsx
@@ -1,5 +1,4 @@
 import styled from "styled-components";
-import { brandColors } from "../../../common/colors";
 
 export const D2 = styled.div`
     /* Display/D2 */
@@ -9,5 +8,4 @@ export const D2 = styled.div`
     font-size: 97px;
     line-height: 130%;
     letter-spacing: -0.04em;
-    color: ${brandColors.deep[900]};
 `;
diff --git a/src/components/typography/displays/D3.tsx b/src/components/typography/displays/D3.tsx
@@ -1,5 +1,4 @@
 import styled from "styled-components";
-import { brandColors } from "../../../common/colors";
 
 export const D3 = styled.div`
     /* Display/D3 */
@@ -9,5 +8,4 @@ export const D3 = styled.div`
     font-size: 88px;
     line-height: 120%;
     letter-spacing: -0.04em;
-    color: ${brandColors.deep[900]};
 `;
diff --git a/src/components/typography/headlines/H1.tsx b/src/components/typography/headlines/H1.tsx
@@ -1,5 +1,4 @@
 import styled from "styled-components";
-import { brandColors } from "../../../common/colors";
 import { IHeadingProps } from "./common";
 
 export const H1 = styled.h1<IHeadingProps>`
@@ -10,5 +9,4 @@ export const H1 = styled.h1<IHeadingProps>`
     font-size: 66px;
     line-height: 130%;
     letter-spacing: -0.03em;
-    color: ${brandColors.deep[900]};
 `;
diff --git a/src/components/typography/headlines/H2.tsx b/src/components/typography/headlines/H2.tsx
@@ -1,5 +1,4 @@
 import styled from "styled-components";
-import { brandColors } from "../../../common/colors";
 import { IHeadingProps } from "./common";
 
 export const H2 = styled.h2<IHeadingProps>`
@@ -10,5 +9,4 @@ export const H2 = styled.h2<IHeadingProps>`
     font-size: 52px;
     line-height: 76px;
     letter-spacing: -0.02em;
-    color: ${brandColors.deep[900]};
 `;
diff --git a/src/components/typography/headlines/H3.tsx b/src/components/typography/headlines/H3.tsx
@@ -1,5 +1,4 @@
 import styled from "styled-components";
-import { brandColors } from "../../../common/colors";
 import { IHeadingProps } from "./common";
 
 export const H3 = styled.h3<IHeadingProps>`
@@ -9,5 +8,4 @@ export const H3 = styled.h3<IHeadingProps>`
     font-weight: ${props => props.weight || 500};
     font-size: 41px;
     line-height: 60px;
-    color: ${brandColors.deep[900]};
 `;
diff --git a/src/components/typography/headlines/H4.tsx b/src/components/typography/headlines/H4.tsx
@@ -1,5 +1,4 @@
 import styled from "styled-components";
-import { brandColors } from "../../../common/colors";
 import { IHeadingProps } from "./common";
 
 export const H4 = styled.h4<IHeadingProps>`
@@ -10,5 +9,4 @@ export const H4 = styled.h4<IHeadingProps>`
     font-size: 32px;
     line-height: 47px;
     letter-spacing: -0.01em;
-    color: ${brandColors.deep[900]};
 `;
diff --git a/src/components/typography/headlines/H5.tsx b/src/components/typography/headlines/H5.tsx
@@ -1,5 +1,4 @@
 import styled from "styled-components";
-import { brandColors } from "../../../common/colors";
 import { IHeadingProps } from "./common";
 
 export const H5 = styled.h5<IHeadingProps>`
@@ -10,5 +9,4 @@ export const H5 = styled.h5<IHeadingProps>`
     font-size: 25px;
     line-height: 36px;
     letter-spacing: -0.005em;
-    color: ${brandColors.deep[900]};
 `;
diff --git a/src/components/typography/headlines/H6.tsx b/src/components/typography/headlines/H6.tsx
@@ -1,5 +1,4 @@
 import styled from "styled-components";
-import { brandColors } from "../../../common/colors";
 import { IHeadingProps } from "./common";
 
 export const H6 = styled.h6<IHeadingProps>`
@@ -10,5 +9,4 @@ export const H6 = styled.h6<IHeadingProps>`
     font-size: 18px;
     line-height: 26px;
     letter-spacing: -0.005em;
-    color: ${brandColors.deep[900]};
 `;
diff --git a/src/index.ts b/src/index.ts
@@ -1 +1,2 @@
 export * from "./components";
+export * from "./common/colors";