Skip to content

Commit e962167

Browse files
authored
Merge pull request #42 from eunjooChoi/color-custom
기분 컬러 재지정
2 parents b4c3fb1 + f32cc52 commit e962167

File tree

19 files changed

+91
-40
lines changed

19 files changed

+91
-40
lines changed

PlantingMind/PlantingMind/Assets.xcassets/CustomColor/bad.colorset/Contents.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"color-space" : "srgb",
66
"components" : {
77
"alpha" : "1.000",
8-
"blue" : "0xE4",
9-
"green" : "0xE4",
10-
"red" : "0xE4"
8+
"blue" : "0xC9",
9+
"green" : "0xC9",
10+
"red" : "0xC9"
1111
}
1212
},
1313
"idiom" : "universal"

PlantingMind/PlantingMind/Assets.xcassets/CustomColor/good.colorset/Contents.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"color-space" : "srgb",
66
"components" : {
77
"alpha" : "1.000",
8-
"blue" : "0x56",
9-
"green" : "0xD2",
10-
"red" : "0x88"
8+
"blue" : "0x50",
9+
"green" : "0xED",
10+
"red" : "0x8F"
1111
}
1212
},
1313
"idiom" : "universal"
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0x1B",
27-
"green" : "0xD1",
28-
"red" : "0x21"
26+
"blue" : "0x2F",
27+
"green" : "0xF7",
28+
"red" : "0x36"
2929
}
3030
},
3131
"idiom" : "universal"

PlantingMind/PlantingMind/Assets.xcassets/CustomColor/nice.colorset/Contents.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"color-space" : "srgb",
66
"components" : {
77
"alpha" : "1.000",
8-
"blue" : "0x27",
9-
"green" : "0xCC",
10-
"red" : "0x69"
8+
"blue" : "0xA7",
9+
"green" : "0xFF",
10+
"red" : "0xCA"
1111
}
1212
},
1313
"idiom" : "universal"
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0x00",
27-
"green" : "0xF3",
28-
"red" : "0x08"
26+
"blue" : "0xB2",
27+
"green" : "0xF6",
28+
"red" : "0xB5"
2929
}
3030
},
3131
"idiom" : "universal"

PlantingMind/PlantingMind/Assets.xcassets/CustomColor/normal.colorset/Contents.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"color-space" : "srgb",
66
"components" : {
77
"alpha" : "1.000",
8-
"blue" : "0x86",
9-
"green" : "0xD8",
10-
"red" : "0xA7"
8+
"blue" : "0x4D",
9+
"green" : "0xB1",
10+
"red" : "0x76"
1111
}
1212
},
1313
"idiom" : "universal"
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0x36",
27-
"green" : "0xB0",
28-
"red" : "0x3A"
26+
"blue" : "0x32",
27+
"green" : "0xB6",
28+
"red" : "0x36"
2929
}
3030
},
3131
"idiom" : "universal"

PlantingMind/PlantingMind/Assets.xcassets/CustomColor/notBad.colorset/Contents.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"color-space" : "srgb",
66
"components" : {
77
"alpha" : "1.000",
8-
"blue" : "0xB5",
9-
"green" : "0xDE",
10-
"red" : "0xC5"
8+
"blue" : "0x3B",
9+
"green" : "0x7F",
10+
"red" : "0x56"
1111
}
1212
},
1313
"idiom" : "universal"
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0x51",
27-
"green" : "0x8E",
28-
"red" : "0x53"
26+
"blue" : "0x7D",
27+
"green" : "0xA4",
28+
"red" : "0x7E"
2929
}
3030
},
3131
"idiom" : "universal"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "1.000",
8+
"blue" : "0xB7",
9+
"green" : "0xB7",
10+
"red" : "0xB5"
11+
}
12+
},
13+
"idiom" : "universal"
14+
},
15+
{
16+
"appearances" : [
17+
{
18+
"appearance" : "luminosity",
19+
"value" : "dark"
20+
}
21+
],
22+
"color" : {
23+
"color-space" : "srgb",
24+
"components" : {
25+
"alpha" : "1.000",
26+
"blue" : "0xFF",
27+
"green" : "0xFF",
28+
"red" : "0xFC"
29+
}
30+
},
31+
"idiom" : "universal"
32+
}
33+
],
34+
"info" : {
35+
"author" : "xcode",
36+
"version" : 1
37+
}
38+
}

PlantingMind/PlantingMind/Assets.xcassets/Mood/bad.imageset/bad_light.svg

+1-1
Loading

PlantingMind/PlantingMind/Assets.xcassets/Mood/good.imageset/good_dark.svg

+1-1
Loading

PlantingMind/PlantingMind/Assets.xcassets/Mood/good.imageset/good_light.svg

+1-1
Loading

PlantingMind/PlantingMind/Assets.xcassets/Mood/nice.imageset/nice_dark.svg

+1-1
Loading

PlantingMind/PlantingMind/Assets.xcassets/Mood/nice.imageset/nice_light.svg

+1-1
Loading

PlantingMind/PlantingMind/Assets.xcassets/Mood/normal.imageset/normal_dark.svg

+1-1
Loading

PlantingMind/PlantingMind/Assets.xcassets/Mood/normal.imageset/normal_light.svg

+1-1
Loading

PlantingMind/PlantingMind/Assets.xcassets/Mood/notBad.imageset/notBad_dark.svg

+1-1
Loading

PlantingMind/PlantingMind/Assets.xcassets/Mood/notBad.imageset/notBad_light.svg

+1-1
Loading

0 commit comments

Comments
 (0)