From e746c41a7d5501afd522ed85de77b03f0c159e1b Mon Sep 17 00:00:00 2001 From: Jacinta Kong <48912454+jacintak@users.noreply.github.com> Date: Sun, 24 Nov 2019 17:20:51 +0000 Subject: [PATCH] New release (#5) * added new palettes and updated website * updated photo credits --- R/oz_palettes.R | 26 +- README.md | 12 +- _NEWS.md | 14 +- _site.yml | 2 + birds-palette.html | 18 +- fish-palette.html | 15 +- frogs-palette.html | 15 +- images/a.conica.png | Bin 0 -> 2788 bytes images/a.plagiata.png | Bin 0 -> 3391 bytes images/a.westwoodi.png | Bin 0 -> 3756 bytes images/c.australasiae.png | Bin 0 -> 7149 bytes images/c.brevi.png | Bin 0 -> 2364 bytes images/capricorn.png | Bin 0 -> 2869 bytes images/d.novae.png | Bin 0 -> 2651 bytes images/d.novaehollandiae.png | 0 images/e.kingii.png | Bin 0 -> 2137 bytes images/k.scurra.png | Bin 0 -> 2573 bytes images/l.vestiens.png | Bin 0 -> 2830 bytes images/m.oscellata.png | Bin 0 -> 5998 bytes images/p.breviceps.png | Bin 0 -> 6514 bytes images/physalia.png | Bin 0 -> 2948 bytes images/t.australis.png | Bin 0 -> 3004 bytes images/thylacine.png | Bin 0 -> 2691 bytes images/v.viatica.png | Bin 0 -> 2410 bytes index.html | 24 +- inverts-palette.html | 32 +- landscapes-palette.html | 24 +- lizards-palette.html | 26 +- mammals-palette.Rmd | 32 ++ mammals-palette.html | 549 +++++++++++++++++++++++++++++++++++ man/oz_palettes.Rd | 2 +- plants-palette.html | 15 +- snakes-palette.html | 15 +- warramaba-palette.html | 19 +- 34 files changed, 717 insertions(+), 123 deletions(-) create mode 100644 images/a.conica.png create mode 100644 images/a.plagiata.png create mode 100644 images/a.westwoodi.png create mode 100644 images/c.australasiae.png create mode 100644 images/c.brevi.png create mode 100644 images/capricorn.png create mode 100644 images/d.novae.png create mode 100644 images/d.novaehollandiae.png create mode 100644 images/e.kingii.png create mode 100644 images/k.scurra.png create mode 100644 images/l.vestiens.png create mode 100644 images/m.oscellata.png create mode 100644 images/p.breviceps.png create mode 100644 images/physalia.png create mode 100644 images/t.australis.png create mode 100644 images/thylacine.png create mode 100644 images/v.viatica.png create mode 100644 mammals-palette.Rmd create mode 100644 mammals-palette.html diff --git a/R/oz_palettes.R b/R/oz_palettes.R index b16b6c4..5fd49a6 100644 --- a/R/oz_palettes.R +++ b/R/oz_palettes.R @@ -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)), @@ -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( @@ -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)) ) ) diff --git a/README.md b/README.md index f72c136..36d85f1 100644 --- a/README.md +++ b/README.md @@ -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 @@ -134,5 +137,10 @@ Contact N. Wu: ## 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 diff --git a/_NEWS.md b/_NEWS.md index 1ed4d9f..702bb1e 100644 --- a/_NEWS.md +++ b/_NEWS.md @@ -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 diff --git a/_site.yml b/_site.yml index 20aeba9..d60552f 100644 --- a/_site.yml +++ b/_site.yml @@ -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 diff --git a/birds-palette.html b/birds-palette.html index 444e29f..cc1ba07 100644 --- a/birds-palette.html +++ b/birds-palette.html @@ -10,9 +10,8 @@ - - + Birds @@ -268,12 +267,6 @@ } } -@media print { -.toc-content { - /* see https://github.com/w3c/csswg-drafts/issues/4434 */ - float: right; -} -} .toc-content { padding-left: 30px; @@ -431,6 +424,9 @@
  • Inverts
    • +
  • + Mammals +
    • @@ -451,8 +447,7 @@

    Birds

    -

    Jacinta Kong

    -

    20 Nov 2019

    +

    24 Nov 2019

    @@ -461,7 +456,7 @@

    20 Nov 2019

    Palette names

    names(oz_palettes$birds)
-[1] "p.cincta"  "c.azureus" "m.cyaneus"
    +[1] "p.cincta" "c.azureus" "m.cyaneus" "d.novae"
    @@ -471,6 +466,7 @@

    Palette photos

    Photo by Jessica McLachlan

    +