From 572c874f5cd1e997de70c7771075ca1444f95549 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 26 Nov 2018 02:29:08 +0300 Subject: theme separation --- static/themes/redmond-xx-se.json | 285 +++++++++++++++++++++++++++++++++++++++ static/themes/redmond-xx.json | 274 +++++++++++++++++++++++++++++++++++++ static/themes/redmond-xxi.json | 285 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 844 insertions(+) create mode 100644 static/themes/redmond-xx-se.json create mode 100644 static/themes/redmond-xx.json create mode 100644 static/themes/redmond-xxi.json (limited to 'static/themes') diff --git a/static/themes/redmond-xx-se.json b/static/themes/redmond-xx-se.json new file mode 100644 index 00000000..e4cdbdee --- /dev/null +++ b/static/themes/redmond-xx-se.json @@ -0,0 +1,285 @@ +{ + "_pleroma_theme_version": 2, + "name": "Redmond XX SE", + "theme": { + "shadows": { + "panel": [ + { + "x": "-1", + "y": "-1", + "blur": "0", + "spread": 0, + "color": "#000000", + "alpha": "1", + "inset": true + }, + { + "x": "1", + "y": "1", + "blur": "0", + "spread": 0, + "color": "#dfdfdf", + "alpha": "1", + "inset": true + }, + { + "x": "-2", + "y": "-2", + "blur": "0", + "spread": 0, + "color": "#848484", + "alpha": "1", + "inset": true + }, + { + "x": "2", + "y": "2", + "blur": "0", + "spread": 0, + "color": "#FFFFFF", + "alpha": "1", + "inset": true + }, + { + "x": "0", + "y": "0", + "blur": "0", + "spread": "3", + "color": "--bg", + "alpha": "1", + "inset": true + } + ], + "button": [ + { + "x": "-1", + "y": "-1", + "blur": "0", + "spread": 0, + "color": "#000000", + "alpha": "1", + "inset": true + }, + { + "x": "1", + "y": "1", + "blur": "0", + "spread": 0, + "color": "#FFFFFF", + "alpha": "1", + "inset": true + }, + { + "x": "-2", + "y": "-2", + "blur": "0", + "spread": 0, + "color": "#848484", + "alpha": "1", + "inset": true + }, + { + "x": "2", + "y": "2", + "blur": "0", + "spread": 0, + "color": "#dfdfdf", + "alpha": "1", + "inset": true + }, + { + "x": "0", + "y": "0", + "blur": "0", + "spread": "3", + "color": "--bg", + "alpha": "1", + "inset": true + } + ], + "buttonHover": [ + { + "x": "-1", + "y": "-1", + "blur": "0", + "spread": 0, + "color": "#000000", + "alpha": "1", + "inset": true + }, + { + "x": "1", + "y": "1", + "blur": "0", + "spread": 0, + "color": "#FFFFFF", + "alpha": "1", + "inset": true + }, + { + "x": "-2", + "y": "-2", + "blur": "0", + "spread": 0, + "color": "#848484", + "alpha": "1", + "inset": true + }, + { + "x": "2", + "y": "2", + "blur": "0", + "spread": 0, + "color": "#dfdfdf", + "alpha": "1", + "inset": true + }, + { + "x": "0", + "y": "0", + "blur": "0", + "spread": "3", + "color": "--bg", + "alpha": "1", + "inset": true + } + ], + "buttonPressed": [ + { + "x": "1", + "y": "1", + "blur": "0", + "spread": 0, + "color": "#000000", + "alpha": "1", + "inset": true + }, + { + "x": "-1", + "y": "-1", + "blur": "0", + "spread": 0, + "color": "#FFFFFF", + "alpha": "1", + "inset": true + }, + { + "x": "2", + "y": "2", + "blur": "0", + "spread": 0, + "color": "#848484", + "alpha": "1", + "inset": true + }, + { + "x": "-2", + "y": "-2", + "blur": "0", + "spread": 0, + "color": "#dfdfdf", + "alpha": "1", + "inset": true + }, + { + "x": "0", + "y": "0", + "blur": "0", + "spread": "3", + "color": "--bg", + "alpha": "1", + "inset": true + } + ], + "input": [ + { + "x": "-1", + "y": "-1", + "blur": "0", + "spread": 0, + "color": "#FFFFFF", + "alpha": "1", + "inset": true + }, + { + "x": "1", + "y": "1", + "blur": "0", + "spread": 0, + "color": "#848484", + "alpha": "1", + "inset": true + }, + { + "x": "-2", + "y": "-2", + "blur": "0", + "spread": 0, + "color": "#dfdfdf", + "alpha": "1", + "inset": true + }, + { + "x": "2", + "y": "2", + "blur": "0", + "spread": 0, + "color": "#000000", + "alpha": "1", + "inset": true + }, + { + "x": "0", + "y": "0", + "blur": "0", + "spread": "3", + "color": "--input", + "alpha": "1", + "inset": true + } + ], + "panelHeader": [ + { + "x": "-2200", + "y": 0, + "blur": "200", + "spread": "-2000", + "inset": true, + "color": "#1084d0", + "alpha": 1 + } + ] + }, + "opacity": { + "input": "1" + }, + "colors": { + "bg": "#c0c0c0", + "text": "#000000", + "link": "#0000ff", + "fg": "#c0c0c0", + "panel": "#000080", + "input": "#ffffff", + "topBar": "#000080", + "topBarLink": "#ffffff", + "btn": "#c0c0c0", + "faint": "#3f3f3f", + "faintLink": "#404080", + "border": "#808080", + "cRed": "#FF0000", + "cBlue": "#008080", + "cGreen": "#00FF00", + "cOrange": "#808000" + }, + "radii": { + "btn": "0", + "input": "0", + "checkbox": "0", + "panel": "0", + "avatar": "0", + "avatarAlt": "0", + "tooltip": "0", + "attachment": "0" + } + } +} diff --git a/static/themes/redmond-xx.json b/static/themes/redmond-xx.json new file mode 100644 index 00000000..96dff499 --- /dev/null +++ b/static/themes/redmond-xx.json @@ -0,0 +1,274 @@ +{ + "_pleroma_theme_version": 2, + "name": "Redmond XX", + "theme": { + "shadows": { + "panel": [ + { + "x": "-1", + "y": "-1", + "blur": "0", + "spread": 0, + "color": "#000000", + "alpha": "1", + "inset": true + }, + { + "x": "1", + "y": "1", + "blur": "0", + "spread": 0, + "color": "#dfdfdf", + "alpha": "1", + "inset": true + }, + { + "x": "-2", + "y": "-2", + "blur": "0", + "spread": 0, + "color": "#848484", + "alpha": "1", + "inset": true + }, + { + "x": "2", + "y": "2", + "blur": "0", + "spread": 0, + "color": "#FFFFFF", + "alpha": "1", + "inset": true + }, + { + "x": "0", + "y": "0", + "blur": "0", + "spread": "3", + "color": "--bg", + "alpha": "1", + "inset": true + } + ], + "button": [ + { + "x": "-1", + "y": "-1", + "blur": "0", + "spread": 0, + "color": "#000000", + "alpha": "1", + "inset": true + }, + { + "x": "1", + "y": "1", + "blur": "0", + "spread": 0, + "color": "#FFFFFF", + "alpha": "1", + "inset": true + }, + { + "x": "-2", + "y": "-2", + "blur": "0", + "spread": 0, + "color": "#848484", + "alpha": "1", + "inset": true + }, + { + "x": "2", + "y": "2", + "blur": "0", + "spread": 0, + "color": "#dfdfdf", + "alpha": "1", + "inset": true + }, + { + "x": "0", + "y": "0", + "blur": "0", + "spread": "3", + "color": "--bg", + "alpha": "1", + "inset": true + } + ], + "buttonHover": [ + { + "x": "-1", + "y": "-1", + "blur": "0", + "spread": 0, + "color": "#000000", + "alpha": "1", + "inset": true + }, + { + "x": "1", + "y": "1", + "blur": "0", + "spread": 0, + "color": "#FFFFFF", + "alpha": "1", + "inset": true + }, + { + "x": "-2", + "y": "-2", + "blur": "0", + "spread": 0, + "color": "#848484", + "alpha": "1", + "inset": true + }, + { + "x": "2", + "y": "2", + "blur": "0", + "spread": 0, + "color": "#dfdfdf", + "alpha": "1", + "inset": true + }, + { + "x": "0", + "y": "0", + "blur": "0", + "spread": "3", + "color": "--bg", + "alpha": "1", + "inset": true + } + ], + "buttonPressed": [ + { + "x": "1", + "y": "1", + "blur": "0", + "spread": 0, + "color": "#000000", + "alpha": "1", + "inset": true + }, + { + "x": "-1", + "y": "-1", + "blur": "0", + "spread": 0, + "color": "#FFFFFF", + "alpha": "1", + "inset": true + }, + { + "x": "2", + "y": "2", + "blur": "0", + "spread": 0, + "color": "#848484", + "alpha": "1", + "inset": true + }, + { + "x": "-2", + "y": "-2", + "blur": "0", + "spread": 0, + "color": "#dfdfdf", + "alpha": "1", + "inset": true + }, + { + "x": "0", + "y": "0", + "blur": "0", + "spread": "3", + "color": "--bg", + "alpha": "1", + "inset": true + } + ], + "input": [ + { + "x": "-1", + "y": "-1", + "blur": "0", + "spread": 0, + "color": "#FFFFFF", + "alpha": "1", + "inset": true + }, + { + "x": "1", + "y": "1", + "blur": "0", + "spread": 0, + "color": "#848484", + "alpha": "1", + "inset": true + }, + { + "x": "-2", + "y": "-2", + "blur": "0", + "spread": 0, + "color": "#dfdfdf", + "alpha": "1", + "inset": true + }, + { + "x": "2", + "y": "2", + "blur": "0", + "spread": 0, + "color": "#000000", + "alpha": "1", + "inset": true + }, + { + "x": "0", + "y": "0", + "blur": "0", + "spread": "3", + "color": "--input", + "alpha": "1", + "inset": true + } + ] + }, + "opacity": { + "input": "1" + }, + "colors": { + "bg": "#c0c0c0", + "text": "#000000", + "link": "#0000ff", + "fg": "#c0c0c0", + "panel": "#000080", + "input": "#ffffff", + "topBar": "#000080", + "topBarLink": "#ffffff", + "btn": "#c0c0c0", + "faint": "#3f3f3f", + "faintLink": "#404080", + "border": "#808080", + "cRed": "#FF0000", + "cBlue": "#008080", + "cGreen": "#00FF00", + "cOrange": "#808000" + }, + "radii": { + "btn": "0", + "input": "0", + "checkbox": "0", + "panel": "0", + "avatar": "0", + "avatarAlt": "0", + "tooltip": "0", + "attachment": "0" + } + } +} diff --git a/static/themes/redmond-xxi.json b/static/themes/redmond-xxi.json new file mode 100644 index 00000000..1469cc6b --- /dev/null +++ b/static/themes/redmond-xxi.json @@ -0,0 +1,285 @@ +{ + "_pleroma_theme_version": 2, + "name": "Redmond XXI", + "theme": { + "shadows": { + "panel": [ + { + "x": "-1", + "y": "-1", + "blur": "0", + "spread": 0, + "color": "#000000", + "alpha": "1", + "inset": true + }, + { + "x": "1", + "y": "1", + "blur": "0", + "spread": 0, + "color": "#dfdfdf", + "alpha": "1", + "inset": true + }, + { + "x": "-2", + "y": "-2", + "blur": "0", + "spread": 0, + "color": "#848484", + "alpha": "1", + "inset": true + }, + { + "x": "2", + "y": "2", + "blur": "0", + "spread": 0, + "color": "#FFFFFF", + "alpha": "1", + "inset": true + }, + { + "x": "0", + "y": "0", + "blur": "0", + "spread": "3", + "color": "--bg", + "alpha": "1", + "inset": true + } + ], + "button": [ + { + "x": "-1", + "y": "-1", + "blur": "0", + "spread": 0, + "color": "#000000", + "alpha": "1", + "inset": true + }, + { + "x": "1", + "y": "1", + "blur": "0", + "spread": 0, + "color": "#FFFFFF", + "alpha": "1", + "inset": true + }, + { + "x": "-2", + "y": "-2", + "blur": "0", + "spread": 0, + "color": "#848484", + "alpha": "1", + "inset": true + }, + { + "x": "2", + "y": "2", + "blur": "0", + "spread": 0, + "color": "#dfdfdf", + "alpha": "1", + "inset": true + }, + { + "x": "0", + "y": "0", + "blur": "0", + "spread": "3", + "color": "--bg", + "alpha": "1", + "inset": true + } + ], + "buttonHover": [ + { + "x": "-1", + "y": "-1", + "blur": "0", + "spread": 0, + "color": "#000000", + "alpha": "1", + "inset": true + }, + { + "x": "1", + "y": "1", + "blur": "0", + "spread": 0, + "color": "#FFFFFF", + "alpha": "1", + "inset": true + }, + { + "x": "-2", + "y": "-2", + "blur": "0", + "spread": 0, + "color": "#848484", + "alpha": "1", + "inset": true + }, + { + "x": "2", + "y": "2", + "blur": "0", + "spread": 0, + "color": "#dfdfdf", + "alpha": "1", + "inset": true + }, + { + "x": "0", + "y": "0", + "blur": "0", + "spread": "3", + "color": "--bg", + "alpha": "1", + "inset": true + } + ], + "buttonPressed": [ + { + "x": "1", + "y": "1", + "blur": "0", + "spread": 0, + "color": "#000000", + "alpha": "1", + "inset": true + }, + { + "x": "-1", + "y": "-1", + "blur": "0", + "spread": 0, + "color": "#FFFFFF", + "alpha": "1", + "inset": true + }, + { + "x": "2", + "y": "2", + "blur": "0", + "spread": 0, + "color": "#848484", + "alpha": "1", + "inset": true + }, + { + "x": "-2", + "y": "-2", + "blur": "0", + "spread": 0, + "color": "#dfdfdf", + "alpha": "1", + "inset": true + }, + { + "x": "0", + "y": "0", + "blur": "0", + "spread": "3", + "color": "--bg", + "alpha": "1", + "inset": true + } + ], + "input": [ + { + "x": "-1", + "y": "-1", + "blur": "0", + "spread": 0, + "color": "#FFFFFF", + "alpha": "1", + "inset": true + }, + { + "x": "1", + "y": "1", + "blur": "0", + "spread": 0, + "color": "#848484", + "alpha": "1", + "inset": true + }, + { + "x": "-2", + "y": "-2", + "blur": "0", + "spread": 0, + "color": "#dfdfdf", + "alpha": "1", + "inset": true + }, + { + "x": "2", + "y": "2", + "blur": "0", + "spread": 0, + "color": "#000000", + "alpha": "1", + "inset": true + }, + { + "x": "0", + "y": "0", + "blur": "0", + "spread": "3", + "color": "--input", + "alpha": "1", + "inset": true + } + ], + "panelHeader": [ + { + "x": "-2200", + "y": 0, + "blur": "200", + "spread": "-2000", + "inset": true, + "color": "#a5cef7", + "alpha": 1 + } + ] + }, + "opacity": { + "input": "1" + }, + "colors": { + "bg": "#d6d6ce", + "text": "#000000", + "link": "#0000ff", + "fg": "#d6d6ce", + "panel": "#042967", + "input": "#ffffff", + "topBar": "#042967", + "topBarLink": "#ffffff", + "btn": "#d6d6ce", + "faint": "#3f3f3f", + "faintLink": "#404080", + "border": "#808080", + "cRed": "#FF0000", + "cBlue": "#008080", + "cGreen": "#00FF00", + "cOrange": "#808000" + }, + "radii": { + "btn": "0", + "input": "0", + "checkbox": "0", + "panel": "0", + "avatar": "0", + "avatarAlt": "0", + "tooltip": "0", + "attachment": "0" + } + } +} -- cgit v1.2.3-70-g09d2 From 08838774e41b9beba8f884da15ab1314eddf28f8 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 26 Nov 2018 03:51:12 +0300 Subject: redmond update --- static/themes/redmond-xx-se.json | 38 +++++++++++------- static/themes/redmond-xx.json | 18 ++++++++- static/themes/redmond-xxi.json | 83 ++++++++++++++++------------------------ 3 files changed, 75 insertions(+), 64 deletions(-) (limited to 'static/themes') diff --git a/static/themes/redmond-xx-se.json b/static/themes/redmond-xx-se.json index e4cdbdee..70ee89d1 100644 --- a/static/themes/redmond-xx-se.json +++ b/static/themes/redmond-xx-se.json @@ -50,6 +50,26 @@ "inset": true } ], + "panelHeader": [ + { + "x": 0, + "y": 0, + "blur": 0, + "spread": "3", + "inset": true, + "color": "#c0c0c0", + "alpha": 1 + }, + { + "x": "-2200", + "y": 0, + "blur": "200", + "spread": "-2000", + "inset": true, + "color": "#1084d0", + "alpha": 1 + } + ], "button": [ { "x": "-1", @@ -237,21 +257,12 @@ "alpha": "1", "inset": true } - ], - "panelHeader": [ - { - "x": "-2200", - "y": 0, - "blur": "200", - "spread": "-2000", - "inset": true, - "color": "#1084d0", - "alpha": 1 - } ] }, + "fonts": {}, "opacity": { - "input": "1" + "input": "1", + "faint": "1" }, "colors": { "bg": "#c0c0c0", @@ -259,6 +270,7 @@ "link": "#0000ff", "fg": "#c0c0c0", "panel": "#000080", + "panelFaint": "#c0c0c0", "input": "#ffffff", "topBar": "#000080", "topBarLink": "#ffffff", @@ -268,7 +280,7 @@ "border": "#808080", "cRed": "#FF0000", "cBlue": "#008080", - "cGreen": "#00FF00", + "cGreen": "#008000", "cOrange": "#808000" }, "radii": { diff --git a/static/themes/redmond-xx.json b/static/themes/redmond-xx.json index 96dff499..4fd6a369 100644 --- a/static/themes/redmond-xx.json +++ b/static/themes/redmond-xx.json @@ -50,6 +50,17 @@ "inset": true } ], + "panelHeader": [ + { + "x": 0, + "y": 0, + "blur": 0, + "spread": "3", + "inset": true, + "color": "#c0c0c0", + "alpha": 1 + } + ], "button": [ { "x": "-1", @@ -239,8 +250,10 @@ } ] }, + "fonts": {}, "opacity": { - "input": "1" + "input": "1", + "faint": "1" }, "colors": { "bg": "#c0c0c0", @@ -248,6 +261,7 @@ "link": "#0000ff", "fg": "#c0c0c0", "panel": "#000080", + "panelFaint": "#c0c0c0", "input": "#ffffff", "topBar": "#000080", "topBarLink": "#ffffff", @@ -257,7 +271,7 @@ "border": "#808080", "cRed": "#FF0000", "cBlue": "#008080", - "cGreen": "#00FF00", + "cGreen": "#008000", "cOrange": "#808000" }, "radii": { diff --git a/static/themes/redmond-xxi.json b/static/themes/redmond-xxi.json index 1469cc6b..d10bf138 100644 --- a/static/themes/redmond-xxi.json +++ b/static/themes/redmond-xxi.json @@ -9,7 +9,7 @@ "y": "-1", "blur": "0", "spread": 0, - "color": "#000000", + "color": "#404040", "alpha": "1", "inset": true }, @@ -50,13 +50,33 @@ "inset": true } ], + "panelHeader": [ + { + "x": 0, + "y": 0, + "blur": 0, + "spread": "3", + "inset": true, + "color": "#d6d6ce", + "alpha": 1 + }, + { + "x": "-2200", + "y": 0, + "blur": "200", + "spread": "-2000", + "inset": true, + "color": "#a5cef7", + "alpha": 1 + } + ], "button": [ { "x": "-1", "y": "-1", "blur": "0", "spread": 0, - "color": "#000000", + "color": "#404040", "alpha": "1", "inset": true }, @@ -78,15 +98,6 @@ "alpha": "1", "inset": true }, - { - "x": "2", - "y": "2", - "blur": "0", - "spread": 0, - "color": "#dfdfdf", - "alpha": "1", - "inset": true - }, { "x": "0", "y": "0", @@ -103,7 +114,7 @@ "y": "-1", "blur": "0", "spread": 0, - "color": "#000000", + "color": "#404040", "alpha": "1", "inset": true }, @@ -125,15 +136,6 @@ "alpha": "1", "inset": true }, - { - "x": "2", - "y": "2", - "blur": "0", - "spread": 0, - "color": "#dfdfdf", - "alpha": "1", - "inset": true - }, { "x": "0", "y": "0", @@ -150,7 +152,7 @@ "y": "1", "blur": "0", "spread": 0, - "color": "#000000", + "color": "#404040", "alpha": "1", "inset": true }, @@ -172,15 +174,6 @@ "alpha": "1", "inset": true }, - { - "x": "-2", - "y": "-2", - "blur": "0", - "spread": 0, - "color": "#dfdfdf", - "alpha": "1", - "inset": true - }, { "x": "0", "y": "0", @@ -215,7 +208,7 @@ "y": "-2", "blur": "0", "spread": 0, - "color": "#dfdfdf", + "color": "#d4d0c8", "alpha": "1", "inset": true }, @@ -224,7 +217,7 @@ "y": "2", "blur": "0", "spread": 0, - "color": "#000000", + "color": "#404040", "alpha": "1", "inset": true }, @@ -237,21 +230,12 @@ "alpha": "1", "inset": true } - ], - "panelHeader": [ - { - "x": "-2200", - "y": 0, - "blur": "200", - "spread": "-2000", - "inset": true, - "color": "#a5cef7", - "alpha": 1 - } ] }, + "fonts": {}, "opacity": { - "input": "1" + "input": "1", + "faint": "1" }, "colors": { "bg": "#d6d6ce", @@ -259,6 +243,7 @@ "link": "#0000ff", "fg": "#d6d6ce", "panel": "#042967", + "panelFaint": "#FFFFFF", "input": "#ffffff", "topBar": "#042967", "topBarLink": "#ffffff", @@ -266,10 +251,10 @@ "faint": "#3f3f3f", "faintLink": "#404080", "border": "#808080", - "cRed": "#FF0000", - "cBlue": "#008080", - "cGreen": "#00FF00", - "cOrange": "#808000" + "cRed": "#c42726", + "cBlue": "#6699cc", + "cGreen": "#669966", + "cOrange": "#cc6633" }, "radii": { "btn": "0", -- cgit v1.2.3-70-g09d2 From 80c0745558cd5dc69364bc19ee5dc1b8b3ddc3e2 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 2 Dec 2018 10:22:25 +0300 Subject: some more themes, fixes --- src/components/style_switcher/style_switcher.js | 3 +- src/components/style_switcher/style_switcher.scss | 6 + src/components/style_switcher/style_switcher.vue | 2 +- static/styles.json | 4 +- static/themes/breezy-dark.json | 139 ++++++++++++++++++++++ static/themes/breezy-light.json | 139 ++++++++++++++++++++++ 6 files changed, 289 insertions(+), 4 deletions(-) create mode 100644 static/themes/breezy-dark.json create mode 100644 static/themes/breezy-light.json (limited to 'static/themes') diff --git a/src/components/style_switcher/style_switcher.js b/src/components/style_switcher/style_switcher.js index ccdb4c4f..d09185fa 100644 --- a/src/components/style_switcher/style_switcher.js +++ b/src/components/style_switcher/style_switcher.js @@ -497,10 +497,9 @@ export default { this.textColorLocal = rgb2hex(colors.fg) } + this.clearV1() const keys = new Set(version !== 1 ? Object.keys(colors) : []) if (version === 1 || version === 'l1') { - // V1 ignores the rest - this.clearV1() keys .add('bg') .add('link') diff --git a/src/components/style_switcher/style_switcher.scss b/src/components/style_switcher/style_switcher.scss index 4db1a295..c8c5d9dd 100644 --- a/src/components/style_switcher/style_switcher.scss +++ b/src/components/style_switcher/style_switcher.scss @@ -135,6 +135,12 @@ display: flex; justify-content: center; align-items: baseline; + flex-wrap: wrap; + + .presets, + .import-export { + margin-bottom: .5em; + } .import-export { display: flex; diff --git a/src/components/style_switcher/style_switcher.vue b/src/components/style_switcher/style_switcher.vue index 814a6f17..9de60f7b 100644 --- a/src/components/style_switcher/style_switcher.vue +++ b/src/components/style_switcher/style_switcher.vue @@ -2,7 +2,7 @@
-
+
{{$t('settings.presets')}}