diff --git a/package.json b/package.json index 952e9d8..b678891 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "temperature-blanket-web-app", - "version": "4.4.0", + "version": "4.5.0", "description": "Weather Data + Art! Web app for creating a temperature blanket", "main": "index.html", "private": true, diff --git a/src/lib/yarns/hobbii/friends-wheel/colorways.ts b/src/lib/yarns/hobbii/friends-wheel/colorways.ts new file mode 100644 index 0000000..7267d39 --- /dev/null +++ b/src/lib/yarns/hobbii/friends-wheel/colorways.ts @@ -0,0 +1,214 @@ +import type { Colorway } from '$lib/types'; + +const colorways: Colorway[] = [ + { + source: { + name: 'hobbii.com', + href: 'https://hobbii.com/friends-wheel', + accessed: '2024-11-09', + }, + colors: [ + { + hex: '#f5f2ef', + name: 'Off White', + }, + { + hex: '#f3e2d6', + name: 'Cream', + }, + { + hex: '#c1b4ad', + name: 'Sand', + }, + { + hex: '#8f7c6d', + name: 'Dune', + }, + { + hex: '#bc936a', + name: 'Nougat', + }, + { + hex: '#532015', + name: 'Chocolate', + }, + { + hex: '#7f4925', + name: 'Caramel', + }, + { + hex: '#973b23', + name: 'Cognac', + }, + { + hex: '#f7e281', + name: 'Lemon Curd', + }, + { + hex: '#edb144', + name: 'Dark Yellow', + }, + { + hex: '#ea9341', + name: 'Buckthorn', + }, + { + hex: '#e06536', + name: 'Pumpkin', + }, + { + hex: '#d14c5c', + name: 'Bubblegum', + }, + { + hex: '#a12823', + name: 'Tomato', + }, + { + hex: '#631815', + name: 'Bordeaux', + }, + { + hex: '#efc0c7', + name: 'Rose', + }, + { + hex: '#c33972', + name: 'Pink', + }, + { + hex: '#f6e0e0', + name: 'Hint Of Pink', + }, + { + hex: '#dd8992', + name: 'Pink Berry Smoothie', + }, + { + hex: '#b5585d', + name: 'Mulberry', + }, + { + hex: '#ac9491', + name: 'Dusty Mauve', + }, + { + hex: '#4b2d2c', + name: 'Black Cherry', + }, + { + hex: '#612b57', + name: 'Plum', + }, + { + hex: '#bea6c6', + name: 'Lilac', + }, + { + hex: '#562c66', + name: 'Grape', + }, + { + hex: '#26163d', + name: 'Black Currant', + }, + { + hex: '#bec2cd', + name: 'Baby Blue', + }, + { + hex: '#7b94b6', + name: 'Arctic Blue', + }, + { + hex: '#374f65', + name: 'Open Sea', + }, + { + hex: '#4d6aa5', + name: 'French Blue', + }, + { + hex: '#1e1f5f', + name: 'Sapphire', + }, + { + hex: '#212141', + name: 'Navy', + }, + { + hex: '#131728', + name: 'Midnight Blue', + }, + { + hex: '#193946', + name: 'Deep Ocean', + }, + { + hex: '#4593b4', + name: 'Capri Blue', + }, + { + hex: '#36779e', + name: 'Aqua', + }, + { + hex: '#3b78a1', + name: 'Lagoon', + }, + { + hex: '#68c8bd', + name: 'Turquoise', + }, + { + hex: '#42908c', + name: 'Dark Turquoise', + }, + { + hex: '#265557', + name: 'Teal', + }, + { + hex: '#52a049', + name: 'Shamrock', + }, + { + hex: '#2d6533', + name: 'Emerald', + }, + { + hex: '#dad38a', + name: 'Pale Matcha', + }, + { + hex: '#818b50', + name: 'Artichoke', + }, + { + hex: '#91ada8', + name: 'Misty Green', + }, + { + hex: '#6d825f', + name: 'Sage', + }, + { + hex: '#c9c8c8', + name: 'Light Gray', + }, + { + hex: '#a19e9b', + name: 'Gray', + }, + { + hex: '#584d51', + name: 'Anthracite', + }, + { + hex: '#1c1d25', + name: 'Black', + }, + ], + }, +]; +export default colorways; diff --git a/src/lib/yarns/hobbii/friends-wheel/yarn.ts b/src/lib/yarns/hobbii/friends-wheel/yarn.ts new file mode 100644 index 0000000..9f65ffb --- /dev/null +++ b/src/lib/yarns/hobbii/friends-wheel/yarn.ts @@ -0,0 +1,9 @@ +import type { Yarn } from '$lib/types'; +import colorways from './colorways'; + +export const yarn: Yarn = { + colorways, + name: 'Friends Wheel', + id: 'friends_wheel', + weightId: 's', +}; diff --git a/src/lib/yarns/hobbii/twister-solid/colorways.ts b/src/lib/yarns/hobbii/twister-solid/colorways.ts index 2e292f3..89a461c 100644 --- a/src/lib/yarns/hobbii/twister-solid/colorways.ts +++ b/src/lib/yarns/hobbii/twister-solid/colorways.ts @@ -9,128 +9,204 @@ const colorways: Colorway[] = [ }, colors: [ { - name: 'Sea Salt', - hex: '#fbfbfb', + hex: '#f1eee4', + name: 'Natural White', }, { - name: 'Rosy Beach', - hex: '#e9d6c9', + hex: '#999692', + name: 'Silver Grey', }, { - name: 'Pebbles', - hex: '#b9b7bc', + hex: '#d3d2ca', + name: 'Light Grey', }, { - name: 'Misty Blue', - hex: '#a0b7bf', + hex: '#65615e', + name: 'Dark Grey', }, { - name: 'Vintage Lavender', - hex: '#838ead', + hex: '#191718', + name: 'Black', }, { - name: 'Ultramarine', - hex: '#224d91', + hex: '#272a33', + name: 'Navy', }, { - name: 'Seaside Blue', - hex: '#92c0db', + hex: '#2a5e64', + name: 'Teal', }, { - name: 'Dark Mint', - hex: '#58bdb6', + hex: '#cac0d1', + name: 'Light Purple', }, { - name: 'Midnight Teal', - hex: '#2b535f', + hex: '#f1dcd2', + name: 'Light Rose', }, { - name: 'Golden Spices', - hex: '#d8a660', + hex: '#ad6d72', + name: 'Dusty Rose', }, { - name: 'Chilies', - hex: '#a92437', + hex: '#91353f', + name: 'Marsala', }, { - name: 'Pink Punch', - hex: '#d652a5', + hex: '#a6262a', + name: 'Red', }, { - name: 'Frozen Berries', - hex: '#963c87', + hex: '#e18475', + name: 'Flamingo', }, { - name: 'Powder Rouge', - hex: '#e2b0b7', + hex: '#e6b2be', + name: 'Light Pink', }, { - name: 'Raspberry Jam', - hex: '#e8a1ba', + hex: '#af6a7d', + name: 'Peony', }, { - name: 'Heather Meadow', - hex: '#9e87b8', + hex: '#5e324e', + name: 'Plum', }, { - name: 'Old Rose', - hex: '#957378', + hex: '#531e23', + name: 'Wine', }, { - name: 'Mocha', - hex: '#987d70', + hex: '#824028', + name: 'Amber', }, { - name: 'Cinnamon', - hex: '#9c6236', + hex: '#b56138', + name: 'Ginger', }, { - name: 'Curry', - hex: '#ba8043', + hex: '#e1a546', + name: 'Corn', }, { - name: 'Rust', - hex: '#b9542d', + hex: '#eadec9', + name: 'Cream', }, { - name: 'Cherry', - hex: '#a1232f', + hex: '#bcc3ae', + name: 'Glacier', }, { - name: 'Sunshine', - hex: '#edb04e', + hex: '#83c8b9', + name: 'Mint', }, { - name: 'Spring Leaves', - hex: '#85933f', + hex: '#397f83', + name: 'Turquoise', }, { - name: 'Emerald', - hex: '#3b8067', + hex: '#2e5474', + name: 'Dutch Blue', }, { - name: 'Seagrass', - hex: '#5ebb8e', + hex: '#222b43', + name: 'Dark Denim', }, { - name: 'Irish Mint', - hex: '#91d5d1', + hex: '#47505a', + name: 'Steel Blue', }, { - name: 'Turquoise', - hex: '#68a6c5', + hex: '#8293ac', + name: 'Light Blue', + }, + { + hex: '#95c1c8', + name: 'Iceberg', + }, + { + hex: '#533e7f', + name: 'Violet', + }, + { + hex: '#4b314d', + name: 'Aubergine', + }, + { + hex: '#a54799', + name: 'Magenta', + }, + { + hex: '#c74683', + name: 'Raspberry', + }, + { + hex: '#e36a89', + name: 'Coral', + }, + { + hex: '#f0ced3', + name: 'Light Peach', + }, + { + hex: '#dfcebc', + name: 'Light Tan', + }, + { + hex: '#b1a498', + name: 'Oak', + }, + { + hex: '#7a4f49', + name: 'Raisin', + }, + { + hex: '#463c37', + name: 'Dark Chocolate', + }, + { + hex: '#454e3e', + name: 'Soft Moss', + }, + { + hex: '#a7a575', + name: 'Khaki Green', + }, + { + hex: '#d0ddb5', + name: 'Wasabi', + }, + { + hex: '#97be7d', + name: 'Green Apple', + }, + { + hex: '#4b8154', + name: 'Bright Green', + }, + { + hex: '#27587c', + name: 'Dark Teal', + }, + { + hex: '#2758a0', + name: 'Royal Blue', + }, + { + hex: '#7f92b9', + name: 'Dusty Blue', }, { - name: 'Light Petroleum', - hex: '#36758c', + hex: '#4eabcf', + name: 'Bright Turquoise', }, { - name: 'Peacock', - hex: '#305f56', + hex: '#e48355', + name: 'Tangerine', }, { - name: 'Summer Green', - hex: '#7a9687', + hex: '#f1ce86', + name: 'Pineapple', }, ], }, diff --git a/src/lib/yarns/hobbii/yarns.ts b/src/lib/yarns/hobbii/yarns.ts index dad213d..deae541 100644 --- a/src/lib/yarns/hobbii/yarns.ts +++ b/src/lib/yarns/hobbii/yarns.ts @@ -2,6 +2,7 @@ import type { Brand } from '$lib/types'; import { yarn as amigo } from './amigo/yarn'; import { yarn as friendsCottonEightFour } from './friends-cotton-8-4/yarn'; import { yarn as friendsCottonSilk } from './friends-cotton-silk/yarn'; +import { yarn as friendsWheel } from './friends-wheel/yarn'; import { yarn as friendsWool } from './friends-wool/yarn'; import { yarn as happyPlaceSolid } from './happy-place-solid/yarn'; import { yarn as highlandWool } from './highland-wool/yarn'; @@ -10,6 +11,7 @@ import { yarn as kindFeather } from './kind-feather/yarn'; import { yarn as rainbowCottonEightFour } from './rainbow-cotton-8-4/yarn'; import { yarn as rainbowCottonEightEight } from './rainbow-cotton-8-8/yarn'; import { yarn as tweedDreams } from './tweed-dreams/yarn'; +import { yarn as twisterSolid } from './twister-solid/yarn'; import { yarn as unicornSolid } from './unicorn-solid/yarn'; import { yarn as winterGlowSolid } from './winter-glow-solid/yarn'; @@ -20,6 +22,7 @@ export const brand: Brand = { amigo, friendsCottonEightFour, friendsCottonSilk, + friendsWheel, friendsWool, happyPlaceSolid, highlandWool, @@ -28,6 +31,7 @@ export const brand: Brand = { rainbowCottonEightFour, rainbowCottonEightEight, tweedDreams, + twisterSolid, unicornSolid, winterGlowSolid, ], diff --git a/src/routes/.dev-tools/extract-yarn-colorways/+page.svelte b/src/routes/.dev-tools/extract-yarn-colorways/+page.svelte index b3541eb..5de98f7 100644 --- a/src/routes/.dev-tools/extract-yarn-colorways/+page.svelte +++ b/src/routes/.dev-tools/extract-yarn-colorways/+page.svelte @@ -12,7 +12,7 @@ let content: string = ''; let showClearButton = false; - let numberOfColumns = '3'; + let columnWidth = 200; $: querySelector = ''; $: useElementAttribute = false; @@ -236,32 +236,24 @@
{names.length} Colorways
-{index + 1}