Skip to content

Commit 9392a15

Browse files
exponentChoiexponentChoi
authored
[Etc] Color, Font 새로운 요소 추가 및 수정 (#11)
* [Etc] Palette 추가 [description] grey50_80, grey850_80 * [Etc] SemanticColor 추가 [description] bgGreyDimLightest * [Etc] BezierFont 추가 및 LineSpacing 수정 [description] - Normal-30, Bold-30 추가 - LineSpacing 계산 후 일괄 수정
1 parent a8fd239 commit 9392a15

File tree

3 files changed

+36
-20
lines changed

3 files changed

+36
-20
lines changed

‎Sources/BezierSwift/Foundation/Color/Palette.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public enum Palette {
4040
public static let grey900 = Color(r: 36, g: 36, b: 40, alpha: 1.0)
4141
public static let grey900_90 = Color(r: 36, g: 36, b: 40, alpha: 0.9)
4242
public static let grey850 = Color(r: 42, g: 43, b: 45, alpha: 1.0)
43+
public static let grey850_80 = Color(r: 42, g: 43, b: 45, alpha: 0.8)
4344
public static let grey800 = Color(r: 49, g: 50, b: 52, alpha: 1.0)
4445
public static let grey800_80 = Color(r: 49, g: 50, b: 52, alpha: 0.8)
4546
public static let grey700 = Color(r: 70, g: 71, b: 72, alpha: 1.0)
@@ -51,6 +52,7 @@ public enum Palette {
5152
public static let grey100_90 = Color(r: 247, g: 247, b: 248, alpha: 0.9)
5253
public static let grey100_80 = Color(r: 247, g: 247, b: 248, alpha: 0.8)
5354
public static let grey50 = Color(r: 252, g: 252, b: 252, alpha: 1.0)
55+
public static let grey50_80 = Color(r: 252, g: 252, b: 252, alpha: 0.8)
5456

5557
public static let blue500 = Color(r: 78, g: 64, b: 201, alpha: 1.0)
5658
public static let blue400 = Color(r: 94, g: 86, b: 240, alpha: 1.0)

‎Sources/BezierSwift/Foundation/Color/SemanticColor.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public enum SemanticColor {
2727
case bgGreyLight
2828
case bgGreyLighter
2929
case bgGreyLightest
30+
case bgGreyDimLightest
3031
case bgGnb
3132
case bgNavi
3233
case bgHeaderFloat
@@ -175,6 +176,7 @@ extension SemanticColor {
175176
case .bgGreyLight: return (Palette.grey200, Palette.grey700)
176177
case .bgGreyLighter: return (Palette.grey100, Palette.grey800)
177178
case .bgGreyLightest: return (Palette.grey50, Palette.grey850)
179+
case .bgGreyDimLightest: return (Palette.grey50_80, Palette.grey850_80)
178180
case .bgGnb: return (Palette.grey200_80, Palette.grey700_80)
179181
case .bgNavi: return (Palette.grey100_80, Palette.grey800_80)
180182
case .bgHeaderFloat: return (Palette.white_90, Palette.grey800_80)

‎Sources/BezierSwift/Foundation/Typography/Font.swift‎

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ public enum BezierFont {
2828
case bold22
2929
case normal24
3030
case bold24
31+
case normal30
32+
case bold30
3133
case bold36
3234
case bold44
3335
}
@@ -55,6 +57,8 @@ public extension BezierFont {
5557
case .bold22: return self.getBoldFont(size: 22)
5658
case .normal24: return self.getNormalFont(size: 24)
5759
case .bold24: return self.getBoldFont(size: 24)
60+
case .normal30: return self.getNormalFont(size: 30)
61+
case .bold30: return self.getBoldFont(size: 30)
5862
case .bold36: return self.getBoldFont(size: 36)
5963
case .bold44: return self.getBoldFont(size: 44)
6064
}
@@ -82,35 +86,39 @@ public extension BezierFont {
8286
case .bold22: return CGFloat(28)
8387
case .normal24: return CGFloat(32)
8488
case .bold24: return CGFloat(32)
89+
case .normal30: return CGFloat(36)
90+
case .bold30: return CGFloat(36)
8591
case .bold36: return CGFloat(44)
8692
case .bold44: return CGFloat(53)
8793
}
8894
}
8995

9096
var lineSpacing: CGFloat {
9197
switch self {
92-
case .normal11: return CGFloat(2.7)
93-
case .bold11: return CGFloat(2.7)
94-
case .normal12: return CGFloat(1.5)
95-
case .bold12: return CGFloat(1.5)
96-
case .normal13: return CGFloat(2.5)
97-
case .bold13: return CGFloat(2.5)
98-
case .normal14: return CGFloat(1.4)
99-
case .bold14: return CGFloat(1.4)
98+
case .normal11: return CGFloat(2.6)
99+
case .bold11: return CGFloat(2.6)
100+
case .normal12: return CGFloat(1.6)
101+
case .bold12: return CGFloat(1.6)
102+
case .normal13: return CGFloat(2.3)
103+
case .bold13: return CGFloat(2.3)
104+
case .normal14: return CGFloat(1)
105+
case .bold14: return CGFloat(1)
100106
case .normal15: return CGFloat(2)
101107
case .bold15: return CGFloat(2)
102-
case .normal16: return CGFloat(3)
103-
case .bold16: return CGFloat(3)
104-
case .normal17: return CGFloat(1.8)
105-
case .bold17: return CGFloat(1.8)
106-
case .normal18: return CGFloat(2.5)
107-
case .bold18: return CGFloat(2.5)
108-
case .normal22: return CGFloat(1.8)
109-
case .bold22: return CGFloat(1.8)
110-
case .normal24: return CGFloat(3.2)
111-
case .bold24: return CGFloat(3.2)
112-
case .bold36: return CGFloat(1.1)
113-
case .bold44: return CGFloat(0.5)
108+
case .normal16: return CGFloat(2.6)
109+
case .bold16: return CGFloat(2.6)
110+
case .normal17: return CGFloat(1.6)
111+
case .bold17: return CGFloat(1.6)
112+
case .normal18: return CGFloat(2.3)
113+
case .bold18: return CGFloat(2.3)
114+
case .normal22: return CGFloat(1.6)
115+
case .bold22: return CGFloat(1.6)
116+
case .normal24: return CGFloat(3.3)
117+
case .bold24: return CGFloat(3.3)
118+
case .normal30: return CGFloat(0)
119+
case .bold30: return CGFloat(0)
120+
case .bold36: return CGFloat(1)
121+
case .bold44: return CGFloat(0.3)
114122
}
115123
}
116124

@@ -140,6 +148,8 @@ public extension BezierFont {
140148
case .bold22: return -CGFloat(0.4)
141149
case .normal24: return -CGFloat(0.4)
142150
case .bold24: return -CGFloat(0.4)
151+
case .normal30: return -CGFloat(0.4)
152+
case .bold30: return -CGFloat(0.4)
143153
case .bold36: return -CGFloat(1.0)
144154
case .bold44: return -CGFloat(1.0)
145155
}
@@ -158,6 +168,8 @@ private extension BezierFont {
158168
case .normal17: return .bold17
159169
case .normal18: return .bold18
160170
case .normal22: return .bold22
171+
case .normal24: return .bold24
172+
case .normal30: return .bold30
161173
default: return self
162174
}
163175
}

0 commit comments

Comments
 (0)