From 1e95a0795a6f7f1db49244430d1498987f6b3969 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 17 Feb 2020 23:59:52 +0200 Subject: [PATCH] paper theme, updated todo, lol --- src/services/style_setter/style_setter.js | 2 +- static/styles.json | 2 +- static/themes/kenomo.json | 71 --------- static/themes/paper.json | 172 ++++++++++++++++++++++ 4 files changed, 174 insertions(+), 73 deletions(-) delete mode 100644 static/themes/kenomo.json create mode 100644 static/themes/paper.json diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js index c8610507e8..fbdcf56231 100644 --- a/src/services/style_setter/style_setter.js +++ b/src/services/style_setter/style_setter.js @@ -270,7 +270,7 @@ export const generateShadows = (input, colors) => { rules: { shadows: Object .entries(shadows) - // TODO for v2.1: if shadow doesn't have non-inset shadows with spread > 0 - optionally + // TODO for v2.2: if shadow doesn't have non-inset shadows with spread > 0 - optionally // convert all non-inset shadows into filter: drop-shadow() to boost performance .map(([k, v]) => [ `--${k}Shadow: ${getCssShadow(v)}`, diff --git a/static/styles.json b/static/styles.json index 54c0335f74..3349a8377c 100644 --- a/static/styles.json +++ b/static/styles.json @@ -13,5 +13,5 @@ "breezy-dark": "/static/themes/breezy-dark.json", "breezy-light": "/static/themes/breezy-light.json", "mammal": "/static/themes/mammal.json", - "kenomo": "/static/themes/kenomo.json" + "paper": "/static/themes/paper.json" } diff --git a/static/themes/kenomo.json b/static/themes/kenomo.json deleted file mode 100644 index 98ddf97436..0000000000 --- a/static/themes/kenomo.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "_pleroma_theme_version": 2, - "name": "Kenomo", - "source": { - "themeEngineVersion": 3, - "fonts": {}, - "shadows": { - "panel": [], - "topBar": [], - "button": [ - { - "x": 0, - "y": 1, - "blur": 0, - "spread": 0, - "color": "#FFFFFF", - "alpha": 0.2, - "inset": true - }, - { - "x": 0, - "y": -1, - "blur": 0, - "spread": 0, - "color": "#000000", - "alpha": 0.2, - "inset": true - } - ], - "input": [ - { - "x": 0, - "y": "0", - "blur": 0, - "spread": "1", - "color": "#576574", - "alpha": "1", - "inset": true - } - ] - }, - "opacity": { - "underlay": "1", - "border": "0" - }, - "colors": { - "bg": "#ffffff", - "fg": "#f6f6f6", - "text": "#494949", - "underlay": "#ffffff", - "link": "#818181", - "accent": "#818181", - "cBlue": "#2e86de", - "cRed": "#c96248", - "cGreen": "#0fa00f", - "cOrange": "#aa7623", - "postLink": "#2e86de", - "border": "#ffffff", - "icon": "#8a8a8a", - "panel": "transparent", - "topBarText": "#4b4b4b", - "tab": "--btn,-30", - "btn": "#576574" - }, - "radii": { - "panel": "0", - "avatar": "6", - "avatarAlt": "6" - } - } -} diff --git a/static/themes/paper.json b/static/themes/paper.json new file mode 100644 index 0000000000..a3b90a0a11 --- /dev/null +++ b/static/themes/paper.json @@ -0,0 +1,172 @@ +{ + "_pleroma_theme_version": 2, + "name": "Paper", + "source": { + "themeEngineVersion": 3, + "fonts": {}, + "shadows": { + "panel": [ + { + "x": "0", + "y": "2", + "blur": "9", + "spread": 0, + "inset": false, + "color": "#668bb2", + "alpha": "0.1" + }, + { + "x": "0", + "y": "1", + "blur": "2", + "spread": "-1", + "inset": false, + "color": "#668bb2", + "alpha": "0.1" + } + ], + "topBar": [ + { + "x": 0, + "y": "3", + "blur": "8", + "spread": 0, + "inset": false, + "color": "#3e618e", + "alpha": "0.1" + }, + { + "x": 0, + "y": "1", + "blur": "4", + "spread": 0, + "inset": false, + "color": "#3e618e", + "alpha": "0.1" + } + ], + "button": [ + { + "x": 0, + "y": "2", + "blur": "5", + "spread": 0, + "color": "#463f78", + "alpha": "0.1", + "inset": false + } + ], + "input": [ + { + "x": 0, + "y": "1", + "blur": "2", + "spread": 0, + "inset": true, + "color": "#6277b7", + "alpha": "0.1" + } + ], + "buttonHover": [ + { + "x": 0, + "y": "2", + "blur": "5", + "spread": 0, + "color": "#494949", + "alpha": "0.1" + }, + { + "x": 0, + "y": "2", + "blur": "0", + "spread": "20", + "color": "#ffffff", + "alpha": "1", + "inset": true + } + ], + "buttonPressed": [ + { + "x": 0, + "y": 0, + "blur": "4", + "spread": "0", + "color": "#494949", + "alpha": "0.8", + "inset": false + } + ], + "avatarStatus": [ + { + "x": "0", + "y": "2", + "blur": "4", + "spread": "0", + "inset": false, + "color": "#3e618e", + "alpha": "0.1" + } + ], + "avatar": [ + { + "x": 0, + "y": "2", + "blur": "5", + "spread": "0", + "color": "#3e618e", + "alpha": "0.9" + } + ], + "popup": [ + { + "x": "0", + "y": "3", + "blur": "11", + "spread": 0, + "color": "#668bb2", + "alpha": "0.2" + }, + { + "x": "0", + "y": "2", + "blur": "3", + "spread": "-1", + "color": "#668bb2", + "alpha": "0.2" + } + ] + }, + "opacity": { + "underlay": "1", + "border": "0" + }, + "colors": { + "bg": "#ffffff", + "fg": "#f6f6f6", + "text": "#494949", + "underlay": "#ffffff", + "link": "#788ca1", + "accent": "#97a0aa", + "cBlue": "#788ca1", + "cRed": "#eed7ce", + "cGreen": "#788ca1", + "cOrange": "#788ca1", + "postLink": "#788ca1", + "border": "#ffffff", + "icon": "#b6c9c4", + "panel": "#ffffff", + "topBarText": "#4b4b4b" + }, + "radii": { + "btn": "0", + "input": "0", + "checkbox": "0", + "panel": "0", + "avatar": "2", + "avatarAlt": "2", + "tooltip": "0", + "attachment": "0" + } + } +}