Skip to content

Commit

Permalink
New release (#5)
Browse files Browse the repository at this point in the history 
* added new palettes and updated website

* updated photo credits
  • Loading branch information
@jacintak
jacintak authored Nov 24, 2019
1 parent 63ac459 commit e746c41
Show file tree
Hide file tree
Showing 34 changed files with 717 additions and 123 deletions.
26 changes: 22 additions & 4 deletions R/oz_palettes.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ oz_palettes <- list(
v.acanthurus = rbind(c("#F1CFA2","#F8BC64", "#E68B47","#BD6E39","#4A2C22"),c(5,4,1,2,3)),
v.pilbarensis = rbind(c("#EDAA6A","#41230E","#B0612D","#743F1C","#120906"),c(1,2,3,4,5)),
n.levis = rbind(c("#080808","#5e596f", "#9a7354", "#dca57e","#f6fcd0","#c5e4f6"),c(4,3,1,2,6,5)),
s.spinigerus = rbind(c("#18181a","#848178","#c6c7c2","#815b37", "#e3c77c","#feff99"),c(4,1,5,2,3,6))
s.spinigerus = rbind(c("#18181a","#848178","#c6c7c2","#815b37", "#e3c77c","#feff99"),c(4,1,5,2,3,6)),
e.kingii = rbind(c("#412A26", "#583423","#765B4C","#85797A","#E0AE74", "#F7ECE6"), c(5,1,2,4,3,6))
),
landscapes = list(
uluru = rbind(c("#543813","#E4733B","#D9842A","#DAB77F","#CFE0D8","#9CC3E0","#5981BC"), c(1,7,5,2,6,4,3)),
Expand All @@ -57,12 +58,14 @@ oz_palettes <- list(
daintree = rbind(c("#020401","#101e07","#2a4613","#374e0a","#7d8b3c"), c(5,1,2,4,3)),
spinifex = rbind(c("#10100e","#697573","#384a22", "#8d8b4e","#d6aa85","#e4e6d1"), c(4,5,1,2,3,6)),
nq_stream = rbind(c("#808314","#DCDB43","#C5DFF4","#323526","#534C2E"),c(1,3,5,2,4)),
kimberley = rbind(c("#322419","#291A17","#534546","#D3CCC8","#8F7772"), c(5,1,2,3,4))
kimberley = rbind(c("#322419","#291A17","#534546","#D3CCC8","#8F7772"), c(5,1,2,3,4)),
capricorn = rbind(c("#2F2E0F", "#8D7046","#67331E","#844522", "#2A61A2", "#619DC1" ), c(4,5,6,1,2,3))
),
birds = list(
p.cincta = rbind(c("#CFC7C4","#75767A","#DCA074","#994B1E","#593C2A","#1B1110"), c(6,1,2,3,4,5)),
c.azureus = rbind(c("#2E3780","#384AB3","#7C444D","#A34D36","#B4AFAF","#272A28"), c(1,4,2,5,3,6)),
m.cyaneus = rbind(c("#659FCB","#05090F","#477173","#22372C","#3A6C4E"), c(1,2,4,5,3))
m.cyaneus = rbind(c("#659FCB","#05090F","#477173","#22372C","#3A6C4E"), c(1,2,4,5,3)),
d.novae = rbind(c( "#252523", "#496161", "#4C2715", "#573C21","#845736", "#9E7F60"), c(4,3,1,5,2,6))
),
frogs = list(),
snakes = list(
Expand All @@ -77,7 +80,22 @@ oz_palettes <- list(
),
inverts = list(
p.mitchelli = rbind(c("#3F2723", "#F4F4DA","#9B7B66","#DBF379","#4F6A35"), c(1,5,2,4,3)),
k.tristis = rbind(c("#3D76A3", "#5EADBE","#5EA176", "#A76123", "#7A4018", "#B48D48", "#767D76"), c(1,5,7,2,3,6,4))
k.tristis = rbind(c("#3D76A3", "#5EADBE","#5EA176", "#A76123", "#7A4018", "#B48D48", "#767D76"), c(1,5,7,2,3,6,4)),
m.oscellata = rbind(c( "#553945", "#9D758D", "#734631", "#B3956F", "#554A48", "#8A91A4" ), c(1,3,2,4,6,5)),
a.conica = rbind(c("#31241E", "#57302B", "#AD836D", "#45472F", "#5B671F", "#6C8422"), c(4,1,6,3,5,2)),
v.viatica = rbind(c("#313632", "#7D8184", "#432B21", "#6B503B", "#B89E83"), c(4,5,1,2,3)),
c.brevi = rbind(c( "#800824", "#9A1609","#C4603C","#B53E78", "#6090D2", "#DC9722", "#DCB78B"), c(5,1,6,2,3,4,7)),
a.westwoodi = rbind(c("#0F1309", "#F86100", "#FF9E00","#897F27", "#C9B13F", "#FFCB7B"), c(2,1,3,4,5,6)),
a.plagiata = rbind(c("#1F1A10", "#493823","#9E6E27","#C47E2A", "#FDB958", "#FCE3A8"), c(4,1,5,2,3,6)),
physalia = rbind(c( "#061349" ,"#44618C", "#82B4DE" , "#492772", "#C78EF0", "#3D5537"), c(1,2,3,4,5,6)),
c.australasiae = rbind(c("#3C2726", "#767D6D","#6D723A", "#33511C","#3A6722", "#547F47"), c(4,5,6,1,2,3)),
k.scurra = rbind(c("#44290C", "#8A6026", "#BC9B7C", "#4D6706","#6F9703", "#ABC035"), c(1,5,6,3,2,4)),
l.vestiens = rbind(c("#342125", "#C04D5C","#F17F2A","#EB9734","#FFB765", "#FFE9C4"), c(4,2,1,5,3,6)),
t.australis = rbind(c("#3E3041", "#8D6486", "#745C5A", "#674232", "#BA8E69","#C5A99B"), c(1,2,5,3,4,6))
),
mammals = list(
p.breviceps = rbind(c("#040403", "#423A31", "#6E5D54", "#684E2D", "#BEA26C","#F5DEB6"), c(1,2,5,3,4,6)),
thylacine = rbind(c("#463732", "#674F37", "#6C5948", "#9A7B5C","#C7B084"), c(1,2,5,3,4))
)
)

Expand Down
12 changes: 10 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ These are palettes based on some of Australia's wet & wild.

**Community contributors:** Brenton von Takach

### Mammals
They have fur and produce milk.

***

# Contributing
Expand Down Expand Up @@ -134,5 +137,10 @@ Contact N. Wu: <nicholas.wu.nz@gmail.com>
## Photo credits

* *Warramaba*: Barry Kearney, Jacinta Kong
* Lizards: Jannico Kelk, Ross McGibbon, Peter Soltys, Nicholas Wu, Steven Zozaya
* Landscapes: Nicholas Wu, Jacinta Kong
* Lizards: Jannico Kelk, Ross McGibbon, Peter Soltys, Nicholas Wu, Steven Zozaya, Jacinta Kong
* Landscapes: Nicholas Wu, Jacinta Kong, Jordan Iles
* Birds: Jessica McLachlan, Brenton von Takach, Jacinta Kong
* Plants: Emma Dalziell, Sarah Mulhall
* Inverts: Jacinta Kong, Craig White, Kate Umbers
* Fish: Brenton von Takach
* Mammals: Jacinta Kong
14 changes: 13 additions & 1 deletion _NEWS.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
# colRoz 0.1.2
# colRoz 0.2.2
24 Nov 2019
## JK

* Added new palettes
* mammals: sugar glider, thylacine
* inverts: grasshoppers, moths, marine inverts
* egernia kingii
* emu
* Capricorn
* Updated website with photots

# colRoz 0.2.1

19 Nov 2019

Expand Down
2 changes: 2 additions & 0 deletions _site.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ navbar:
href: fish-palette.html
- text: "Inverts"
href: inverts-palette.html
- text: "Mammals"
href: mammals-palette.html
right:
- icon: fa-github
href: https://github.com/jacintak
Expand Down
18 changes: 7 additions & 11 deletions birds-palette.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=EDGE" />


<meta name="author" content="Jacinta Kong" />

<meta name="date" content="2019-11-20" />
<meta name="date" content="2019-11-24" />

<title>Birds</title>

Expand Down Expand Up @@ -268,12 +267,6 @@
}
}

@media print {
.toc-content {
/* see https://github.com/w3c/csswg-drafts/issues/4434 */
float: right;
}
}

.toc-content {
padding-left: 30px;
Expand Down Expand Up @@ -431,6 +424,9 @@
<li>
<a href="inverts-palette.html">Inverts</a>
</li>
<li>
<a href="mammals-palette.html">Mammals</a>
</li>
</ul>
</li>
</ul>
Expand All @@ -451,8 +447,7 @@


<h1 class="title toc-ignore">Birds</h1>
<h4 class="author">Jacinta Kong</h4>
<h4 class="date">20 Nov 2019</h4>
<h4 class="date">24 Nov 2019</h4>

</div>

Expand All @@ -461,7 +456,7 @@ <h4 class="date">20 Nov 2019</h4>
<div id="palette-names" class="section level1">
<h1>Palette names</h1>
<pre class="r"><code>names(oz_palettes$birds)
[1] &quot;p.cincta&quot; &quot;c.azureus&quot; &quot;m.cyaneus&quot;</code></pre>
[1] &quot;p.cincta&quot; &quot;c.azureus&quot; &quot;m.cyaneus&quot; &quot;d.novae&quot; </code></pre>
<hr />
</div>
<div id="palette-photos" class="section level1">
Expand All @@ -471,6 +466,7 @@ <h1>Palette photos</h1>
<img src="images/c.azureus.png" height="200" /> <img src="https://pbs.twimg.com/media/EJS2kIUUwAAbnrJ?format=jpg&amp;name=large" height="200" /></p>
<p>Photo by Jessica McLachlan<br />
<img src="images/m.cyaneus.png" height="200" /> <img src="https://pbs.twimg.com/media/EJTPlMeU4AAz2hM?format=jpg&amp;name=4096x4096" height="200" /></p>
<p><img src="images/d.novae.png" height="200" /> <img src="https://pbs.twimg.com/media/DByGzv_UMAAQEaf?format=jpg&amp;name=4096x4096" height="200" /></p>
</div>

<footer>
Expand Down
15 changes: 5 additions & 10 deletions fish-palette.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=EDGE" />


<meta name="author" content="Jacinta Kong" />

<meta name="date" content="2019-11-20" />
<meta name="date" content="2019-11-24" />

<title>Fish</title>

Expand Down Expand Up @@ -268,12 +267,6 @@
}
}

@media print {
.toc-content {
/* see https://github.com/w3c/csswg-drafts/issues/4434 */
float: right;
}
}

.toc-content {
padding-left: 30px;
Expand Down Expand Up @@ -431,6 +424,9 @@
<li>
<a href="inverts-palette.html">Inverts</a>
</li>
<li>
<a href="mammals-palette.html">Mammals</a>
</li>
</ul>
</li>
</ul>
Expand All @@ -451,8 +447,7 @@


<h1 class="title toc-ignore">Fish</h1>
<h4 class="author">Jacinta Kong</h4>
<h4 class="date">20 Nov 2019</h4>
<h4 class="date">24 Nov 2019</h4>

</div>

Expand Down
15 changes: 5 additions & 10 deletions frogs-palette.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=EDGE" />


<meta name="author" content="Jacinta Kong" />

<meta name="date" content="2019-11-20" />
<meta name="date" content="2019-11-24" />

<title>Frogs</title>

Expand Down Expand Up @@ -268,12 +267,6 @@
}
}

@media print {
.toc-content {
/* see https://github.com/w3c/csswg-drafts/issues/4434 */
float: right;
}
}

.toc-content {
padding-left: 30px;
Expand Down Expand Up @@ -431,6 +424,9 @@
<li>
<a href="inverts-palette.html">Inverts</a>
</li>
<li>
<a href="mammals-palette.html">Mammals</a>
</li>
</ul>
</li>
</ul>
Expand All @@ -451,8 +447,7 @@


<h1 class="title toc-ignore">Frogs</h1>
<h4 class="author">Jacinta Kong</h4>
<h4 class="date">20 Nov 2019</h4>
<h4 class="date">24 Nov 2019</h4>

</div>

Expand Down
Binary file added images/a.conica.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/a.plagiata.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/a.westwoodi.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/c.australasiae.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/c.brevi.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/capricorn.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/d.novae.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file added images/d.novaehollandiae.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/e.kingii.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/k.scurra.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/l.vestiens.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/m.oscellata.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/p.breviceps.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/physalia.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/t.australis.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/thylacine.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/v.viatica.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 11 additions & 13 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<meta name="author" content="Jacinta Kong" />

<meta name="date" content="2019-11-20" />
<meta name="date" content="2019-11-24" />

<title>Introduction to colRoz</title>

Expand Down Expand Up @@ -268,12 +268,6 @@
}
}

@media print {
.toc-content {
/* see https://github.com/w3c/csswg-drafts/issues/4434 */
float: right;
}
}

.toc-content {
padding-left: 30px;
Expand Down Expand Up @@ -431,6 +425,9 @@
<li>
<a href="inverts-palette.html">Inverts</a>
</li>
<li>
<a href="mammals-palette.html">Mammals</a>
</li>
</ul>
</li>
</ul>
Expand All @@ -452,7 +449,7 @@

<h1 class="title toc-ignore">Introduction to colRoz</h1>
<h4 class="author">Jacinta Kong</h4>
<h4 class="date">20 Nov 2019</h4>
<h4 class="date">24 Nov 2019</h4>

</div>

Expand All @@ -479,12 +476,13 @@ <h1>Installation</h1>
<h1>1. List of palettes</h1>
<p>The <code>oz_palettes</code> function contains the list of palettes available. Individual palettes are gouped by theme in a list. The <code>oz_palettes</code> variable is a list of these collated lists.</p>
<pre class="r"><code>names(oz_palettes) # See all palette themes
[1] &quot;warramaba&quot; &quot;lizards&quot; &quot;landscapes&quot; &quot;birds&quot; &quot;frogs&quot; &quot;snakes&quot;
[7] &quot;plants&quot; &quot;fish&quot; &quot;inverts&quot;
[1] &quot;warramaba&quot; &quot;lizards&quot; &quot;landscapes&quot; &quot;birds&quot; &quot;frogs&quot;
[6] &quot;snakes&quot; &quot;plants&quot; &quot;fish&quot; &quot;inverts&quot; &quot;mammals&quot;
names(oz_palettes$lizards) # See all lizard palettes
[1] &quot;c.decresii&quot; &quot;c.kingii&quot; &quot;e.leuraensis&quot; &quot;i.lesueurii&quot; &quot;l.boydii&quot;
[6] &quot;m.horridus&quot; &quot;m.horridus2&quot; &quot;t.nigrolutea&quot; &quot;v.acanthurus&quot; &quot;v.pilbarensis&quot;
[11] &quot;n.levis&quot; &quot;s.spinigerus&quot; </code></pre>
[1] &quot;c.decresii&quot; &quot;c.kingii&quot; &quot;e.leuraensis&quot; &quot;i.lesueurii&quot;
[5] &quot;l.boydii&quot; &quot;m.horridus&quot; &quot;m.horridus2&quot; &quot;t.nigrolutea&quot;
[9] &quot;v.acanthurus&quot; &quot;v.pilbarensis&quot; &quot;n.levis&quot; &quot;s.spinigerus&quot;
[13] &quot;e.kingii&quot; </code></pre>
<p>We can call a specific list using subsetting rules for lists.</p>
<pre class="r"><code>oz_palettes[[&quot;warramaba&quot;]][[&quot;whitei&quot;]] # Subset the palette for Warramaba whitei, format: [[theme list]][[palette list]]
[,1] [,2] [,3] [,4] [,5] [,6]
Expand Down
32 changes: 21 additions & 11 deletions inverts-palette.html
View file

Large diffs are not rendered by default.

24 changes: 10 additions & 14 deletions landscapes-palette.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=EDGE" />


<meta name="author" content="Jacinta Kong" />

<meta name="date" content="2019-11-20" />
<meta name="date" content="2019-11-24" />

<title>Landscapes</title>

Expand Down Expand Up @@ -268,12 +267,6 @@
}
}

@media print {
.toc-content {
/* see https://github.com/w3c/csswg-drafts/issues/4434 */
float: right;
}
}

.toc-content {
padding-left: 30px;
Expand Down Expand Up @@ -431,6 +424,9 @@
<li>
<a href="inverts-palette.html">Inverts</a>
</li>
<li>
<a href="mammals-palette.html">Mammals</a>
</li>
</ul>
</li>
</ul>
Expand All @@ -451,8 +447,7 @@


<h1 class="title toc-ignore">Landscapes</h1>
<h4 class="author">Jacinta Kong</h4>
<h4 class="date">20 Nov 2019</h4>
<h4 class="date">24 Nov 2019</h4>

</div>

Expand All @@ -462,17 +457,18 @@ <h4 class="date">20 Nov 2019</h4>
<div id="palette-names" class="section level1">
<h1>Palette names</h1>
<pre class="r"><code>names(oz_palettes$landscapes)
[1] &quot;uluru&quot; &quot;shark_bay&quot; &quot;sky&quot; &quot;desert_sunset&quot; &quot;desert_dusk&quot;
[6] &quot;desert_flood&quot; &quot;salt_lake&quot; &quot;daintree&quot; &quot;spinifex&quot; &quot;nq_stream&quot;
[11] &quot;kimberley&quot; </code></pre>
[1] &quot;uluru&quot; &quot;shark_bay&quot; &quot;sky&quot; &quot;desert_sunset&quot;
[5] &quot;desert_dusk&quot; &quot;desert_flood&quot; &quot;salt_lake&quot; &quot;daintree&quot;
[9] &quot;spinifex&quot; &quot;nq_stream&quot; &quot;kimberley&quot; &quot;capricorn&quot; </code></pre>
<hr />
</div>
<div id="palette-photos" class="section level1">
<h1>Palette photos</h1>
<p><img src="images/desert_sunset.png" height="200" /> <img src="https://jacintakongresearch.files.wordpress.com/2016/04/banner8.jpg?resize=438%2C438" height="200" /></p>
<p><img src="images/shark_bay.png" height="200" /> <img src="https://jacintakongresearch.files.wordpress.com/2016/04/stromatolites.jpg?resize=438%2C438" height="200" /></p>
<p><img src="images/shark_bay.png" height="200" /> <img src="https://pbs.twimg.com/media/CZ31lRQXEAI4uXk?format=jpg&amp;name=medium" height="200" /></p>
<p>Photo from Jordan Iles<br />
<img src="images/nq_stream.png" height="200" /> <img src="https://pbs.twimg.com/media/EJSHoZTUEAA-r0w?format=jpg&amp;name=4096x4096" height="200" /></p>
<p><img src="images/capricorn.png" height="200" /> <img src="https://pbs.twimg.com/media/DQbVslaVwAAJyV1?format=jpg&amp;name=medium" height="200" /></p>
<p><img src="images/sky.png" height="200" /> <img src="images/desert_dusk.png" height="200" /> <img src="images/desert_flood.png" height="200" /> <img src="images/salt_lake.png" height="200" /> <img src="images/daintree.png" height="200" /> <img src="images/kimberley.png" height="200" /></p>
</div>

Expand Down
Loading

0 comments on commit e746c41

Please sign in to comment.