From c417e2f4a1ef781fc135e2b855d05b7a77190171 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 8 Jan 2019 18:00:05 +0900 Subject: [PATCH] :art: --- src/client/app/theme.ts | 6 ++++-- src/client/theme/gray.json5 | 21 +++++++++++++++++++++ src/client/theme/natural.json5 | 23 ----------------------- src/client/theme/rainy.json5 | 20 ++++++++++++++++++++ 4 files changed, 45 insertions(+), 25 deletions(-) create mode 100644 src/client/theme/gray.json5 delete mode 100644 src/client/theme/natural.json5 create mode 100644 src/client/theme/rainy.json5 diff --git a/src/client/app/theme.ts b/src/client/app/theme.ts index 5653573c1d..a89df206e0 100644 --- a/src/client/app/theme.ts +++ b/src/client/app/theme.ts @@ -20,8 +20,9 @@ export const japaneseSushiSetTheme: Theme = require('../theme/japanese-sushi-set export const gruvboxDarkTheme: Theme = require('../theme/gruvbox-dark.json5'); export const monokaiTheme: Theme = require('../theme/monokai.json5'); export const colorfulTheme: Theme = require('../theme/colorful.json5'); -export const naturalTheme: Theme = require('../theme/natural.json5'); +export const rainyTheme: Theme = require('../theme/rainy.json5'); export const mauveTheme: Theme = require('../theme/mauve.json5'); +export const grayTheme: Theme = require('../theme/gray.json5'); export const builtinThemes = [ lightTheme, @@ -34,8 +35,9 @@ export const builtinThemes = [ gruvboxDarkTheme, monokaiTheme, colorfulTheme, - naturalTheme, + rainyTheme, mauveTheme, + grayTheme, ]; export function applyTheme(theme: Theme, persisted = true) { diff --git a/src/client/theme/gray.json5 b/src/client/theme/gray.json5 new file mode 100644 index 0000000000..59494f278a --- /dev/null +++ b/src/client/theme/gray.json5 @@ -0,0 +1,21 @@ +{ + id: '56ff14eb-1e6d-4c0c-9e84-71eb156234e5', + + name: 'Gray', + author: 'syuilo', + + base: 'light', + + vars: { + primary: '#C03233', + secondary: 'rgb(213, 213, 213)', + text: 'rgb(102, 102, 102)', + }, + + props: { + renoteGradient: '#bdbdbd', + renoteText: '$primary', + quoteBorder: '$primary', + desktopPostFormBg: '#ececec', + }, +} diff --git a/src/client/theme/natural.json5 b/src/client/theme/natural.json5 deleted file mode 100644 index 956c8dab36..0000000000 --- a/src/client/theme/natural.json5 +++ /dev/null @@ -1,23 +0,0 @@ -{ - id: 'b4b7d5fc-08d0-4915-b1cf-4090771e1a84', - - name: 'Natural', - author: 'syuilo', - - base: 'light', - - vars: { - primary: 'rgb(0, 179, 104)', - secondary: '#fef8ec', - text: 'rgb(136, 132, 119)', - }, - - props: { - bg: 'rgb(248, 239, 221)', - mfmMention: 'rgb(238, 150, 43)', - mfmMentionForeground: '#fff', - mfmUrl: 'rgb(0, 189, 214)', - mfmLink: 'rgb(255, 87, 146)', - mfmHashtag: 'rgb(179, 134, 0)' - }, -} diff --git a/src/client/theme/rainy.json5 b/src/client/theme/rainy.json5 new file mode 100644 index 0000000000..ba3854810f --- /dev/null +++ b/src/client/theme/rainy.json5 @@ -0,0 +1,20 @@ +{ + id: '2058b33e-5127-4e63-ae67-a900f3a11723', + + name: 'Rainy', + author: 'syuilo', + + base: 'light', + + vars: { + primary: 'rgb(100, 184, 193)', + secondary: 'rgb(228, 234, 234)', + text: 'rgb(85, 94, 92)', + }, + + props: { + renoteGradient: '#bcd0d0', + renoteText: '$primary', + quoteBorder: '$primary', + }, +}