Skip to content

Commit cb014d6

Browse files
mortisfluxmortisflux
committed
Move files to fix installation error
1 parent a320a6f commit cb014d6

4 files changed

Lines changed: 105 additions & 103 deletions

File tree

‎.Rbuildignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
^.*\.Rproj$
2+
^\.Rproj\.user$

data/processed_fullcolours.csv renamed to archive/processed_fullcolours.csv

File renamed without changes.

data/usyd_colour_locations.csv renamed to archive/usyd_colour_locations.csv

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,58 @@
1-
Palette,Colour,Location,Role
2-
primary,MasterbrandOchre,,essential
3-
primary,MasterbrandWhite,,essential
4-
primary,MasterbrandCharcoal,,essential
5-
primary,MasterbrandBlack,,essential
6-
primary,AccentYellow,,accent
7-
primary,AccentBlue,,accent
8-
primary,AccentGrey,,accent
9-
external,MasterbrandOchre,cover,essential
10-
external,MasterbrandOchre,internal_pages,optional
11-
external,MasterbrandBlack,cover,optional
12-
external,MasterbrandWhite,internal_pages,essential
13-
external,MasterbrandCharcoal,internal_pages,essential
14-
external,AccentYellow,internal_pages,optional
15-
external,AccentBlue,internal_pages,optional
16-
internal,MasterbrandWhite,cover,essential
17-
internal,MasterbrandCharcoal,cover,essential
18-
internal,MasterbrandOchre,cover,optional
19-
internal,MasterbrandWhite,internal_pages,essential
20-
internal,MasterbrandCharcoal,internal_pages,essential
21-
internal,MasterbrandOchre,internal_pages,optional
22-
internal,AccentYellow,internal_pages,optional
23-
internal,AccentBlue,internal_pages,optional
24-
secondary_pallette_1,SecondaryIvory,1,essential
25-
secondary_pallette_1,SecondaryBeige,2,essential
26-
secondary_pallette_1,SecondaryPeach,3,essential
27-
secondary_pallette_1,MasterbrandOchre,4,essential
28-
secondary_pallette_1,SecondaryMaroon,5,essential
29-
secondary_pallette_1,MasterbrandCharcoal,6,essential
30-
secondary_pallette_1,MasterbrandBlack,7,essential
31-
secondary_pallette_2,SecondaryOrange,1,essential
32-
secondary_pallette_2,MasterbrandYellow,2,essential
33-
secondary_pallette_2,SecondaryLemon,3,essential
34-
secondary_pallette_2,SecondaryBlush,4,essential
35-
secondary_pallette_2,SecondaryPink,5,essential
36-
secondary_pallette_2,SecondaryLilac,6,essential
37-
secondary_pallette_2,SecondaryPurple,7,essential
38-
secondary_pallette_3,SecondaryLightBlue,1,essential
39-
secondary_pallette_3,SecondaryBlue,2,essential
40-
secondary_pallette_3,MasterbrandBlue,3,essential
41-
secondary_pallette_3,SecondaryLightGreen,4,essential
42-
secondary_pallette_3,SecondaryDarkGreen,5,essential
43-
secondary_pallette_3,SecondaryDarkSeafoam,6,essential
44-
secondary_pallette_3,SecondaryLightSeafoam,7,essential
45-
secondary_pallette_monochromatic,MasterbrandOchre,1,essential
46-
secondary_pallette_monochromatic,SecondaryBeige,2,essential
47-
secondary_pallette_bright,MasterbrandOchre,1,essential
48-
secondary_pallette_bright,SecondaryDarkGreen,2,essential
49-
secondary_pallette_bright,SecondaryLightGreen,3,essential
50-
secondary_pallette_bright,SecondaryLightBlue,4,essential
51-
secondary_pallette_bright,AccentBlue,5,essential
52-
secondary_pallette_bright,SecondaryOrange,6,essential
53-
secondary_pallette_bright,AccentYellow,7,essential
54-
secondary_pallette_complementary,MasterbrandOchre,1,essential
55-
secondary_pallette_complementary,SecondaryPeach,2,essential
56-
secondary_pallette_complementary,SecondaryMaroon,3,essential
57-
secondary_pallette_complementary,SecondaryDarkSeafoam,4,essential
1+
Palette,Colour,Location,Role
2+
primary,MasterbrandOchre,,essential
3+
primary,MasterbrandWhite,,essential
4+
primary,MasterbrandCharcoal,,essential
5+
primary,MasterbrandBlack,,essential
6+
primary,AccentYellow,,accent
7+
primary,AccentBlue,,accent
8+
primary,AccentGrey,,accent
9+
external,MasterbrandOchre,cover,essential
10+
external,MasterbrandOchre,internal_pages,optional
11+
external,MasterbrandBlack,cover,optional
12+
external,MasterbrandWhite,internal_pages,essential
13+
external,MasterbrandCharcoal,internal_pages,essential
14+
external,AccentYellow,internal_pages,optional
15+
external,AccentBlue,internal_pages,optional
16+
internal,MasterbrandWhite,cover,essential
17+
internal,MasterbrandCharcoal,cover,essential
18+
internal,MasterbrandOchre,cover,optional
19+
internal,MasterbrandWhite,internal_pages,essential
20+
internal,MasterbrandCharcoal,internal_pages,essential
21+
internal,MasterbrandOchre,internal_pages,optional
22+
internal,AccentYellow,internal_pages,optional
23+
internal,AccentBlue,internal_pages,optional
24+
secondary_pallette_1,SecondaryIvory,1,essential
25+
secondary_pallette_1,SecondaryBeige,2,essential
26+
secondary_pallette_1,SecondaryPeach,3,essential
27+
secondary_pallette_1,MasterbrandOchre,4,essential
28+
secondary_pallette_1,SecondaryMaroon,5,essential
29+
secondary_pallette_1,MasterbrandCharcoal,6,essential
30+
secondary_pallette_1,MasterbrandBlack,7,essential
31+
secondary_pallette_2,SecondaryOrange,1,essential
32+
secondary_pallette_2,MasterbrandYellow,2,essential
33+
secondary_pallette_2,SecondaryLemon,3,essential
34+
secondary_pallette_2,SecondaryBlush,4,essential
35+
secondary_pallette_2,SecondaryPink,5,essential
36+
secondary_pallette_2,SecondaryLilac,6,essential
37+
secondary_pallette_2,SecondaryPurple,7,essential
38+
secondary_pallette_3,SecondaryLightBlue,1,essential
39+
secondary_pallette_3,SecondaryBlue,2,essential
40+
secondary_pallette_3,MasterbrandBlue,3,essential
41+
secondary_pallette_3,SecondaryLightGreen,4,essential
42+
secondary_pallette_3,SecondaryDarkGreen,5,essential
43+
secondary_pallette_3,SecondaryDarkSeafoam,6,essential
44+
secondary_pallette_3,SecondaryLightSeafoam,7,essential
45+
secondary_pallette_monochromatic,MasterbrandOchre,1,essential
46+
secondary_pallette_monochromatic,SecondaryBeige,2,essential
47+
secondary_pallette_bright,MasterbrandOchre,1,essential
48+
secondary_pallette_bright,SecondaryDarkGreen,2,essential
49+
secondary_pallette_bright,SecondaryLightGreen,3,essential
50+
secondary_pallette_bright,SecondaryLightBlue,4,essential
51+
secondary_pallette_bright,AccentBlue,5,essential
52+
secondary_pallette_bright,SecondaryOrange,6,essential
53+
secondary_pallette_bright,AccentYellow,7,essential
54+
secondary_pallette_complementary,MasterbrandOchre,1,essential
55+
secondary_pallette_complementary,SecondaryPeach,2,essential
56+
secondary_pallette_complementary,SecondaryMaroon,3,essential
57+
secondary_pallette_complementary,SecondaryDarkSeafoam,4,essential
5858
secondary_pallette_complementary,SecondaryLightSeafoam,5,essential

data/usyd_colours.csv renamed to archive/usyd_colours.csv

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
1-
colourName,R,G,B,C,M,Y,K,SpotColour_UncoatedStocks,SpotColour_CoatedStocks
2-
AccentBlue,1,72,164,100,61,0,0,PMSW 2945U,PMS 2945C
3-
AccentBlue_dvPS,0,101,178,,,,,,
4-
AccentGrey,241,241,241,0,0,0,10,,
5-
AccentGrey_dvPS,231,231,232,,,,,,
6-
AccentYellow,255,184,0,0,25,98,0,PMS 121U,PMS 123C
7-
AccentYellow_dvPS,255,194,21,,,,,,
8-
MasterbrandBlack,10,10,10,0,0,0,100,,
9-
MasterbrandBlack_dvPS,35,31,32,,,,,,
10-
MasterbrandCharcoal,66,66,66,0,0,0,90,,
11-
MasterbrandCharcoal_dvPS,64,64,65,,,,,,
12-
MasterbrandOchre,230,70,38,0,85,100,0,PMS 7417C,PMS 7417C
13-
MasterbrandOchre_dvPS,240,78,35,,,,,,
14-
MasterbrandWhite,255,255,255,0,0,0,0,,
15-
MasterbrandWhite_dvPS,255,255,255,,,,,,
16-
SecondaryBeige,253,202,144,0,23,47,0,,
17-
SecondaryBeige_dvPS,253,202,144,,,,,,
18-
SecondaryBlue,78,152,211,67,29,0,0,,
19-
SecondaryBlue_dvPS,78,152,211,,,,,,
20-
SecondaryDarkGreen,0,126,59,81,5,95,32,,
21-
SecondaryDarkGreen_dvPS,0,126,59,,,,,,
22-
SecondaryDarkSeafoam,0,164,133,81,11,61,0,,
23-
SecondaryDarkSeafoam_dvPS,0,164,133,,,,,,
24-
SecondaryIvory,248,239,221,2,4,13,0,,
25-
SecondaryIvory_dvPS,249,243,222,,,,,,
26-
SecondaryLemon,251,243,141,3,0,56,0,,
27-
SecondaryLemon_dvPS,251,243,142,,,,,,
28-
SecondaryLightBlue,145,189,229,41,15,0,0,,
29-
SecondaryLightBlue_dvPS,145,189,229,,,,,,
30-
SecondaryLightGreen,189,220,150,28,0,53,0,,
31-
SecondaryLightGreen_dvPS,189,220,150,,,,,,
32-
SecondaryLightPink,248,185,204,0,34,4,0,,
33-
SecondaryLightPink_dvPS,248,185,204,,,,,,
34-
SecondaryLightSeafoam,104,198,182,57,0,35,0,,
35-
SecondaryLightSeafoam_dvPS,104,198,182,,,,,,
36-
SecondaryLilac,184,150,198,60,90,0,0,,
37-
SecondaryLilac_dvPS,184,150,198,,,,,,
38-
SecondaryMaroon,122,32,0,0,85,100,60,,
39-
SecondaryMaroon_dvPS,122,32,0,,,,,,
40-
SecondaryOrange,249,161,52,0,43,90,0,,
41-
SecondaryOrange_dvPS,249,161,52,,,,,,
42-
SecondaryPeach,247,156,114,0,47,56,0,,
43-
SecondaryPeach_dvPS,247,156,114,,,,,,
44-
SecondaryPink,214,81,157,12,83,0,0,,
45-
SecondaryPink_dvPS,213,81,157,,,,,,
46-
SecondaryPurple,127,63,152,60,90,0,0,,
1+
colourName,R,G,B,C,M,Y,K,SpotColour_UncoatedStocks,SpotColour_CoatedStocks
2+
AccentBlue,1,72,164,100,61,0,0,PMSW 2945U,PMS 2945C
3+
AccentBlue_dvPS,0,101,178,,,,,,
4+
AccentGrey,241,241,241,0,0,0,10,,
5+
AccentGrey_dvPS,231,231,232,,,,,,
6+
AccentYellow,255,184,0,0,25,98,0,PMS 121U,PMS 123C
7+
AccentYellow_dvPS,255,194,21,,,,,,
8+
MasterbrandBlack,10,10,10,0,0,0,100,,
9+
MasterbrandBlack_dvPS,35,31,32,,,,,,
10+
MasterbrandCharcoal,66,66,66,0,0,0,90,,
11+
MasterbrandCharcoal_dvPS,64,64,65,,,,,,
12+
MasterbrandOchre,230,70,38,0,85,100,0,PMS 7417C,PMS 7417C
13+
MasterbrandOchre_dvPS,240,78,35,,,,,,
14+
MasterbrandWhite,255,255,255,0,0,0,0,,
15+
MasterbrandWhite_dvPS,255,255,255,,,,,,
16+
SecondaryBeige,253,202,144,0,23,47,0,,
17+
SecondaryBeige_dvPS,253,202,144,,,,,,
18+
SecondaryBlue,78,152,211,67,29,0,0,,
19+
SecondaryBlue_dvPS,78,152,211,,,,,,
20+
SecondaryDarkGreen,0,126,59,81,5,95,32,,
21+
SecondaryDarkGreen_dvPS,0,126,59,,,,,,
22+
SecondaryDarkSeafoam,0,164,133,81,11,61,0,,
23+
SecondaryDarkSeafoam_dvPS,0,164,133,,,,,,
24+
SecondaryIvory,248,239,221,2,4,13,0,,
25+
SecondaryIvory_dvPS,249,243,222,,,,,,
26+
SecondaryLemon,251,243,141,3,0,56,0,,
27+
SecondaryLemon_dvPS,251,243,142,,,,,,
28+
SecondaryLightBlue,145,189,229,41,15,0,0,,
29+
SecondaryLightBlue_dvPS,145,189,229,,,,,,
30+
SecondaryLightGreen,189,220,150,28,0,53,0,,
31+
SecondaryLightGreen_dvPS,189,220,150,,,,,,
32+
SecondaryLightPink,248,185,204,0,34,4,0,,
33+
SecondaryLightPink_dvPS,248,185,204,,,,,,
34+
SecondaryLightSeafoam,104,198,182,57,0,35,0,,
35+
SecondaryLightSeafoam_dvPS,104,198,182,,,,,,
36+
SecondaryLilac,184,150,198,60,90,0,0,,
37+
SecondaryLilac_dvPS,184,150,198,,,,,,
38+
SecondaryMaroon,122,32,0,0,85,100,60,,
39+
SecondaryMaroon_dvPS,122,32,0,,,,,,
40+
SecondaryOrange,249,161,52,0,43,90,0,,
41+
SecondaryOrange_dvPS,249,161,52,,,,,,
42+
SecondaryPeach,247,156,114,0,47,56,0,,
43+
SecondaryPeach_dvPS,247,156,114,,,,,,
44+
SecondaryPink,214,81,157,12,83,0,0,,
45+
SecondaryPink_dvPS,213,81,157,,,,,,
46+
SecondaryPurple,127,63,152,60,90,0,0,,
4747
SecondaryPurple_dvPS,127,63,152,,,,,,

0 commit comments

Comments
 (0)