Skip to content

Commit

Permalink
added new yarn: Knitting for Olive - Cotton Merino
Browse files Browse the repository at this point in the history
  • Loading branch information
jdvlpr committed Nov 13, 2024
1 parent 9a7787d commit 7c137ab
Show file tree
Hide file tree
Showing 6 changed files with 155 additions and 1 deletion.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "temperature-blanket-web-app",
"version": "4.5.0",
"version": "4.6.0",
"description": "Weather Data + Art! Web app for creating a temperature blanket",
"main": "index.html",
"private": true,
Expand Down
2 changes: 2 additions & 0 deletions src/lib/yarns/brands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { brand as holst } from './holst/yarns';
import { brand as iceYarns } from './ice-yarns/yarns';
import { brand as katia } from './katia/yarns';
import { brand as knitPicks } from './knit-picks/yarns';
import { brand as knittingForOlive } from './knitting-for-olive/yarns';
import { brand as lilySugarNCream } from './lily-sugar-n-cream/yarns';
import { brand as lionBrand } from './lion-brand/yarns';
import { brand as loopsAndThreads } from './loops-and-threads/yarns';
Expand Down Expand Up @@ -73,6 +74,7 @@ export const brands: Brand[] = [
iceYarns,
katia,
knitPicks,
knittingForOlive,
lilySugarNCream,
lionBrand,
loopsAndThreads,
Expand Down
130 changes: 130 additions & 0 deletions src/lib/yarns/knitting-for-olive/cotton-merino/colorways.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
import type { Colorway } from '$lib/types';

const colorways: Colorway[] = [
{
source: {
name: 'knittingforolive.com',
href: 'https://knittingforolive.com/collections/knitting-for-olive-cottonmerino', // also available in Danish here: https://knittingforolive.dk/collections/knitting-for-olive-cottonmerino
accessed: '2024-11-13',
},
colors: [
{
hex: '#e1d9c9',
name: 'Undyed',
},
{
hex: '#eae5de',
name: 'Cream',
},
{
hex: '#c3c1c0',
name: 'Pearl Gray',
},
{
hex: '#4e4d50',
name: 'Thunder Cloud',
},
{
hex: '#4c3b2c',
name: 'Bark',
},
{
hex: '#6f645d',
name: 'Mole',
},
{
hex: '#b3a89e',
name: 'Oatmeal',
},
{
hex: '#dccdb5',
name: 'Wheat',
},
{
hex: '#6f5343',
name: 'Dark Cognac',
},
{
hex: '#97754a',
name: 'Nut Brown',
},
{
hex: '#e0c463',
name: 'Buttercup',
},
{
hex: '#d5c6a4',
name: 'Dusty Banana',
},
{
hex: '#cbb6a6',
name: 'Powder',
},
{
hex: '#e9d3c9',
name: 'Ballerina',
},
{
hex: '#ca8d85',
name: 'Rhubarb Rose',
},
{
hex: '#b97a6e',
name: 'Terracotta Rose',
},
{
hex: '#e5a0a4',
name: 'Strawberry Icecream',
},
{
hex: '#c64041',
name: 'Red Currant',
},
{
hex: '#e0a5be',
name: 'Japanese Anemone',
},
{
hex: '#9c99b7',
name: 'Blueberry Ice Cream',
},
{
hex: '#626871',
name: 'Dusty Blue Whale',
},
{
hex: '#353a54',
name: 'Navy Blue',
},
{
hex: '#7c838a',
name: 'Elephant Blue',
},
{
hex: '#a8afb1',
name: 'Soft Blue',
},
{
hex: '#c6cdc8',
name: 'Soft Mint',
},
{
hex: '#e4e055',
name: 'Lime Yellow',
},
{
hex: '#5c8953',
name: 'Clover Green',
},
{
hex: '#606660',
name: 'Dark Sea Green',
},
{
hex: '#95998a',
name: 'Dusty Artichoke',
},
],
},
];
export default colorways;
9 changes: 9 additions & 0 deletions src/lib/yarns/knitting-for-olive/cotton-merino/yarn.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import type { Yarn } from '$lib/types';
import colorways from './colorways';

export const yarn: Yarn = {
colorways,
name: 'Cotton Merino',
id: 'cotton_merino',
weightId: 'lf',
};
8 changes: 8 additions & 0 deletions src/lib/yarns/knitting-for-olive/yarns.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import type { Brand } from '$lib/types';
import { yarn as cottonMerino } from './cotton-merino/yarn';

export const brand: Brand = {
name: 'Knitting for Olive',
id: 'knitting_for_olive',
yarns: [cottonMerino],
};
5 changes: 5 additions & 0 deletions src/routes/changelog/changelog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ export const entries: ChangelogItem[] = [
text: `45 colorways`,
title: 'Added Yarn: Ice Yarns - Lorena Worsted',
},
{
icon: ICONS.checkCircle,
text: `29 colorways`,
title: 'Added Yarn: Knitting for Olive - Cotton Merino',
},
],
version: '4.6.0',
},
Expand Down

0 comments on commit 7c137ab

Please sign in to comment.