From 80061c43e08a58081ea58628d5e708076d1d8aba Mon Sep 17 00:00:00 2001 From: Aurora Polnareff Date: Sat, 16 Dec 2023 16:15:17 +0300 Subject: [PATCH] update palettes and palettes modal --- locales/en/translation.json | 6 ++++-- locales/ru/translation.json | 6 ++++-- locales/zh_CN/translation.json | 6 ++++-- public/images/exit-button-night.svg | 4 ++-- src/common/palettes.ts | 14 +++++++++++++- src/common/themes.ts | 2 +- src/components/App.tsx | 2 +- src/components/PalettesModal.tsx | 16 +++++++++------- 8 files changed, 38 insertions(+), 18 deletions(-) diff --git a/locales/en/translation.json b/locales/en/translation.json index a2c0f5d..70d1274 100644 --- a/locales/en/translation.json +++ b/locales/en/translation.json @@ -88,7 +88,7 @@ "Corpus": "Corpus", "Darkness": "Darkness", "Daybreak": "Daybreak", - "Deca Heirloom": "Deca Heirloom", + "Deca Heirloom": "Deca", "Discord": "Discord", "Dojo": "Dojo", "Easter": "Easter", @@ -114,12 +114,14 @@ "Red White Blue": "Red/White/Blue", "Rollers": "Rollers", "Rot": "Rot", + "Sanctum": "Sanctum", "Shamrock": "Shamrock", "Smoke Colors": "Smoke Colors", "Spektaka": "Spektaka", "Storm": "Storm", - "Tenno II": "Tenno II", "Tenno": "Tenno", + "Tenno II": "Tenno II", + "Tenno III": "Tenno III", "Transmission": "Transmission", "Twilight": "Twilight", "Twitch": "Twitch", diff --git a/locales/ru/translation.json b/locales/ru/translation.json index 6b22578..56e11d3 100644 --- a/locales/ru/translation.json +++ b/locales/ru/translation.json @@ -87,7 +87,7 @@ "Corpus": "Корпус", "Darkness": "Тьма", "Daybreak": "Рассвет", - "Deca Heirloom": "Deca Heirloom", + "Deca Heirloom": "Deca", "Discord": "Discord", "Dojo": "Додзё", "Easter": "Пасха", @@ -111,12 +111,14 @@ "Red White Blue": "Красный, Белый и Синий", "Rollers": "Роллеры", "Rot": "Гниль", + "Sanctum": "Sanctum", "Shamrock": "Трилистник", "Smoke Colors": "Дымчатые Цвета", "Spektaka": "Спектака", "Storm": "Шторм", - "Tenno II": "Тэнно II", "Tenno": "Тэнно", + "Tenno II": "Тэнно II", + "Tenno III": "Тэнно III", "Transmission": "Передача", "Twilight": "Сумерки", "Twitch": "Twitch", diff --git a/locales/zh_CN/translation.json b/locales/zh_CN/translation.json index f62356a..83f996d 100644 --- a/locales/zh_CN/translation.json +++ b/locales/zh_CN/translation.json @@ -87,7 +87,7 @@ "Conquest": "Conquest", "Corpus": "Corpus", "Darkness": "Darkness", - "Deca Heirloom": "Deca Heirloom", + "Deca Heirloom": "Deca", "Daybreak": "破晓", "Discord": "Discord", "Dojo": "道场", @@ -114,12 +114,14 @@ "Red White Blue": "红/白/蓝", "Rollers": "滚球", "Rot": "Rot", + "Sanctum": "Sanctum", "Shamrock": "幸运草", "Smoke Colors": "烟灰色", "Spektaka": "华丽演出", "Storm": "暴雨", - "Tenno II": "Tenno II", "Tenno": "Tenno", + "Tenno II": "Tenno II", + "Tenno III": "Tenno III", "Transmission": "传播", "Twilight": "暮光", "Twitch": "Twitch", diff --git a/public/images/exit-button-night.svg b/public/images/exit-button-night.svg index 70d1da0..2f63dbc 100644 --- a/public/images/exit-button-night.svg +++ b/public/images/exit-button-night.svg @@ -1,4 +1,4 @@ - - + + diff --git a/src/common/palettes.ts b/src/common/palettes.ts index b150a04..edd69d7 100644 --- a/src/common/palettes.ts +++ b/src/common/palettes.ts @@ -6216,4 +6216,16 @@ export const palettes: Palette[] = [ "position": {"x": 2, "y": 17} }, {"hex": "#AD6100", "position": {"x": 3, "y": 17}}, {"hex": "#A35B00", "position": {"x": 4, "y": 17}}] }, - {name: "Void Trader", colors: [{"hex":"#01EFFF","position":{"x":0,"y":0}},{"hex":"#01DAE8","position":{"x":1,"y":0}},{"hex":"#01C4D1","position":{"x":2,"y":0}},{"hex":"#01AFBA","position":{"x":3,"y":0}},{"hex":"#0199A3","position":{"x":4,"y":0}},{"hex":"#01E8F7","position":{"x":0,"y":1}},{"hex":"#01D2E0","position":{"x":1,"y":1}},{"hex":"#01BDC9","position":{"x":2,"y":1}},{"hex":"#01A8B3","position":{"x":3,"y":1}},{"hex":"#01929C","position":{"x":4,"y":1}},{"hex":"#01E1F0","position":{"x":0,"y":2}},{"hex":"#01CBD9","position":{"x":1,"y":2}},{"hex":"#01B6C2","position":{"x":2,"y":2}},{"hex":"#01A0AB","position":{"x":3,"y":2}},{"hex":"#008B94","position":{"x":4,"y":2}},{"hex":"#96BEA6","position":{"x":0,"y":3}},{"hex":"#84A791","position":{"x":1,"y":3}},{"hex":"#728F7D","position":{"x":2,"y":3}},{"hex":"#5F7869","position":{"x":3,"y":3}},{"hex":"#4D6155","position":{"x":4,"y":3}},{"hex":"#90B69F","position":{"x":0,"y":4}},{"hex":"#7E9F8B","position":{"x":1,"y":4}},{"hex":"#6C8777","position":{"x":2,"y":4}},{"hex":"#597062","position":{"x":3,"y":4}},{"hex":"#47594E","position":{"x":4,"y":4}},{"hex":"#8AAE98","position":{"x":0,"y":5}},{"hex":"#789684","position":{"x":1,"y":5}},{"hex":"#658070","position":{"x":2,"y":5}},{"hex":"#53695C","position":{"x":3,"y":5}},{"hex":"#405147","position":{"x":4,"y":5}},{"hex":"#9DD7D9","position":{"x":0,"y":6}},{"hex":"#92C8C9","position":{"x":1,"y":6}},{"hex":"#87B9BA","position":{"x":2,"y":6}},{"hex":"#7CA9AB","position":{"x":3,"y":6}},{"hex":"#719A9C","position":{"x":4,"y":6}},{"hex":"#99D2D4","position":{"x":0,"y":7}},{"hex":"#8EC3C4","position":{"x":1,"y":7}},{"hex":"#83B4B5","position":{"x":2,"y":7}},{"hex":"#78A4A6","position":{"x":3,"y":7}},{"hex":"#6D9596","position":{"x":4,"y":7}},{"hex":"#96CDCF","position":{"x":0,"y":8}},{"hex":"#8BBEBF","position":{"x":1,"y":8}},{"hex":"#80AEB0","position":{"x":2,"y":8}},{"hex":"#759FA1","position":{"x":3,"y":8}},{"hex":"#668B8C","position":{"x":4,"y":8}},{"hex":"#AD7D63","position":{"x":0,"y":9}},{"hex":"#966C56","position":{"x":1,"y":9}},{"hex":"#805C49","position":{"x":2,"y":9}},{"hex":"#66493A","position":{"x":3,"y":9}},{"hex":"#4F392D","position":{"x":4,"y":9}},{"hex":"#A6775E","position":{"x":0,"y":10}},{"hex":"#8F6751","position":{"x":1,"y":10}},{"hex":"#785644","position":{"x":2,"y":10}},{"hex":"#5E4436","position":{"x":3,"y":10}},{"hex":"#473329","position":{"x":4,"y":10}},{"hex":"#9E725A","position":{"x":0,"y":11}},{"hex":"#87614D","position":{"x":1,"y":11}},{"hex":"#6E4F3F","position":{"x":2,"y":11}},{"hex":"#573E31","position":{"x":3,"y":11}},{"hex":"#412F25","position":{"x":4,"y":11}},{"hex":"#67BEFF","position":{"x":0,"y":12}},{"hex":"#5EADE8","position":{"x":1,"y":12}},{"hex":"#559CD1","position":{"x":2,"y":12}},{"hex":"#4B8BBA","position":{"x":3,"y":12}},{"hex":"#417AA3","position":{"x":4,"y":12}},{"hex":"#64B8F7","position":{"x":0,"y":13}},{"hex":"#5BA7E0","position":{"x":1,"y":13}},{"hex":"#5296C9","position":{"x":2,"y":13}},{"hex":"#4785B3","position":{"x":3,"y":13}},{"hex":"#3E749C","position":{"x":4,"y":13}},{"hex":"#61B2F0","position":{"x":0,"y":14}},{"hex":"#58A1D9","position":{"x":1,"y":14}},{"hex":"#4F90C2","position":{"x":2,"y":14}},{"hex":"#447FAB","position":{"x":3,"y":14}},{"hex":"#3B6E94","position":{"x":4,"y":14}},{"hex":"#A9A599","position":{"x":0,"y":15}},{"hex":"#928F84","position":{"x":1,"y":15}},{"hex":"#7A776F","position":{"x":2,"y":15}},{"hex":"#63605B","position":{"x":3,"y":15}},{"hex":"#4D4A46","position":{"x":4,"y":15}},{"hex":"#A29E92","position":{"x":0,"y":16}},{"hex":"#8B867D","position":{"x":1,"y":16}},{"hex":"#736F68","position":{"x":2,"y":16}},{"hex":"#5C5954","position":{"x":3,"y":16}},{"hex":"#45433F","position":{"x":4,"y":16}},{"hex":"#9A968B","position":{"x":0,"y":17}},{"hex":"#827F76","position":{"x":1,"y":17}},{"hex":"#6B6861","position":{"x":2,"y":17}},{"hex":"#54524D","position":{"x":3,"y":17}},{"hex":"#3E3C39","position":{"x":4,"y":17}}]}] + { + name: "Void Trader", + colors: [{"hex":"#01EFFF","position":{"x":0,"y":0}},{"hex":"#01DAE8","position":{"x":1,"y":0}},{"hex":"#01C4D1","position":{"x":2,"y":0}},{"hex":"#01AFBA","position":{"x":3,"y":0}},{"hex":"#0199A3","position":{"x":4,"y":0}},{"hex":"#01E8F7","position":{"x":0,"y":1}},{"hex":"#01D2E0","position":{"x":1,"y":1}},{"hex":"#01BDC9","position":{"x":2,"y":1}},{"hex":"#01A8B3","position":{"x":3,"y":1}},{"hex":"#01929C","position":{"x":4,"y":1}},{"hex":"#01E1F0","position":{"x":0,"y":2}},{"hex":"#01CBD9","position":{"x":1,"y":2}},{"hex":"#01B6C2","position":{"x":2,"y":2}},{"hex":"#01A0AB","position":{"x":3,"y":2}},{"hex":"#008B94","position":{"x":4,"y":2}},{"hex":"#96BEA6","position":{"x":0,"y":3}},{"hex":"#84A791","position":{"x":1,"y":3}},{"hex":"#728F7D","position":{"x":2,"y":3}},{"hex":"#5F7869","position":{"x":3,"y":3}},{"hex":"#4D6155","position":{"x":4,"y":3}},{"hex":"#90B69F","position":{"x":0,"y":4}},{"hex":"#7E9F8B","position":{"x":1,"y":4}},{"hex":"#6C8777","position":{"x":2,"y":4}},{"hex":"#597062","position":{"x":3,"y":4}},{"hex":"#47594E","position":{"x":4,"y":4}},{"hex":"#8AAE98","position":{"x":0,"y":5}},{"hex":"#789684","position":{"x":1,"y":5}},{"hex":"#658070","position":{"x":2,"y":5}},{"hex":"#53695C","position":{"x":3,"y":5}},{"hex":"#405147","position":{"x":4,"y":5}},{"hex":"#9DD7D9","position":{"x":0,"y":6}},{"hex":"#92C8C9","position":{"x":1,"y":6}},{"hex":"#87B9BA","position":{"x":2,"y":6}},{"hex":"#7CA9AB","position":{"x":3,"y":6}},{"hex":"#719A9C","position":{"x":4,"y":6}},{"hex":"#99D2D4","position":{"x":0,"y":7}},{"hex":"#8EC3C4","position":{"x":1,"y":7}},{"hex":"#83B4B5","position":{"x":2,"y":7}},{"hex":"#78A4A6","position":{"x":3,"y":7}},{"hex":"#6D9596","position":{"x":4,"y":7}},{"hex":"#96CDCF","position":{"x":0,"y":8}},{"hex":"#8BBEBF","position":{"x":1,"y":8}},{"hex":"#80AEB0","position":{"x":2,"y":8}},{"hex":"#759FA1","position":{"x":3,"y":8}},{"hex":"#668B8C","position":{"x":4,"y":8}},{"hex":"#AD7D63","position":{"x":0,"y":9}},{"hex":"#966C56","position":{"x":1,"y":9}},{"hex":"#805C49","position":{"x":2,"y":9}},{"hex":"#66493A","position":{"x":3,"y":9}},{"hex":"#4F392D","position":{"x":4,"y":9}},{"hex":"#A6775E","position":{"x":0,"y":10}},{"hex":"#8F6751","position":{"x":1,"y":10}},{"hex":"#785644","position":{"x":2,"y":10}},{"hex":"#5E4436","position":{"x":3,"y":10}},{"hex":"#473329","position":{"x":4,"y":10}},{"hex":"#9E725A","position":{"x":0,"y":11}},{"hex":"#87614D","position":{"x":1,"y":11}},{"hex":"#6E4F3F","position":{"x":2,"y":11}},{"hex":"#573E31","position":{"x":3,"y":11}},{"hex":"#412F25","position":{"x":4,"y":11}},{"hex":"#67BEFF","position":{"x":0,"y":12}},{"hex":"#5EADE8","position":{"x":1,"y":12}},{"hex":"#559CD1","position":{"x":2,"y":12}},{"hex":"#4B8BBA","position":{"x":3,"y":12}},{"hex":"#417AA3","position":{"x":4,"y":12}},{"hex":"#64B8F7","position":{"x":0,"y":13}},{"hex":"#5BA7E0","position":{"x":1,"y":13}},{"hex":"#5296C9","position":{"x":2,"y":13}},{"hex":"#4785B3","position":{"x":3,"y":13}},{"hex":"#3E749C","position":{"x":4,"y":13}},{"hex":"#61B2F0","position":{"x":0,"y":14}},{"hex":"#58A1D9","position":{"x":1,"y":14}},{"hex":"#4F90C2","position":{"x":2,"y":14}},{"hex":"#447FAB","position":{"x":3,"y":14}},{"hex":"#3B6E94","position":{"x":4,"y":14}},{"hex":"#A9A599","position":{"x":0,"y":15}},{"hex":"#928F84","position":{"x":1,"y":15}},{"hex":"#7A776F","position":{"x":2,"y":15}},{"hex":"#63605B","position":{"x":3,"y":15}},{"hex":"#4D4A46","position":{"x":4,"y":15}},{"hex":"#A29E92","position":{"x":0,"y":16}},{"hex":"#8B867D","position":{"x":1,"y":16}},{"hex":"#736F68","position":{"x":2,"y":16}},{"hex":"#5C5954","position":{"x":3,"y":16}},{"hex":"#45433F","position":{"x":4,"y":16}},{"hex":"#9A968B","position":{"x":0,"y":17}},{"hex":"#827F76","position":{"x":1,"y":17}},{"hex":"#6B6861","position":{"x":2,"y":17}},{"hex":"#54524D","position":{"x":3,"y":17}},{"hex":"#3E3C39","position":{"x":4,"y":17}}] + }, + { + name: "Sanctum", + colors: [{"hex":"#A5BDBA","position":{"x":0,"y":0}},{"hex":"#A1B9B6","position":{"x":1,"y":0}},{"hex":"#9CB4B1","position":{"x":2,"y":0}},{"hex":"#98AEAC","position":{"x":3,"y":0}},{"hex":"#93A9A6","position":{"x":4,"y":0}},{"hex":"#8FA4A1","position":{"x":0,"y":1}},{"hex":"#8B9F9C","position":{"x":1,"y":1}},{"hex":"#869A97","position":{"x":2,"y":1}},{"hex":"#829592","position":{"x":3,"y":1}},{"hex":"#7D8F8D","position":{"x":4,"y":1}},{"hex":"#798B88","position":{"x":0,"y":2}},{"hex":"#738583","position":{"x":1,"y":2}},{"hex":"#70807E","position":{"x":2,"y":2}},{"hex":"#6A7A79","position":{"x":3,"y":2}},{"hex":"#667574","position":{"x":4,"y":2}},{"hex":"#62706F","position":{"x":0,"y":3}},{"hex":"#5D6B6A","position":{"x":1,"y":3}},{"hex":"#596665","position":{"x":2,"y":3}},{"hex":"#546160","position":{"x":3,"y":3}},{"hex":"#505C5B","position":{"x":4,"y":3}},{"hex":"#C15E94","position":{"x":0,"y":4}},{"hex":"#BD5C91","position":{"x":1,"y":4}},{"hex":"#B8598D","position":{"x":2,"y":4}},{"hex":"#B35689","position":{"x":3,"y":4}},{"hex":"#AD5385","position":{"x":4,"y":4}},{"hex":"#A85181","position":{"x":0,"y":5}},{"hex":"#A34E7D","position":{"x":1,"y":5}},{"hex":"#9E4C79","position":{"x":2,"y":5}},{"hex":"#994975","position":{"x":3,"y":5}},{"hex":"#944771","position":{"x":4,"y":5}},{"hex":"#8F456D","position":{"x":0,"y":6}},{"hex":"#8A4269","position":{"x":1,"y":6}},{"hex":"#854066","position":{"x":2,"y":6}},{"hex":"#803D62","position":{"x":3,"y":6}},{"hex":"#7A3B5E","position":{"x":4,"y":6}},{"hex":"#75385A","position":{"x":0,"y":7}},{"hex":"#703656","position":{"x":1,"y":7}},{"hex":"#6B3352","position":{"x":2,"y":7}},{"hex":"#66314E","position":{"x":3,"y":7}},{"hex":"#612F4A","position":{"x":4,"y":7}},{"hex":"#292929","position":{"x":0,"y":8}},{"hex":"#292828","position":{"x":1,"y":8}},{"hex":"#292727","position":{"x":2,"y":8}},{"hex":"#292626","position":{"x":3,"y":8}},{"hex":"#292626","position":{"x":4,"y":8}},{"hex":"#292525","position":{"x":0,"y":9}},{"hex":"#292424","position":{"x":1,"y":9}},{"hex":"#292323","position":{"x":2,"y":9}},{"hex":"#292222","position":{"x":3,"y":9}},{"hex":"#292121","position":{"x":4,"y":9}},{"hex":"#292121","position":{"x":0,"y":10}},{"hex":"#292020","position":{"x":1,"y":10}},{"hex":"#291F1F","position":{"x":2,"y":10}},{"hex":"#291E1E","position":{"x":3,"y":10}},{"hex":"#291D1D","position":{"x":4,"y":10}},{"hex":"#291D1D","position":{"x":0,"y":11}},{"hex":"#291C1C","position":{"x":1,"y":11}},{"hex":"#291B1B","position":{"x":2,"y":11}},{"hex":"#291A1A","position":{"x":3,"y":11}},{"hex":"#291919","position":{"x":4,"y":11}},{"hex":"#C5A25D","position":{"x":0,"y":12}},{"hex":"#C09D5A","position":{"x":1,"y":12}},{"hex":"#BB9957","position":{"x":2,"y":12}},{"hex":"#B69555","position":{"x":3,"y":12}},{"hex":"#B19153","position":{"x":4,"y":12}},{"hex":"#AC8D50","position":{"x":0,"y":13}},{"hex":"#A6884E","position":{"x":1,"y":13}},{"hex":"#A1844C","position":{"x":2,"y":13}},{"hex":"#9C8049","position":{"x":3,"y":13}},{"hex":"#967C47","position":{"x":4,"y":13}},{"hex":"#917844","position":{"x":0,"y":14}},{"hex":"#8C7342","position":{"x":1,"y":14}},{"hex":"#876F40","position":{"x":2,"y":14}},{"hex":"#826B3D","position":{"x":3,"y":14}},{"hex":"#7D673B","position":{"x":4,"y":14}},{"hex":"#786338","position":{"x":0,"y":15}},{"hex":"#735E36","position":{"x":1,"y":15}},{"hex":"#6E5A34","position":{"x":2,"y":15}},{"hex":"#695631","position":{"x":3,"y":15}},{"hex":"#63522F","position":{"x":4,"y":15}},{"hex":"#03D0E4","position":{"x":0,"y":16}},{"hex":"#03C9DE","position":{"x":1,"y":16}},{"hex":"#03C4D9","position":{"x":2,"y":16}},{"hex":"#03C0D4","position":{"x":3,"y":16}},{"hex":"#03BBCF","position":{"x":4,"y":16}},{"hex":"#03B7C9","position":{"x":0,"y":17}},{"hex":"#03B2C4","position":{"x":1,"y":17}},{"hex":"#03ADBF","position":{"x":2,"y":17}},{"hex":"#03A9BA","position":{"x":3,"y":17}},{"hex":"#03A4B5","position":{"x":4,"y":17}}] + }, + { + name: "Tenno III", + colors: [{"hex":"#C5C0AE","position":{"x":0,"y":0}},{"hex":"#303143","position":{"x":1,"y":0}},{"hex":"#6C2322","position":{"x":2,"y":0}},{"hex":"#6F6F6F","position":{"x":3,"y":0}},{"hex":"#E24644","position":{"x":4,"y":0}},{"hex":"#D7CBB0","position":{"x":0,"y":1}},{"hex":"#6C8088","position":{"x":1,"y":1}},{"hex":"#151515","position":{"x":2,"y":1}},{"hex":"#FF8300","position":{"x":3,"y":1}},{"hex":"#2FE7E6","position":{"x":4,"y":1}},{"hex":"#8F69AA","position":{"x":0,"y":2}},{"hex":"#47629A","position":{"x":1,"y":2}},{"hex":"#81DA3A","position":{"x":2,"y":2}},{"hex":"#4BCDFE","position":{"x":3,"y":2}},{"hex":"#40D4E8","position":{"x":4,"y":2}},{"hex":"#5D5D7D","position":{"x":0,"y":3}},{"hex":"#1D1D1D","position":{"x":1,"y":3}},{"hex":"#DED198","position":{"x":2,"y":3}},{"hex":"#7D4783","position":{"x":3,"y":3}},{"hex":"#FF850F","position":{"x":4,"y":3}},{"hex":"#43414A","position":{"x":0,"y":4}},{"hex":"#4B7698","position":{"x":1,"y":4}},{"hex":"#979B9E","position":{"x":2,"y":4}},{"hex":"#FFD7A4","position":{"x":3,"y":4}},{"hex":"#01EEFF","position":{"x":4,"y":4}},{"hex":"#884D02","position":{"x":0,"y":5}},{"hex":"#B8A07D","position":{"x":1,"y":5}},{"hex":"#000000","position":{"x":2,"y":5}},{"hex":"#78655D","position":{"x":3,"y":5}},{"hex":"#FFE93A","position":{"x":4,"y":5}},{"hex":"#091429","position":{"x":0,"y":6}},{"hex":"#CA6F25","position":{"x":1,"y":6}},{"hex":"#D1B498","position":{"x":2,"y":6}},{"hex":"#BF8F72","position":{"x":3,"y":6}},{"hex":"#5AFFF3","position":{"x":4,"y":6}},{"hex":"#616175","position":{"x":0,"y":7}},{"hex":"#965861","position":{"x":1,"y":7}},{"hex":"#BDB2BA","position":{"x":2,"y":7}},{"hex":"#8F909A","position":{"x":3,"y":7}},{"hex":"#E6EFED","position":{"x":4,"y":7}},{"hex":"#F8E17D","position":{"x":0,"y":8}},{"hex":"#454857","position":{"x":1,"y":8}},{"hex":"#86B6A2","position":{"x":2,"y":8}},{"hex":"#F2E7DD","position":{"x":3,"y":8}},{"hex":"#F17530","position":{"x":4,"y":8}},{"hex":"#968078","position":{"x":0,"y":9}},{"hex":"#E3D0C9","position":{"x":1,"y":9}},{"hex":"#50112F","position":{"x":2,"y":9}},{"hex":"#381550","position":{"x":3,"y":9}},{"hex":"#DC5EFF","position":{"x":4,"y":9}},{"hex":"#354C5D","position":{"x":0,"y":10}},{"hex":"#D6CBD9","position":{"x":1,"y":10}},{"hex":"#73A9CC","position":{"x":2,"y":10}},{"hex":"#A47255","position":{"x":3,"y":10}},{"hex":"#6DC2FF","position":{"x":4,"y":10}},{"hex":"#F4F0E4","position":{"x":0,"y":11}},{"hex":"#BA3535","position":{"x":1,"y":11}},{"hex":"#0C0C2E","position":{"x":2,"y":11}},{"hex":"#A1A1A0","position":{"x":3,"y":11}},{"hex":"#58B1FF","position":{"x":4,"y":11}},{"hex":"#C2C0A8","position":{"x":0,"y":12}},{"hex":"#567B7B","position":{"x":1,"y":12}},{"hex":"#3A1F44","position":{"x":2,"y":12}},{"hex":"#8A4027","position":{"x":3,"y":12}},{"hex":"#58B1FF","position":{"x":4,"y":12}},{"hex":"#C2AF9C","position":{"x":0,"y":13}},{"hex":"#A04125","position":{"x":1,"y":13}},{"hex":"#586161","position":{"x":2,"y":13}},{"hex":"#4A4A4A","position":{"x":3,"y":13}},{"hex":"#E48528","position":{"x":4,"y":13}},{"hex":"#DEC0A0","position":{"x":0,"y":14}},{"hex":"#3C4D54","position":{"x":1,"y":14}},{"hex":"#BD5050","position":{"x":2,"y":14}},{"hex":"#5A5461","position":{"x":3,"y":14}},{"hex":"#FE5353","position":{"x":4,"y":14}},{"hex":"#FF6C00","position":{"x":0,"y":15}},{"hex":"#858585","position":{"x":1,"y":15}},{"hex":"#EDB2A8","position":{"x":2,"y":15}},{"hex":"#2E4954","position":{"x":3,"y":15}},{"hex":"#FFA200","position":{"x":4,"y":15}},{"hex":"#C25757","position":{"x":0,"y":16}},{"hex":"#5A7C85","position":{"x":1,"y":16}},{"hex":"#6C6C6C","position":{"x":2,"y":16}},{"hex":"#A5A3A2","position":{"x":3,"y":16}},{"hex":"#FFFFFE","position":{"x":4,"y":16}},{"hex":"#22222C","position":{"x":0,"y":17}},{"hex":"#750707","position":{"x":1,"y":17}},{"hex":"#CBCDDC","position":{"x":2,"y":17}},{"hex":"#92ABA2","position":{"x":3,"y":17}},{"hex":"#86F7EF","position":{"x":4,"y":17}}] + }, +] diff --git a/src/common/themes.ts b/src/common/themes.ts index 10395a5..3dbc032 100644 --- a/src/common/themes.ts +++ b/src/common/themes.ts @@ -30,7 +30,7 @@ export const nightTheme: ColorsWithMode = { buttons: "#424242", misc: "#424242", danger: "#B25858", - success: "#5AB45A", + success: "#329632", link: "#5C60B9", warning: "#c2ab5c", targetSchemeHeader: "#C25C5C", diff --git a/src/components/App.tsx b/src/components/App.tsx index 6b8853a..57806bf 100644 --- a/src/components/App.tsx +++ b/src/components/App.tsx @@ -78,7 +78,7 @@ function App() { { !process.env.index ? Hooray, we've gotten a new link!Please follow this guide to move your old palettes. : - Hippothoe & Moriscu,
last upd.: 27/08/2023 + Hippothoe & Moriscu,
last upd.: 16/12/2023 } {showPanel && } diff --git a/src/components/PalettesModal.tsx b/src/components/PalettesModal.tsx index 6759db4..f2c4bfb 100644 --- a/src/components/PalettesModal.tsx +++ b/src/components/PalettesModal.tsx @@ -6,6 +6,7 @@ import {Button} from "./shared/Button"; import {Divider} from "./shared/Divider"; import {WarframePalette} from "./shared/WarframePalette"; import {useTranslation} from "react-i18next"; +import { sortBy } from "lodash"; interface PalettesModalProps { show: boolean, @@ -41,8 +42,8 @@ export const PalettesModal = ( - - {palettes.map(({name}) => - @@ -70,7 +71,7 @@ const HoveredPalette = styled.div` position: absolute; right: -11.2em; top: -1.9em; - border: 4px solid ${props => props.theme.colors.textOnBackground}; + border: 4px solid ${props => props.theme.colors.buttons}; padding: 0.4em 0.6em; background-color: ${({theme}) => theme.colors.background}; border-radius: 0.8em; @@ -94,9 +95,10 @@ const PaletteName = styled.div` const Grid = styled.div` color: ${props => props.theme.colors.textOnBackground}; display: grid; - grid-template-columns: repeat(4, 1fr); + grid-template-rows: repeat(15, 1fr); row-gap: 0.2em; - + grid-auto-flow: column; justify-items: start; + margin-bottom: 0.8em; `