From e5a34870f0f7154712783fb6d9c20edf4c06ad35 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sat, 28 Dec 2019 15:55:42 +0200 Subject: Accent works --- static/themes/breezy-dark.json | 2 +- static/themes/breezy-light.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'static') diff --git a/static/themes/breezy-dark.json b/static/themes/breezy-dark.json index 6119bf88..7ce41384 100644 --- a/static/themes/breezy-dark.json +++ b/static/themes/breezy-dark.json @@ -50,7 +50,7 @@ "y": "0", "blur": 0, "spread": "1", - "color": "--link", + "color": "--accent", "alpha": "0.3", "inset": true }, diff --git a/static/themes/breezy-light.json b/static/themes/breezy-light.json index becf704f..dc43f90e 100644 --- a/static/themes/breezy-light.json +++ b/static/themes/breezy-light.json @@ -50,7 +50,7 @@ "y": "0", "blur": 0, "spread": "1", - "color": "--link", + "color": "--accent", "alpha": "0.3", "inset": true }, -- cgit v1.2.3-70-g09d2 From 332d31dc02b83d6ca06837fdfb4f663050d9effd Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 30 Dec 2019 00:45:48 +0200 Subject: support for "transparent" color keyword --- src/components/style_switcher/style_switcher.js | 60 ++++++++++++++----------- src/services/color_convert/color_convert.js | 3 +- src/services/style_setter/style_setter.js | 50 ++++++++++++++------- static/themes/breezy-dark.json | 8 +++- static/themes/breezy-light.json | 5 +++ 5 files changed, 80 insertions(+), 46 deletions(-) (limited to 'static') diff --git a/src/components/style_switcher/style_switcher.js b/src/components/style_switcher/style_switcher.js index 602a635e..9fe1bf59 100644 --- a/src/components/style_switcher/style_switcher.js +++ b/src/components/style_switcher/style_switcher.js @@ -25,6 +25,14 @@ const v1OnlyNames = [ 'cOrange' ].map(_ => _ + 'ColorLocal') +const colorConvert = (color) => { + if (color === 'transparent') { + return color + } else { + return hex2rgb(color) + } +} + export default { data () { return { @@ -228,36 +236,36 @@ export default { // fgsfds :DDDD const fgs = { - text: hex2rgb(colors.text), - panelText: hex2rgb(colors.panelText), - panelLink: hex2rgb(colors.panelLink), - btnText: hex2rgb(colors.btnText), - topBarText: hex2rgb(colors.topBarText), - inputText: hex2rgb(colors.inputText), - - link: hex2rgb(colors.link), - topBarLink: hex2rgb(colors.topBarLink), - - red: hex2rgb(colors.cRed), - green: hex2rgb(colors.cGreen), - blue: hex2rgb(colors.cBlue), - orange: hex2rgb(colors.cOrange) + text: colorConvert(colors.text), + panelText: colorConvert(colors.panelText), + panelLink: colorConvert(colors.panelLink), + btnText: colorConvert(colors.btnText), + topBarText: colorConvert(colors.topBarText), + inputText: colorConvert(colors.inputText), + + link: colorConvert(colors.link), + topBarLink: colorConvert(colors.topBarLink), + + red: colorConvert(colors.cRed), + green: colorConvert(colors.cGreen), + blue: colorConvert(colors.cBlue), + orange: colorConvert(colors.cOrange) } const bgs = { - bg: hex2rgb(colors.bg), - underlay: hex2rgb(colors.underlay), - btn: hex2rgb(colors.btn), - panel: hex2rgb(colors.panel), - topBar: hex2rgb(colors.topBar), - input: hex2rgb(colors.input), - alertError: hex2rgb(colors.alertError), - alertWarning: hex2rgb(colors.alertWarning), - badgeNotification: hex2rgb(colors.badgeNotification) + bg: colorConvert(colors.bg), + underlay: colorConvert(colors.underlay), + btn: colorConvert(colors.btn), + panel: colorConvert(colors.panel), + topBar: colorConvert(colors.topBar), + input: colorConvert(colors.input), + alertError: colorConvert(colors.alertError), + alertWarning: colorConvert(colors.alertWarning), + badgeNotification: colorConvert(colors.badgeNotification) } const bg = [bgs.bg, opacity.bg] - const underlay = [bgs.underlay, opacity.underlay] + const underlay = [bgs.underlay || colorConvert('#000000'), opacity.underlay] const panel = [underlay, bg] @@ -443,7 +451,7 @@ export default { */ normalizeLocalState (originalInput, version = 0) { let input - if (typeof originalInput.v3compat !== undefined) { + if (typeof originalInput.v3compat !== 'undefined') { version = 3 input = merge(originalInput, originalInput.v3compat) } else { @@ -574,7 +582,7 @@ export default { this.previewColors = generateColors({ v3compat: this.currentCompat, opacity: this.currentOpacity, - colors: this.currentColors, + colors: this.currentColors }) } catch (e) { console.warn(e) diff --git a/src/services/color_convert/color_convert.js b/src/services/color_convert/color_convert.js index 757a36bd..32b4d50e 100644 --- a/src/services/color_convert/color_convert.js +++ b/src/services/color_convert/color_convert.js @@ -7,7 +7,8 @@ const rgb2hex = (r, g, b) => { if (r === null || typeof r === 'undefined') { return undefined } - if (r[0] === '#') { + // TODO: clean up this mess + if (r[0] === '#' || r === 'transparent') { return r } if (typeof r === 'object') { diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js index 8740fc55..df22f94f 100644 --- a/src/services/style_setter/style_setter.js +++ b/src/services/style_setter/style_setter.js @@ -170,23 +170,32 @@ export const generateCompat = (input) => { } } -const generateColors = (input) => { +const generateColors = (themeData) => { const colors = {} - const opacity = Object.assign({ + const rawOpacity = Object.assign({ alert: 0.5, input: 0.5, faint: 0.5, underlay: 0.15 - }, Object.entries(input.opacity || {}).reduce((acc, [k, v]) => { + }, Object.entries(themeData.opacity || {}).reduce((acc, [k, v]) => { if (typeof v !== 'undefined') { acc[k] = v } return acc }, {})) - const inputColors = input.colors || input + const inputColors = themeData.colors || themeData - const compat = input.v3compat || {} + const transparentsOpacity = Object.entries(inputColors).reduce((acc, [k, v]) => { + if (v === 'transparent') { + acc[k] = 0 + } + return acc + }, {}) + + const opacity = { ...rawOpacity, ...transparentsOpacity } + + const compat = themeData.v3compat || {} const compatColors = Object.entries(compat.colors || {}).reduce((acc, [key, value]) => { const newVal = value === null ? undefined : value return { ...acc, [key]: newVal } @@ -196,15 +205,22 @@ const generateColors = (input) => { if (typeof v === 'object') { acc[k] = v } else { - acc[k] = hex2rgb(v) + let value = v + if (v === 'transparent') { + value = '#FF00FF' + } + acc[k] = hex2rgb(value) } return acc }, {}) - const isLightOnDark = convert(col.bg).hsl.l < convert(col.text).hsl.l + colors.bg = col.bg + colors.underlay = col.underlay || hex2rgb('#000000') + colors.text = col.text + + const isLightOnDark = convert(colors.bg).hsl.l < convert(colors.text).hsl.l const mod = isLightOnDark ? 1 : -1 - colors.text = col.text colors.lightText = brightness(20 * mod, colors.text).rgb colors.accent = col.accent || col.link @@ -212,17 +228,15 @@ const generateColors = (input) => { colors.faint = col.faint || Object.assign({}, col.text) - colors.bg = col.bg colors.lightBg = col.lightBg || brightness(5 * mod, colors.bg).rgb - const underlay = [col.underlay, opacity.underlay] + const underlay = [colors.underlay, opacity.underlay] const fg = [col.fg, opacity.fg] const bg = [col.bg, opacity.bg] colors.fg = col.fg colors.fgText = col.fgText || getTextColor(alphaBlendLayers(colors.text, [underlay, bg, fg]), colors.text) colors.fgLink = col.fgLink || getTextColor(alphaBlendLayers(colors.link, [underlay, bg, fg]), colors.link, true) - colors.underlay = col.underlay || hex2rgb('#000000') colors.border = col.border || brightness(2 * mod, colors.fg).rgb @@ -231,8 +245,8 @@ const generateColors = (input) => { colors.btnText = col.btnText || getTextColor(alphaBlendLayers(colors.fgText, [underlay, bg, fg, btn]), colors.fgText) colors.input = col.input || Object.assign({}, col.fg) - const inputCol = [colors.input, opacity.input] - colors.inputText = col.inputText || getTextColor(alphaBlendLayers(colors.lightText, [underlay, bg, fg, inputCol]), colors.lightText) + const input = [colors.input, opacity.input] + colors.inputText = col.inputText || getTextColor(alphaBlendLayers(colors.lightText, [underlay, bg, fg, input]), colors.lightText) colors.panel = col.panel || Object.assign({}, col.fg) const panel = [colors.panel, opacity.panel] @@ -256,12 +270,14 @@ const generateColors = (input) => { colors.cOrange = col.cOrange || hex2rgb('#E3FF00') colors.alertError = col.alertError || Object.assign({}, colors.cRed) - colors.alertErrorText = getTextColor(alphaBlend(colors.alertError, opacity.alert, colors.bg), colors.text) - colors.alertErrorPanelText = getTextColor(alphaBlend(colors.alertError, opacity.alert, colors.panel), colors.panelText) + const alertError = [colors.alertError, opacity.alert] + colors.alertErrorText = getTextColor(alphaBlendLayers(colors.text, [underlay, bg, alertError]), colors.text) + colors.alertErrorPanelText = getTextColor(alphaBlendLayers(colors.panelText, [underlay, bg, panel, panel, alertError]), colors.panelText) colors.alertWarning = col.alertWarning || Object.assign({}, colors.cOrange) - colors.alertWarningText = getTextColor(alphaBlend(colors.alertWarning, opacity.alert, colors.bg), colors.text) - colors.alertWarningPanelText = getTextColor(alphaBlend(colors.alertWarning, opacity.alert, colors.panel), colors.panelText) + const alertWarning = [colors.alertWarning, opacity.alert] + colors.alertWarningText = getTextColor(alphaBlendLayers(colors.text, [underlay, bg, alertWarning]), colors.text) + colors.alertWarningPanelText = getTextColor(alphaBlendLayers(colors.panelText, [underlay, bg, panel, panel, alertWarning]), colors.panelText) colors.badgeNotification = col.badgeNotification || Object.assign({}, colors.cRed) colors.badgeNotificationText = contrastRatio(colors.badgeNotification).rgb diff --git a/static/themes/breezy-dark.json b/static/themes/breezy-dark.json index 7ce41384..0ed55184 100644 --- a/static/themes/breezy-dark.json +++ b/static/themes/breezy-dark.json @@ -107,8 +107,12 @@ }, "fonts": {}, "opacity": { - "input": "1", - "panel": "0" + "input": "1" + }, + "v3compat": { + "colors": { + "panel": "transparent" + } }, "colors": { "bg": "#31363b", diff --git a/static/themes/breezy-light.json b/static/themes/breezy-light.json index dc43f90e..5db185dd 100644 --- a/static/themes/breezy-light.json +++ b/static/themes/breezy-light.json @@ -109,6 +109,11 @@ "opacity": { "input": "1" }, + "v3compat": { + "colors": { + "panel": "transparent" + } + }, "colors": { "bg": "#eff0f1", "text": "#232627", -- cgit v1.2.3-70-g09d2 From 4bb1c98e0f28bcf1d0dff2d90d01013cd5487522 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 2 Jan 2020 20:36:10 +0200 Subject: Replaced `v3compat` with `source` to reduce code complexity. Made more slots customizable. `theme` now contains a snapshot of theme generated for better compatiblity and future-proofing --- src/components/style_switcher/style_switcher.js | 68 ++++--- src/components/style_switcher/style_switcher.vue | 14 +- src/services/style_setter/style_setter.js | 42 ++--- static/themes/breezy-dark.json | 224 ++++++++++++++++++++++- static/themes/breezy-light.json | 220 +++++++++++++++++++++- 5 files changed, 488 insertions(+), 80 deletions(-) (limited to 'static') diff --git a/src/components/style_switcher/style_switcher.js b/src/components/style_switcher/style_switcher.js index 9fe1bf59..f751260a 100644 --- a/src/components/style_switcher/style_switcher.js +++ b/src/components/style_switcher/style_switcher.js @@ -1,7 +1,15 @@ import { rgb2hex, hex2rgb, getContrastRatio, getContrastRatioLayers, alphaBlend } from '../../services/color_convert/color_convert.js' import { set, delete as del } from 'vue' import { merge } from 'lodash' -import { generateCompat, generateColors, generateShadows, generateRadii, generateFonts, composePreset, getThemes } from '../../services/style_setter/style_setter.js' +import { + generateColors, + generateShadows, + generateRadii, + generateFonts, + composePreset, + getThemes, + CURRENT_VERSION +} from '../../services/style_setter/style_setter.js' import ColorInput from '../color_input/color_input.vue' import RangeInput from '../range_input/range_input.vue' import OpacityInput from '../opacity_input/opacity_input.vue' @@ -135,15 +143,6 @@ export default { selectedVersion () { return Array.isArray(this.selected) ? 1 : 2 }, - currentCompat () { - return generateCompat({ - shadows: this.shadowsLocal, - fonts: this.fontsLocal, - opacity: this.currentOpacity, - colors: this.currentColors, - radii: this.currentRadii - }) - }, currentColors () { return { bg: this.bgColorLocal, @@ -339,27 +338,32 @@ export default { !this.keepColor ) - const theme = {} + const source = { + themeEngineVersion: CURRENT_VERSION + } if (this.keepFonts || saveEverything) { - theme.fonts = this.fontsLocal + source.fonts = this.fontsLocal } if (this.keepShadows || saveEverything) { - theme.shadows = this.shadowsLocal + source.shadows = this.shadowsLocal } if (this.keepOpacity || saveEverything) { - theme.opacity = this.currentOpacity + source.opacity = this.currentOpacity } if (this.keepColor || saveEverything) { - theme.colors = this.currentColors + source.colors = this.currentColors } if (this.keepRoundness || saveEverything) { - theme.radii = this.currentRadii + source.radii = this.currentRadii } + const theme = this.previewTheme + + console.log(source) return { - // To separate from other random JSON files and possible future theme formats - _pleroma_theme_version: 2, theme: merge(theme, this.currentCompat) + // To separate from other random JSON files and possible future source formats + _pleroma_theme_version: 2, theme, source } } }, @@ -392,7 +396,7 @@ export default { if (parsed._pleroma_theme_version === 1) { this.normalizeLocalState(parsed, 1) } else if (parsed._pleroma_theme_version >= 2) { - this.normalizeLocalState(parsed.theme, 2) + this.normalizeLocalState(parsed.theme, 2, parsed.source) } }, importValidator (parsed) { @@ -402,7 +406,7 @@ export default { clearAll () { const state = this.$store.getters.mergedConfig.customTheme const version = state.colors ? 2 : 'l1' - this.normalizeLocalState(this.$store.getters.mergedConfig.customTheme, version) + this.normalizeLocalState(this.$store.getters.mergedConfig.customTheme, version, this.$store.getters.mergedConfig.customThemeSource) }, // Clears all the extra stuff when loading V1 theme @@ -441,24 +445,30 @@ export default { /** * This applies stored theme data onto form. Supports three versions of data: - * v3 (version = 3) - same as 2 but with some incompatible changes + * v3 (version >= 3) - newest version of themes which supports snapshots for better compatiblity * v2 (version = 2) - newer version of themes. * v1 (version = 1) - older version of themes (import from file) * v1l (version = l1) - older version of theme (load from local storage) * v1 and v1l differ because of way themes were stored/exported. - * @param {Object} input - input data + * @param {Object} theme - theme data (snapshot) * @param {Number} version - version of data. 0 means try to guess based on data. "l1" means v1, locastorage type + * @param {Object} source - theme source - this will be used if compatible + * @param {Boolean} source - by default source won't be used if version doesn't match since it might render differently + * this allows importing source anyway */ - normalizeLocalState (originalInput, version = 0) { + normalizeLocalState (theme, version = 0, source, forceSource = false) { let input - if (typeof originalInput.v3compat !== 'undefined') { - version = 3 - input = merge(originalInput, originalInput.v3compat) + if (typeof source !== 'undefined') { + if (forceSource || source.themeEngineVersion === CURRENT_VERSION) { + input = source + version = source.themeEngineVersion + } else { + input = theme + } } else { - input = originalInput + input = theme } - const compat = input.v3compat const radii = input.radii || input const opacity = input.opacity const shadows = input.shadows || {} @@ -615,7 +625,7 @@ export default { this.cOrangeColorLocal = this.selected[8] } } else if (this.selectedVersion >= 2) { - this.normalizeLocalState(this.selected.theme, 2) + this.normalizeLocalState(this.selected.theme, 2, this.selected.source) } } } diff --git a/src/components/style_switcher/style_switcher.vue b/src/components/style_switcher/style_switcher.vue index 38ca2017..2eadbe25 100644 --- a/src/components/style_switcher/style_switcher.vue +++ b/src/components/style_switcher/style_switcher.vue @@ -106,7 +106,7 @@
@@ -363,7 +363,7 @@
@@ -377,7 +377,7 @@
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js index df22f94f..e8a64517 100644 --- a/src/services/style_setter/style_setter.js +++ b/src/services/style_setter/style_setter.js @@ -2,6 +2,8 @@ import { times } from 'lodash' import { brightness, invertLightness, convert, contrastRatio } from 'chromatism' import { rgb2hex, hex2rgb, mixrgb, getContrastRatio, alphaBlend, alphaBlendLayers } from '../color_convert/color_convert.js' +export const CURRENT_VERSION = 3 + // While this is not used anymore right now, I left it in if we want to do custom // styles that aren't just colors, so user can pick from a few different distinct // styles as well as set their own colors in the future. @@ -150,29 +152,13 @@ const getCssColor = (input, a) => { return rgb2rgba({ ...rgb, a }) } -// Generates a "patch" for theme to make it compatible with v2 -export const generateCompat = (input) => { - const { colors } = input - const v3compat = { - colors: {} - } - const v2colorsPatch = {} - - // # Link became optional in v3 - if (typeof colors.link === 'undefined') { - v2colorsPatch.link = colors.accent - v3compat.colors.link = null - } - - return { - v3compat, - colors: v2colorsPatch - } -} - const generateColors = (themeData) => { const colors = {} const rawOpacity = Object.assign({ + panel: 1, + btn: 1, + border: 1, + bg: 1, alert: 0.5, input: 0.5, faint: 0.5, @@ -207,6 +193,7 @@ const generateColors = (themeData) => { } else { let value = v if (v === 'transparent') { + // TODO: hack to keep rest of the code from complaining value = '#FF00FF' } acc[k] = hex2rgb(value) @@ -221,7 +208,7 @@ const generateColors = (themeData) => { const isLightOnDark = convert(colors.bg).hsl.l < convert(colors.text).hsl.l const mod = isLightOnDark ? 1 : -1 - colors.lightText = brightness(20 * mod, colors.text).rgb + colors.lightText = col.lightText || brightness(20 * mod, colors.text).rgb colors.accent = col.accent || col.link colors.link = col.link || col.accent @@ -231,7 +218,8 @@ const generateColors = (themeData) => { colors.lightBg = col.lightBg || brightness(5 * mod, colors.bg).rgb const underlay = [colors.underlay, opacity.underlay] - const fg = [col.fg, opacity.fg] + // Technically, foreground can't be transparent (descendants can) but let's keep it just in case + const fg = [col.fg, opacity.fg || 1] const bg = [col.bg, opacity.bg] colors.fg = col.fg @@ -271,16 +259,16 @@ const generateColors = (themeData) => { colors.alertError = col.alertError || Object.assign({}, colors.cRed) const alertError = [colors.alertError, opacity.alert] - colors.alertErrorText = getTextColor(alphaBlendLayers(colors.text, [underlay, bg, alertError]), colors.text) - colors.alertErrorPanelText = getTextColor(alphaBlendLayers(colors.panelText, [underlay, bg, panel, panel, alertError]), colors.panelText) + colors.alertErrorText = col.alertErrorText || getTextColor(alphaBlendLayers(colors.text, [underlay, bg, alertError]), colors.text) + colors.alertErrorPanelText = col.alertErrorPanelText || getTextColor(alphaBlendLayers(colors.panelText, [underlay, bg, panel, panel, alertError]), colors.panelText) colors.alertWarning = col.alertWarning || Object.assign({}, colors.cOrange) const alertWarning = [colors.alertWarning, opacity.alert] - colors.alertWarningText = getTextColor(alphaBlendLayers(colors.text, [underlay, bg, alertWarning]), colors.text) - colors.alertWarningPanelText = getTextColor(alphaBlendLayers(colors.panelText, [underlay, bg, panel, panel, alertWarning]), colors.panelText) + colors.alertWarningText = col.alertWarningText || getTextColor(alphaBlendLayers(colors.text, [underlay, bg, alertWarning]), colors.text) + colors.alertWarningPanelText = col.alertWarningPanelText || getTextColor(alphaBlendLayers(colors.panelText, [underlay, bg, panel, panel, alertWarning]), colors.panelText) colors.badgeNotification = col.badgeNotification || Object.assign({}, colors.cRed) - colors.badgeNotificationText = contrastRatio(colors.badgeNotification).rgb + colors.badgeNotificationText = colors.badgeNotificationText || contrastRatio(colors.badgeNotification).rgb Object.entries(opacity).forEach(([ k, v ]) => { console.log(k) diff --git a/static/themes/breezy-dark.json b/static/themes/breezy-dark.json index 0ed55184..d447005f 100644 --- a/static/themes/breezy-dark.json +++ b/static/themes/breezy-dark.json @@ -2,6 +2,218 @@ "_pleroma_theme_version": 2, "name": "Breezy Dark (beta)", "theme": { + "shadows": { + "panel": [ + { + "x": "1", + "y": "2", + "blur": "6", + "spread": 0, + "color": "#000000", + "alpha": 0.6 + } + ], + "topBar": [ + { + "x": 0, + "y": 0, + "blur": 4, + "spread": 0, + "color": "#000000", + "alpha": 0.6 + } + ], + "popup": [ + { + "x": 2, + "y": 2, + "blur": 3, + "spread": 0, + "color": "#000000", + "alpha": 0.5 + } + ], + "avatar": [ + { + "x": 0, + "y": 1, + "blur": 8, + "spread": 0, + "color": "#000000", + "alpha": 0.7 + } + ], + "avatarStatus": [], + "panelHeader": [ + { + "x": 0, + "y": "40", + "blur": "40", + "spread": "-40", + "inset": true, + "color": "#ffffff", + "alpha": "0.1" + } + ], + "button": [ + { + "x": 0, + "y": "0", + "blur": "0", + "spread": "1", + "color": "#ffffff", + "alpha": "0.15", + "inset": true + }, + { + "x": "1", + "y": "1", + "blur": "1", + "spread": 0, + "color": "#000000", + "alpha": "0.3", + "inset": false + } + ], + "buttonHover": [ + { + "x": 0, + "y": "0", + "blur": 0, + "spread": "1", + "color": "--accent", + "alpha": "0.3", + "inset": true + }, + { + "x": "1", + "y": "1", + "blur": "1", + "spread": 0, + "color": "#000000", + "alpha": "0.3", + "inset": false + } + ], + "buttonPressed": [ + { + "x": 0, + "y": 0, + "blur": "0", + "spread": "50", + "color": "--faint", + "alpha": 1, + "inset": true + }, + { + "x": 0, + "y": "0", + "blur": 0, + "spread": "1", + "color": "#ffffff", + "alpha": 0.2, + "inset": true + }, + { + "x": "1", + "y": "1", + "blur": 0, + "spread": 0, + "color": "#000000", + "alpha": "0.3", + "inset": false + } + ], + "input": [ + { + "x": 0, + "y": "0", + "blur": 0, + "spread": "1", + "color": "#FFFFFF", + "alpha": "0.2", + "inset": true + } + ] + }, + "colors": { + "bg": "#31363b", + "underlay": "#000000", + "text": "#eff0f1", + "lightText": "#ffffff", + "accent": "#3daee9", + "link": "#3daee9", + "faint": "#eff0f1", + "lightBg": "#3d4349", + "fg": "#31363b", + "fgText": "#eff0f1", + "fgLink": "#3daee9", + "border": "#4c545b", + "btn": "#31363b", + "btnText": "#eff0f1", + "input": "#232629", + "inputText": "#ffffff", + "panel": "#ff00ff", + "panelText": "#eff0f1", + "panelLink": "#3daee9", + "panelFaint": "#eff0f1", + "topBar": "#31363b", + "topBarText": "#eff0f1", + "topBarLink": "#eff0f1", + "faintLink": "#3daee9", + "linkBg": "#366681", + "icon": "#909396", + "cBlue": "#3daee9", + "cRed": "#da4453", + "cGreen": "#27ae60", + "cOrange": "#f67400", + "alertError": "#da4453", + "alertErrorText": "#eff0f1", + "alertErrorPanelText": "#eff0f1", + "alertWarning": "#f67400", + "alertWarningText": "#eff0f1", + "alertWarningPanelText": "#eff0f1", + "badgeNotification": "#da4453", + "badgeNotificationText": "#ffffff" + }, + "opacity": { + "panel": 0, + "btn": 1, + "border": 1, + "bg": 1, + "alert": 0.5, + "input": 0.5, + "faint": 0.5, + "underlay": 0.15 + }, + "radii": { + "btn": "2", + "input": "2", + "checkbox": "1", + "panel": "2", + "avatar": "2", + "avatarAlt": "2", + "tooltip": "2", + "attachment": "2" + }, + "fonts": { + "interface": { + "family": "sans-serif" + }, + "input": { + "family": "inherit" + }, + "post": { + "family": "inherit" + }, + "postCode": { + "family": "monospace" + } + } + }, + "source": { + "themeEngineVersion": 3, + "fonts": {}, "shadows": { "panel": [ { @@ -105,21 +317,13 @@ } ] }, - "fonts": {}, - "opacity": { - "input": "1" - }, - "v3compat": { - "colors": { - "panel": "transparent" - } - }, + "opacity": {}, "colors": { "bg": "#31363b", "text": "#eff0f1", "link": "#3daee9", "fg": "#31363b", - "panel": "#31363b", + "panel": "transparent", "input": "#232629", "topBarLink": "#eff0f1", "btn": "#31363b", diff --git a/static/themes/breezy-light.json b/static/themes/breezy-light.json index 5db185dd..243b8593 100644 --- a/static/themes/breezy-light.json +++ b/static/themes/breezy-light.json @@ -2,6 +2,218 @@ "_pleroma_theme_version": 2, "name": "Breezy Light (beta)", "theme": { + "shadows": { + "panel": [ + { + "x": "1", + "y": "2", + "blur": "6", + "spread": 0, + "color": "#000000", + "alpha": 0.6 + } + ], + "topBar": [ + { + "x": 0, + "y": 0, + "blur": 4, + "spread": 0, + "color": "#000000", + "alpha": 0.6 + } + ], + "popup": [ + { + "x": 2, + "y": 2, + "blur": 3, + "spread": 0, + "color": "#000000", + "alpha": 0.5 + } + ], + "avatar": [ + { + "x": 0, + "y": 1, + "blur": 8, + "spread": 0, + "color": "#000000", + "alpha": 0.7 + } + ], + "avatarStatus": [], + "panelHeader": [ + { + "x": 0, + "y": "40", + "blur": "40", + "spread": "-40", + "inset": true, + "color": "#ffffff", + "alpha": "0.1" + } + ], + "button": [ + { + "x": 0, + "y": "0", + "blur": "0", + "spread": "1", + "color": "#000000", + "alpha": "0.3", + "inset": true + }, + { + "x": "1", + "y": "1", + "blur": "1", + "spread": 0, + "color": "#000000", + "alpha": "0.3", + "inset": false + } + ], + "buttonHover": [ + { + "x": 0, + "y": "0", + "blur": 0, + "spread": "1", + "color": "--accent", + "alpha": "0.3", + "inset": true + }, + { + "x": "1", + "y": "1", + "blur": "1", + "spread": 0, + "color": "#000000", + "alpha": "0.3", + "inset": false + } + ], + "buttonPressed": [ + { + "x": 0, + "y": 0, + "blur": "0", + "spread": "50", + "color": "--faint", + "alpha": 1, + "inset": true + }, + { + "x": 0, + "y": "0", + "blur": 0, + "spread": "1", + "color": "#ffffff", + "alpha": 0.2, + "inset": true + }, + { + "x": "1", + "y": "1", + "blur": 0, + "spread": 0, + "color": "#000000", + "alpha": "0.3", + "inset": false + } + ], + "input": [ + { + "x": 0, + "y": "0", + "blur": 0, + "spread": "1", + "color": "#000000", + "alpha": "0.2", + "inset": true + } + ] + }, + "colors": { + "bg": "#eff0f1", + "underlay": "#000000", + "text": "#232627", + "lightText": "#000000", + "accent": "#2980b9", + "link": "#2980b9", + "faint": "#232627", + "lightBg": "#e2e4e6", + "fg": "#bcc2c7", + "fgText": "#232627", + "fgLink": "#2980b9", + "border": "#b7bdc3", + "btn": "#eff0f1", + "btnText": "#232627", + "input": "#fcfcfc", + "inputText": "#000000", + "panel": "#475057", + "panelText": "#fcfcfc", + "panelLink": "#ffffff", + "panelFaint": "#d8dbdc", + "topBar": "#475057", + "topBarText": "#d8dbdc", + "topBarLink": "#eff0f1", + "faintLink": "#2980b9", + "linkBg": "#a0c4db", + "icon": "#898b8c", + "cBlue": "#2980b9", + "cRed": "#da4453", + "cGreen": "#27ae60", + "cOrange": "#f67400", + "alertError": "#da4453", + "alertErrorText": "#232627", + "alertErrorPanelText": "#fcfcfc", + "alertWarning": "#f67400", + "alertWarningText": "#232627", + "alertWarningPanelText": "#fcfcfc", + "badgeNotification": "#da4453", + "badgeNotificationText": "#ffffff" + }, + "opacity": { + "panel": 1, + "btn": 1, + "border": 1, + "bg": 1, + "alert": 0.5, + "input": "1", + "faint": 0.5, + "underlay": 0.15 + }, + "radii": { + "btn": "2", + "input": "2", + "checkbox": "1", + "panel": "2", + "avatar": "2", + "avatarAlt": "2", + "tooltip": "2", + "attachment": "2" + }, + "fonts": { + "interface": { + "family": "sans-serif" + }, + "input": { + "family": "inherit" + }, + "post": { + "family": "inherit" + }, + "postCode": { + "family": "monospace" + } + } + }, + "source": { + "themeEngineVersion": 3, + "fonts": {}, "shadows": { "panel": [ { @@ -105,20 +317,14 @@ } ] }, - "fonts": {}, "opacity": { "input": "1" }, - "v3compat": { - "colors": { - "panel": "transparent" - } - }, "colors": { "bg": "#eff0f1", "text": "#232627", - "link": "#2980b9", "fg": "#bcc2c7", + "accent": "#2980b9", "panel": "#475057", "panelText": "#fcfcfc", "input": "#fcfcfc", -- cgit v1.2.3-70-g09d2 From f31ed7e5a8a9248886837311d7407b01164724c1 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 12 Jan 2020 03:53:08 +0200 Subject: remove snapshot data from breezy --- static/themes/breezy-dark.json | 210 ---------------------------------------- static/themes/breezy-light.json | 210 ---------------------------------------- 2 files changed, 420 deletions(-) (limited to 'static') diff --git a/static/themes/breezy-dark.json b/static/themes/breezy-dark.json index d447005f..580ce82c 100644 --- a/static/themes/breezy-dark.json +++ b/static/themes/breezy-dark.json @@ -1,216 +1,6 @@ { "_pleroma_theme_version": 2, "name": "Breezy Dark (beta)", - "theme": { - "shadows": { - "panel": [ - { - "x": "1", - "y": "2", - "blur": "6", - "spread": 0, - "color": "#000000", - "alpha": 0.6 - } - ], - "topBar": [ - { - "x": 0, - "y": 0, - "blur": 4, - "spread": 0, - "color": "#000000", - "alpha": 0.6 - } - ], - "popup": [ - { - "x": 2, - "y": 2, - "blur": 3, - "spread": 0, - "color": "#000000", - "alpha": 0.5 - } - ], - "avatar": [ - { - "x": 0, - "y": 1, - "blur": 8, - "spread": 0, - "color": "#000000", - "alpha": 0.7 - } - ], - "avatarStatus": [], - "panelHeader": [ - { - "x": 0, - "y": "40", - "blur": "40", - "spread": "-40", - "inset": true, - "color": "#ffffff", - "alpha": "0.1" - } - ], - "button": [ - { - "x": 0, - "y": "0", - "blur": "0", - "spread": "1", - "color": "#ffffff", - "alpha": "0.15", - "inset": true - }, - { - "x": "1", - "y": "1", - "blur": "1", - "spread": 0, - "color": "#000000", - "alpha": "0.3", - "inset": false - } - ], - "buttonHover": [ - { - "x": 0, - "y": "0", - "blur": 0, - "spread": "1", - "color": "--accent", - "alpha": "0.3", - "inset": true - }, - { - "x": "1", - "y": "1", - "blur": "1", - "spread": 0, - "color": "#000000", - "alpha": "0.3", - "inset": false - } - ], - "buttonPressed": [ - { - "x": 0, - "y": 0, - "blur": "0", - "spread": "50", - "color": "--faint", - "alpha": 1, - "inset": true - }, - { - "x": 0, - "y": "0", - "blur": 0, - "spread": "1", - "color": "#ffffff", - "alpha": 0.2, - "inset": true - }, - { - "x": "1", - "y": "1", - "blur": 0, - "spread": 0, - "color": "#000000", - "alpha": "0.3", - "inset": false - } - ], - "input": [ - { - "x": 0, - "y": "0", - "blur": 0, - "spread": "1", - "color": "#FFFFFF", - "alpha": "0.2", - "inset": true - } - ] - }, - "colors": { - "bg": "#31363b", - "underlay": "#000000", - "text": "#eff0f1", - "lightText": "#ffffff", - "accent": "#3daee9", - "link": "#3daee9", - "faint": "#eff0f1", - "lightBg": "#3d4349", - "fg": "#31363b", - "fgText": "#eff0f1", - "fgLink": "#3daee9", - "border": "#4c545b", - "btn": "#31363b", - "btnText": "#eff0f1", - "input": "#232629", - "inputText": "#ffffff", - "panel": "#ff00ff", - "panelText": "#eff0f1", - "panelLink": "#3daee9", - "panelFaint": "#eff0f1", - "topBar": "#31363b", - "topBarText": "#eff0f1", - "topBarLink": "#eff0f1", - "faintLink": "#3daee9", - "linkBg": "#366681", - "icon": "#909396", - "cBlue": "#3daee9", - "cRed": "#da4453", - "cGreen": "#27ae60", - "cOrange": "#f67400", - "alertError": "#da4453", - "alertErrorText": "#eff0f1", - "alertErrorPanelText": "#eff0f1", - "alertWarning": "#f67400", - "alertWarningText": "#eff0f1", - "alertWarningPanelText": "#eff0f1", - "badgeNotification": "#da4453", - "badgeNotificationText": "#ffffff" - }, - "opacity": { - "panel": 0, - "btn": 1, - "border": 1, - "bg": 1, - "alert": 0.5, - "input": 0.5, - "faint": 0.5, - "underlay": 0.15 - }, - "radii": { - "btn": "2", - "input": "2", - "checkbox": "1", - "panel": "2", - "avatar": "2", - "avatarAlt": "2", - "tooltip": "2", - "attachment": "2" - }, - "fonts": { - "interface": { - "family": "sans-serif" - }, - "input": { - "family": "inherit" - }, - "post": { - "family": "inherit" - }, - "postCode": { - "family": "monospace" - } - } - }, "source": { "themeEngineVersion": 3, "fonts": {}, diff --git a/static/themes/breezy-light.json b/static/themes/breezy-light.json index 243b8593..0c85a3c9 100644 --- a/static/themes/breezy-light.json +++ b/static/themes/breezy-light.json @@ -1,216 +1,6 @@ { "_pleroma_theme_version": 2, "name": "Breezy Light (beta)", - "theme": { - "shadows": { - "panel": [ - { - "x": "1", - "y": "2", - "blur": "6", - "spread": 0, - "color": "#000000", - "alpha": 0.6 - } - ], - "topBar": [ - { - "x": 0, - "y": 0, - "blur": 4, - "spread": 0, - "color": "#000000", - "alpha": 0.6 - } - ], - "popup": [ - { - "x": 2, - "y": 2, - "blur": 3, - "spread": 0, - "color": "#000000", - "alpha": 0.5 - } - ], - "avatar": [ - { - "x": 0, - "y": 1, - "blur": 8, - "spread": 0, - "color": "#000000", - "alpha": 0.7 - } - ], - "avatarStatus": [], - "panelHeader": [ - { - "x": 0, - "y": "40", - "blur": "40", - "spread": "-40", - "inset": true, - "color": "#ffffff", - "alpha": "0.1" - } - ], - "button": [ - { - "x": 0, - "y": "0", - "blur": "0", - "spread": "1", - "color": "#000000", - "alpha": "0.3", - "inset": true - }, - { - "x": "1", - "y": "1", - "blur": "1", - "spread": 0, - "color": "#000000", - "alpha": "0.3", - "inset": false - } - ], - "buttonHover": [ - { - "x": 0, - "y": "0", - "blur": 0, - "spread": "1", - "color": "--accent", - "alpha": "0.3", - "inset": true - }, - { - "x": "1", - "y": "1", - "blur": "1", - "spread": 0, - "color": "#000000", - "alpha": "0.3", - "inset": false - } - ], - "buttonPressed": [ - { - "x": 0, - "y": 0, - "blur": "0", - "spread": "50", - "color": "--faint", - "alpha": 1, - "inset": true - }, - { - "x": 0, - "y": "0", - "blur": 0, - "spread": "1", - "color": "#ffffff", - "alpha": 0.2, - "inset": true - }, - { - "x": "1", - "y": "1", - "blur": 0, - "spread": 0, - "color": "#000000", - "alpha": "0.3", - "inset": false - } - ], - "input": [ - { - "x": 0, - "y": "0", - "blur": 0, - "spread": "1", - "color": "#000000", - "alpha": "0.2", - "inset": true - } - ] - }, - "colors": { - "bg": "#eff0f1", - "underlay": "#000000", - "text": "#232627", - "lightText": "#000000", - "accent": "#2980b9", - "link": "#2980b9", - "faint": "#232627", - "lightBg": "#e2e4e6", - "fg": "#bcc2c7", - "fgText": "#232627", - "fgLink": "#2980b9", - "border": "#b7bdc3", - "btn": "#eff0f1", - "btnText": "#232627", - "input": "#fcfcfc", - "inputText": "#000000", - "panel": "#475057", - "panelText": "#fcfcfc", - "panelLink": "#ffffff", - "panelFaint": "#d8dbdc", - "topBar": "#475057", - "topBarText": "#d8dbdc", - "topBarLink": "#eff0f1", - "faintLink": "#2980b9", - "linkBg": "#a0c4db", - "icon": "#898b8c", - "cBlue": "#2980b9", - "cRed": "#da4453", - "cGreen": "#27ae60", - "cOrange": "#f67400", - "alertError": "#da4453", - "alertErrorText": "#232627", - "alertErrorPanelText": "#fcfcfc", - "alertWarning": "#f67400", - "alertWarningText": "#232627", - "alertWarningPanelText": "#fcfcfc", - "badgeNotification": "#da4453", - "badgeNotificationText": "#ffffff" - }, - "opacity": { - "panel": 1, - "btn": 1, - "border": 1, - "bg": 1, - "alert": 0.5, - "input": "1", - "faint": 0.5, - "underlay": 0.15 - }, - "radii": { - "btn": "2", - "input": "2", - "checkbox": "1", - "panel": "2", - "avatar": "2", - "avatarAlt": "2", - "tooltip": "2", - "attachment": "2" - }, - "fonts": { - "interface": { - "family": "sans-serif" - }, - "input": { - "family": "inherit" - }, - "post": { - "family": "inherit" - }, - "postCode": { - "family": "monospace" - } - } - }, "source": { "themeEngineVersion": 3, "fonts": {}, -- cgit v1.2.3-70-g09d2 From 9af00424529e2cb9ea9418034fa1d689f248192d Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 13 Jan 2020 02:02:40 +0200 Subject: updated breezy theme --- static/themes/breezy-dark.json | 13 +++---------- static/themes/breezy-light.json | 13 +++---------- 2 files changed, 6 insertions(+), 20 deletions(-) (limited to 'static') diff --git a/static/themes/breezy-dark.json b/static/themes/breezy-dark.json index 580ce82c..ce0f10ab 100644 --- a/static/themes/breezy-dark.json +++ b/static/themes/breezy-dark.json @@ -67,15 +67,6 @@ } ], "buttonPressed": [ - { - "x": 0, - "y": 0, - "blur": "0", - "spread": "50", - "color": "--faint", - "alpha": 1, - "inset": true - }, { "x": 0, "y": "0", @@ -121,7 +112,9 @@ "cRed": "#da4453", "cBlue": "#3daee9", "cGreen": "#27ae60", - "cOrange": "#f67400" + "cOrange": "#f67400", + "btnPressed": "--accent", + "lightBg": "--accent,-20" }, "radii": { "btn": "2", diff --git a/static/themes/breezy-light.json b/static/themes/breezy-light.json index 0c85a3c9..c4e54c6d 100644 --- a/static/themes/breezy-light.json +++ b/static/themes/breezy-light.json @@ -67,15 +67,6 @@ } ], "buttonPressed": [ - { - "x": 0, - "y": 0, - "blur": "0", - "spread": "50", - "color": "--faint", - "alpha": 1, - "inset": true - }, { "x": 0, "y": "0", @@ -124,7 +115,9 @@ "cRed": "#da4453", "cBlue": "#2980b9", "cGreen": "#27ae60", - "cOrange": "#f67400" + "cOrange": "#f67400", + "btnPressed": "--accent", + "lightBg": "--accent,-20" }, "radii": { "btn": "2", -- cgit v1.2.3-70-g09d2 From 1f5ada08c156687c6a8de22f9f8acb6c5c15824b Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 16 Jan 2020 23:29:19 +0200 Subject: themes update --- static/themes/breezy-dark.json | 3 ++- static/themes/breezy-light.json | 3 ++- static/themes/redmond-xx-se.json | 5 ++++- static/themes/redmond-xx.json | 5 ++++- static/themes/redmond-xxi.json | 5 ++++- 5 files changed, 16 insertions(+), 5 deletions(-) (limited to 'static') diff --git a/static/themes/breezy-dark.json b/static/themes/breezy-dark.json index ce0f10ab..97e81f3d 100644 --- a/static/themes/breezy-dark.json +++ b/static/themes/breezy-dark.json @@ -114,7 +114,8 @@ "cGreen": "#27ae60", "cOrange": "#f67400", "btnPressed": "--accent", - "lightBg": "--accent,-20" + "lightBg": "--accent", + "selectedPost": "--bg,10" }, "radii": { "btn": "2", diff --git a/static/themes/breezy-light.json b/static/themes/breezy-light.json index c4e54c6d..fd307b80 100644 --- a/static/themes/breezy-light.json +++ b/static/themes/breezy-light.json @@ -117,7 +117,8 @@ "cGreen": "#27ae60", "cOrange": "#f67400", "btnPressed": "--accent", - "lightBg": "--accent,-20" + "lightBg": "--accent", + "selectedPost": "--bg,10" }, "radii": { "btn": "2", diff --git a/static/themes/redmond-xx-se.json b/static/themes/redmond-xx-se.json index 70ee89d1..13ed3b0e 100644 --- a/static/themes/redmond-xx-se.json +++ b/static/themes/redmond-xx-se.json @@ -268,6 +268,7 @@ "bg": "#c0c0c0", "text": "#000000", "link": "#0000ff", + "accent": "#000080", "fg": "#c0c0c0", "panel": "#000080", "panelFaint": "#c0c0c0", @@ -281,7 +282,9 @@ "cRed": "#FF0000", "cBlue": "#008080", "cGreen": "#008000", - "cOrange": "#808000" + "cOrange": "#808000", + "lightBg": "--accent", + "selectedPost": "--bg,-10" }, "radii": { "btn": "0", diff --git a/static/themes/redmond-xx.json b/static/themes/redmond-xx.json index 4fd6a369..7c687ae0 100644 --- a/static/themes/redmond-xx.json +++ b/static/themes/redmond-xx.json @@ -259,6 +259,7 @@ "bg": "#c0c0c0", "text": "#000000", "link": "#0000ff", + "accent": "#000080", "fg": "#c0c0c0", "panel": "#000080", "panelFaint": "#c0c0c0", @@ -272,7 +273,9 @@ "cRed": "#FF0000", "cBlue": "#008080", "cGreen": "#008000", - "cOrange": "#808000" + "cOrange": "#808000", + "lightBg": "--accent", + "selectedPost": "--bg,-10" }, "radii": { "btn": "0", diff --git a/static/themes/redmond-xxi.json b/static/themes/redmond-xxi.json index d10bf138..5371ee64 100644 --- a/static/themes/redmond-xxi.json +++ b/static/themes/redmond-xxi.json @@ -241,6 +241,7 @@ "bg": "#d6d6ce", "text": "#000000", "link": "#0000ff", + "accent": "#0a246a", "fg": "#d6d6ce", "panel": "#042967", "panelFaint": "#FFFFFF", @@ -254,7 +255,9 @@ "cRed": "#c42726", "cBlue": "#6699cc", "cGreen": "#669966", - "cOrange": "#cc6633" + "cOrange": "#cc6633", + "lightBg": "--accent", + "selectedPost": "--bg,-10" }, "radii": { "btn": "0", -- cgit v1.2.3-70-g09d2 From 6e1c538e4182263a75fb65b0f3c5d1ad9de94541 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 20 Jan 2020 01:31:54 +0200 Subject: multiple fixes to make style switcher not die. Made shadows work, incuding compatibility --- src/components/style_switcher/style_switcher.js | 121 +++++++++++++----------- src/services/style_setter/style_setter.js | 23 ++++- src/services/theme_data/theme_data.service.js | 9 +- static/themes/breezy-dark.json | 2 +- static/themes/breezy-light.json | 2 +- 5 files changed, 96 insertions(+), 61 deletions(-) (limited to 'static') diff --git a/src/components/style_switcher/style_switcher.js b/src/components/style_switcher/style_switcher.js index 2984873f..2a1e439b 100644 --- a/src/components/style_switcher/style_switcher.js +++ b/src/components/style_switcher/style_switcher.js @@ -11,7 +11,8 @@ import { generateRadii, generateFonts, composePreset, - getThemes + getThemes, + shadows2to3 } from '../../services/style_setter/style_setter.js' import { CURRENT_VERSION, @@ -159,62 +160,66 @@ export default { }, // This needs optimization maybe previewContrast () { - if (!this.previewTheme.colors.bg) return {} - const colors = this.previewTheme.colors - const opacity = this.previewTheme.opacity - if (!colors.bg) return {} - const hints = (ratio) => ({ - text: ratio.toPrecision(3) + ':1', - // AA level, AAA level - aa: ratio >= 4.5, - aaa: ratio >= 7, - // same but for 18pt+ texts - laa: ratio >= 3, - laaa: ratio >= 4.5 - }) - const colorsConverted = Object.entries(colors).reduce((acc, [key, value]) => ({ ...acc, [key]: colorConvert(value) }), {}) - - const ratios = Object.entries(SLOT_INHERITANCE).reduce((acc, [key, value]) => { - const slotIsBaseText = key === 'text' || key === 'link' - const slotIsText = slotIsBaseText || ( - typeof value === 'object' && value !== null && value.textColor - ) - if (!slotIsText) return acc - const { layer, variant } = slotIsBaseText ? { layer: 'bg' } : value - const background = variant || layer - const opacitySlot = getOpacitySlot(SLOT_INHERITANCE[background]) - const textColors = [ - key, - ...(background === 'bg' ? ['cRed', 'cGreen', 'cBlue', 'cOrange'] : []) - ] - - const layers = getLayers( - layer, - variant || layer, - opacitySlot, - colorsConverted, - opacity - ) + try { + if (!this.previewTheme.colors.bg) return {} + const colors = this.previewTheme.colors + const opacity = this.previewTheme.opacity + if (!colors.bg) return {} + const hints = (ratio) => ({ + text: ratio.toPrecision(3) + ':1', + // AA level, AAA level + aa: ratio >= 4.5, + aaa: ratio >= 7, + // same but for 18pt+ texts + laa: ratio >= 3, + laaa: ratio >= 4.5 + }) + const colorsConverted = Object.entries(colors).reduce((acc, [key, value]) => ({ ...acc, [key]: colorConvert(value) }), {}) + + const ratios = Object.entries(SLOT_INHERITANCE).reduce((acc, [key, value]) => { + const slotIsBaseText = key === 'text' || key === 'link' + const slotIsText = slotIsBaseText || ( + typeof value === 'object' && value !== null && value.textColor + ) + if (!slotIsText) return acc + const { layer, variant } = slotIsBaseText ? { layer: 'bg' } : value + const background = variant || layer + const opacitySlot = getOpacitySlot(SLOT_INHERITANCE[background]) + const textColors = [ + key, + ...(background === 'bg' ? ['cRed', 'cGreen', 'cBlue', 'cOrange'] : []) + ] + + const layers = getLayers( + layer, + variant || layer, + opacitySlot, + colorsConverted, + opacity + ) - return { - ...acc, - ...textColors.reduce((acc, textColorKey) => { - const newKey = slotIsBaseText - ? 'bg' + textColorKey[0].toUpperCase() + textColorKey.slice(1) - : textColorKey - return { - ...acc, - [newKey]: getContrastRatioLayers( - colorsConverted[textColorKey], - layers, - colorsConverted[textColorKey] - ) - } - }, {}) - } - }, {}) + return { + ...acc, + ...textColors.reduce((acc, textColorKey) => { + const newKey = slotIsBaseText + ? 'bg' + textColorKey[0].toUpperCase() + textColorKey.slice(1) + : textColorKey + return { + ...acc, + [newKey]: getContrastRatioLayers( + colorsConverted[textColorKey], + layers, + colorsConverted[textColorKey] + ) + } + }, {}) + } + }, {}) - return Object.entries(ratios).reduce((acc, [k, v]) => { acc[k] = hints(v); return acc }, {}) + return Object.entries(ratios).reduce((acc, [k, v]) => { acc[k] = hints(v); return acc }, {}) + } catch (e) { + console.warn('Failure computing contrasts', e) + } }, previewRules () { if (!this.preview.rules) return '' @@ -466,7 +471,11 @@ export default { if (!this.keepShadows) { this.clearShadows() - this.shadowsLocal = shadows + if (version === 2) { + this.shadowsLocal = shadows2to3(shadows) + } else { + this.shadowsLocal = shadows + } this.shadowSelected = this.shadowsAvailable[0] } diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js index 74af190c..ee264c49 100644 --- a/src/services/style_setter/style_setter.js +++ b/src/services/style_setter/style_setter.js @@ -291,8 +291,8 @@ export const generateShadows = (input, colors, mod) => { const shadows = Object.entries({ ...DEFAULT_SHADOWS, ...(input.shadows || {}) - }).reduce((shadowsAcc, [slotName, shadowdefs]) => { - const newShadow = shadowdefs.reduce((shadowAcc, def) => [ + }).reduce((shadowsAcc, [slotName, shadowDefs]) => { + const newShadow = shadowDefs.reduce((shadowAcc, def) => [ ...shadowAcc, { ...def, @@ -380,6 +380,25 @@ export const getThemes = () => { }) } +/** + * This handles compatibility issues when importing v2 theme's shadows to current format + * + * Back in v2 shadows allowed you to use dynamic colors however those used pure CSS3 variables + */ +export const shadows2to3 = (shadows) => { + return Object.entries(shadows).reduce((shadowsAcc, [slotName, shadowDefs]) => { + const isDynamic = ({ color }) => console.log(color) || color.startsWith('--') + const newShadow = shadowDefs.reduce((shadowAcc, def) => [ + ...shadowAcc, + { + ...def, + alpha: isDynamic(def) ? 1 : def.alpha + } + ], []) + return { ...shadowsAcc, [slotName]: newShadow } + }, {}) +} + export const setPreset = (val, commit) => { return getThemes() .then((themes) => themes[val] ? themes[val] : themes['pleroma-dark']) diff --git a/src/services/theme_data/theme_data.service.js b/src/services/theme_data/theme_data.service.js index e4456b29..36837b44 100644 --- a/src/services/theme_data/theme_data.service.js +++ b/src/services/theme_data/theme_data.service.js @@ -663,7 +663,14 @@ export const SLOT_ORDERED = topoSort( Object.entries(SLOT_INHERITANCE) .sort(([aK, aV], [bK, bV]) => ((aV && aV.priority) || 0) - ((bV && bV.priority) || 0)) .reduce((acc, [k, v]) => ({ ...acc, [k]: v }), {}) -) +).sort((a, b) => { + const depsA = getDependencies(a, SLOT_INHERITANCE).length + const depsB = getDependencies(b, SLOT_INHERITANCE).length + + if (depsA === depsB || (depsB !== 0 && depsA !== 0)) return 0 + if (depsA === 0 && depsB !== 0) return -1 + if (depsB === 0 && depsA !== 0) return 1 +}) /** * Dictionary where keys are color slots and values are opacity associated diff --git a/static/themes/breezy-dark.json b/static/themes/breezy-dark.json index 97e81f3d..3aafda52 100644 --- a/static/themes/breezy-dark.json +++ b/static/themes/breezy-dark.json @@ -53,7 +53,7 @@ "blur": 0, "spread": "1", "color": "--accent", - "alpha": "0.3", + "alpha": "1", "inset": true }, { diff --git a/static/themes/breezy-light.json b/static/themes/breezy-light.json index fd307b80..df6e1a66 100644 --- a/static/themes/breezy-light.json +++ b/static/themes/breezy-light.json @@ -53,7 +53,7 @@ "blur": 0, "spread": "1", "color": "--accent", - "alpha": "0.3", + "alpha": "1", "inset": true }, { -- cgit v1.2.3-70-g09d2 From 644ce497a0f118b2e5050a2e45b67450915c53f0 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 22 Jan 2020 01:28:46 +0200 Subject: lightBg -> highlight because it causes issues with v2 --- src/components/style_switcher/style_switcher.vue | 24 +++++----- src/i18n/en.json | 2 +- src/services/theme_data/theme_data.service.js | 60 ++++++++++++------------ static/themes/breezy-dark.json | 2 +- static/themes/breezy-light.json | 2 +- static/themes/redmond-xx-se.json | 2 +- static/themes/redmond-xx.json | 2 +- static/themes/redmond-xxi.json | 2 +- 8 files changed, 48 insertions(+), 48 deletions(-) (limited to 'static') diff --git a/src/components/style_switcher/style_switcher.vue b/src/components/style_switcher/style_switcher.vue index 61f8800a..79c2fcd3 100644 --- a/src/components/style_switcher/style_switcher.vue +++ b/src/components/style_switcher/style_switcher.vue @@ -518,27 +518,27 @@ />
-

{{ $t('settings.style.advanced_colors.lightBg') }}

+

{{ $t('settings.style.advanced_colors.highlight') }}

- + - +

{{ $t('settings.style.advanced_colors.selectedPost') }}

diff --git a/src/i18n/en.json b/src/i18n/en.json index 815c11b1..2622157a 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -449,7 +449,7 @@ "underlay": "Underlay", "poll": "Poll graph", "icons": "Icons", - "lightBg": "Highlighted elements", + "highlight": "Highlighted elements", "pressed": "Pressed", "selectedPost": "Selected post", "selectedMenu": "Selected menu item", diff --git a/src/services/theme_data/theme_data.service.js b/src/services/theme_data/theme_data.service.js index 63bfb5af..8c114004 100644 --- a/src/services/theme_data/theme_data.service.js +++ b/src/services/theme_data/theme_data.service.js @@ -47,7 +47,7 @@ export const LAYERS = { badge: null, // no transparency support fg: null, bg: 'underlay', - lightBg: 'bg', + highlight: 'bg', panel: 'bg', btn: 'bg', btnPanel: 'panel', @@ -148,57 +148,57 @@ export const SLOT_INHERITANCE = { cGreen: '#00FF00', cOrange: '#E3FF00', - lightBg: { + highlight: { depends: ['bg'], color: (mod, bg) => brightness(5 * mod, bg).rgb }, - lightBgFaintText: { + highlightFaintText: { depends: ['faint'], - layer: 'lightBg', + layer: 'highlight', textColor: true }, - lightBgFaintLink: { + highlightFaintLink: { depends: ['faintLink'], - layer: 'lightBg', + layer: 'highlight', textColor: 'preserve' }, - lightBgText: { + highlightText: { depends: ['text'], - layer: 'lightBg', + layer: 'highlight', textColor: true }, - lightBgLink: { + highlightLink: { depends: ['link'], - layer: 'lightBg', + layer: 'highlight', textColor: 'preserve' }, - lightBgIcon: { - depends: ['lightBg', 'lightBgText'], + highlightIcon: { + depends: ['highlight', 'highlightText'], color: (mod, bg, text) => mixrgb(bg, text) }, - selectedPost: '--lightBg', + selectedPost: '--highlight', selectedPostFaintText: { - depends: ['lightBgFaintText'], - layer: 'lightBg', + depends: ['highlightFaintText'], + layer: 'highlight', variant: 'selectedPost', textColor: true }, selectedPostFaintLink: { - depends: ['lightBgFaintLink'], - layer: 'lightBg', + depends: ['highlightFaintLink'], + layer: 'highlight', variant: 'selectedPost', textColor: 'preserve' }, selectedPostText: { - depends: ['lightBgText'], - layer: 'lightBg', + depends: ['highlightText'], + layer: 'highlight', variant: 'selectedPost', textColor: true }, selectedPostLink: { - depends: ['lightBgLink'], - layer: 'lightBg', + depends: ['highlightLink'], + layer: 'highlight', variant: 'selectedPost', textColor: 'preserve' }, @@ -207,28 +207,28 @@ export const SLOT_INHERITANCE = { color: (mod, bg, text) => mixrgb(bg, text) }, - selectedMenu: '--lightBg', + selectedMenu: '--highlight', selectedMenuFaintText: { - depends: ['lightBgFaintText'], - layer: 'lightBg', + depends: ['highlightFaintText'], + layer: 'highlight', variant: 'selectedMenu', textColor: true }, selectedMenuFaintLink: { - depends: ['lightBgFaintLink'], - layer: 'lightBg', + depends: ['highlightFaintLink'], + layer: 'highlight', variant: 'selectedMenu', textColor: 'preserve' }, selectedMenuText: { - depends: ['lightBgText'], - layer: 'lightBg', + depends: ['highlightText'], + layer: 'highlight', variant: 'selectedMenu', textColor: true }, selectedMenuLink: { - depends: ['lightBgLink'], - layer: 'lightBg', + depends: ['highlightLink'], + layer: 'highlight', variant: 'selectedMenu', textColor: 'preserve' }, diff --git a/static/themes/breezy-dark.json b/static/themes/breezy-dark.json index 3aafda52..c3bdcf65 100644 --- a/static/themes/breezy-dark.json +++ b/static/themes/breezy-dark.json @@ -114,7 +114,7 @@ "cGreen": "#27ae60", "cOrange": "#f67400", "btnPressed": "--accent", - "lightBg": "--accent", + "highlight": "--accent", "selectedPost": "--bg,10" }, "radii": { diff --git a/static/themes/breezy-light.json b/static/themes/breezy-light.json index df6e1a66..478407c9 100644 --- a/static/themes/breezy-light.json +++ b/static/themes/breezy-light.json @@ -117,7 +117,7 @@ "cGreen": "#27ae60", "cOrange": "#f67400", "btnPressed": "--accent", - "lightBg": "--accent", + "highlight": "--accent", "selectedPost": "--bg,10" }, "radii": { diff --git a/static/themes/redmond-xx-se.json b/static/themes/redmond-xx-se.json index 13ed3b0e..1a867fcc 100644 --- a/static/themes/redmond-xx-se.json +++ b/static/themes/redmond-xx-se.json @@ -283,7 +283,7 @@ "cBlue": "#008080", "cGreen": "#008000", "cOrange": "#808000", - "lightBg": "--accent", + "highlight": "--accent", "selectedPost": "--bg,-10" }, "radii": { diff --git a/static/themes/redmond-xx.json b/static/themes/redmond-xx.json index 7c687ae0..78c92f10 100644 --- a/static/themes/redmond-xx.json +++ b/static/themes/redmond-xx.json @@ -274,7 +274,7 @@ "cBlue": "#008080", "cGreen": "#008000", "cOrange": "#808000", - "lightBg": "--accent", + "highlight": "--accent", "selectedPost": "--bg,-10" }, "radii": { diff --git a/static/themes/redmond-xxi.json b/static/themes/redmond-xxi.json index 5371ee64..28f68351 100644 --- a/static/themes/redmond-xxi.json +++ b/static/themes/redmond-xxi.json @@ -256,7 +256,7 @@ "cBlue": "#6699cc", "cGreen": "#669966", "cOrange": "#cc6633", - "lightBg": "--accent", + "highlight": "--accent", "selectedPost": "--bg,-10" }, "radii": { -- cgit v1.2.3-70-g09d2 From b96993e4dd6b2d9197b430af404e8fa652888b51 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Fri, 24 Jan 2020 00:36:32 +0200 Subject: improved selectedMenu again --- src/components/emoji_input/emoji_input.vue | 12 +++-- src/components/emoji_picker/emoji_picker.scss | 9 ++++ src/components/nav_panel/nav_panel.vue | 2 + src/components/popper/popper.scss | 12 +++-- src/components/selectable_list/selectable_list.vue | 1 + src/components/side_drawer/side_drawer.vue | 12 +++-- src/components/status/status.vue | 1 + src/services/color_convert/color_convert.js | 2 +- src/services/theme_data/pleromafe.js | 63 +++++++++++++++++++++- src/services/theme_data/theme_data.service.js | 7 +-- static/themes/breezy-dark.json | 4 +- static/themes/breezy-light.json | 4 +- 12 files changed, 105 insertions(+), 24 deletions(-) (limited to 'static') diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue index 9c2501a9..94eae560 100644 --- a/src/components/emoji_input/emoji_input.vue +++ b/src/components/emoji_input/emoji_input.vue @@ -115,6 +115,7 @@ color: var(--popoverText, $fallback--link); --faint: var(--popoverFaintText, $fallback--faint); --faintLink: var(--popoverFaintLink, $fallback--faint); + --lightText: var(--popoverLightText, $fallback--lightText); --icon: var(--popoverIcon, $fallback--icon); } } @@ -160,11 +161,12 @@ &.highlighted { background-color: $fallback--fg; - background-color: var(--selectedMenu, $fallback--fg); - color: var(--selectedMenuText, $fallback--text); - --faint: var(--selectedMenuFaintText, $fallback--faint); - --faintLink: var(--selectedMenuFaintLink, $fallback--faint); - --icon: var(--selectedMenuIcon, $fallback--icon); + background-color: var(--selectedMenuPopover, $fallback--fg); + color: var(--selectedMenuPopoverText, $fallback--text); + --faint: var(--selectedMenuPopoverFaintText, $fallback--faint); + --faintLink: var(--selectedMenuPopoverFaintLink, $fallback--faint); + --lightText: var(--selectedMenuPopoverLightText, $fallback--lightText); + --icon: var(--selectedMenuPopoverIcon, $fallback--icon); } } } diff --git a/src/components/emoji_picker/emoji_picker.scss b/src/components/emoji_picker/emoji_picker.scss index 6608f393..8bd07e45 100644 --- a/src/components/emoji_picker/emoji_picker.scss +++ b/src/components/emoji_picker/emoji_picker.scss @@ -8,6 +8,15 @@ left: 0; margin: 0 !important; z-index: 1; + background-color: $fallback--bg; + background-color: var(--popover, $fallback--bg); + color: $fallback--link; + color: var(--popoverText, $fallback--link); + --lightText: var(--popoverLightText, $fallback--faint); + --faint: var(--popoverFaintText, $fallback--faint); + --faintLink: var(--popoverFaintLink, $fallback--faint); + --lightText: var(--popoverLightText, $fallback--lightText); + --icon: var(--popoverIcon, $fallback--icon); .keep-open, .too-many-emoji { diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue index afc611ea..a934a411 100644 --- a/src/components/nav_panel/nav_panel.vue +++ b/src/components/nav_panel/nav_panel.vue @@ -105,6 +105,7 @@ color: var(--selectedMenuText, $fallback--link); --faint: var(--selectedMenuFaintText, $fallback--faint); --faintLink: var(--selectedMenuFaintLink, $fallback--faint); + --lightText: var(--selectedMenuLightText, $fallback--lightText); --icon: var(--selectedMenuIcon, $fallback--icon); } @@ -116,6 +117,7 @@ color: var(--selectedMenuText, $fallback--text); --faint: var(--selectedMenuFaintText, $fallback--faint); --faintLink: var(--selectedMenuFaintLink, $fallback--faint); + --lightText: var(--selectedMenuLightText, $fallback--lightText); --icon: var(--selectedMenuIcon, $fallback--icon); &:hover { diff --git a/src/components/popper/popper.scss b/src/components/popper/popper.scss index e70b277d..591be37e 100644 --- a/src/components/popper/popper.scss +++ b/src/components/popper/popper.scss @@ -14,6 +14,7 @@ color: var(--popoverText, $fallback--text); --faint: var(--popoverFaintText, $fallback--faint); --faintLink: var(--popoverFaintLink, $fallback--faint); + --lightText: var(--popoverLightText, $fallback--lightText); --icon: var(--popoverIcon, $fallback--icon); } @@ -144,12 +145,13 @@ &:active, &:hover { background-color: $fallback--lightBg; - background-color: var(--selectedMenu, $fallback--lightBg); + background-color: var(--selectedMenuPopover, $fallback--lightBg); color: $fallback--link; - color: var(--selectedMenuText, $fallback--link); - --faint: var(--selectedMenuFaintText, $fallback--faint); - --faintLink: var(--selectedMenuFaintLink, $fallback--faint); - --icon: var(--selectedMenuIcon, $fallback--icon); + color: var(--selectedMenuPopoverText, $fallback--link); + --faint: var(--selectedMenuPopoverFaintText, $fallback--faint); + --faintLink: var(--selectedMenuPopoverFaintLink, $fallback--faint); + --lightText: var(--selectedMenuPopoverLightText, $fallback--lightText); + --icon: var(--selectedMenuPopoverIcon, $fallback--icon); } } } diff --git a/src/components/selectable_list/selectable_list.vue b/src/components/selectable_list/selectable_list.vue index 2d1e44a3..a9bb12a1 100644 --- a/src/components/selectable_list/selectable_list.vue +++ b/src/components/selectable_list/selectable_list.vue @@ -72,6 +72,7 @@ color: var(--selectedMenuText, $fallback--text); --faint: var(--selectedMenuFaintText, $fallback--faint); --faintLink: var(--selectedMenuFaintLink, $fallback--faint); + --lightText: var(--selectedMenuLightText, $fallback--lightText); --icon: var(--selectedMenuIcon, $fallback--icon); } diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue index a5b754d7..25e4de01 100644 --- a/src/components/side_drawer/side_drawer.vue +++ b/src/components/side_drawer/side_drawer.vue @@ -228,6 +228,7 @@ color: var(--popoverText, $fallback--link); --faint: var(--popoverFaintText, $fallback--faint); --faintLink: var(--popoverFaintLink, $fallback--faint); + --lightText: var(--popoverLightText, $fallback--lightText); --icon: var(--popoverIcon, $fallback--icon); .button-icon:before { @@ -294,12 +295,13 @@ &:hover { background-color: $fallback--lightBg; - background-color: var(--selectedMenu, $fallback--lightBg); + background-color: var(--selectedMenuPopover, $fallback--lightBg); color: $fallback--text; - color: var(--selectedMenuText, $fallback--text); - --faint: var(--selectedMenuFaintText, $fallback--faint); - --faintLink: var(--selectedMenuFaintLink, $fallback--faint); - --icon: var(--selectedMenuIcon, $fallback--icon); + color: var(--selectedMenuPopoverText, $fallback--text); + --faint: var(--selectedMenuPopoverFaintText, $fallback--faint); + --faintLink: var(--selectedMenuPopoverFaintLink, $fallback--faint); + --lightText: var(--selectedMenuPopoverLightText, $fallback--lightText); + --icon: var(--selectedMenuPopoverIcon, $fallback--icon); } } } diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 38d091ed..1997e187 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -448,6 +448,7 @@ $status-margin: 0.75em; background-color: var(--selectedPost, $fallback--lightBg); color: $fallback--text; color: var(--selectedPostText, $fallback--text); + --lightText: var(--selectedPostLightText, $fallback--light); --faint: var(--selectedPostFaintText, $fallback--faint); --faintLink: var(--selectedPostFaintLink, $fallback--faint); --icon: var(--selectedPostIcon, $fallback--icon); diff --git a/src/services/color_convert/color_convert.js b/src/services/color_convert/color_convert.js index 93cb1ba6..0bf8f646 100644 --- a/src/services/color_convert/color_convert.js +++ b/src/services/color_convert/color_convert.js @@ -69,7 +69,7 @@ const srgbToLinear = (srgb) => { * @param {Object} srgb - sRGB color * @returns {Number} relative luminance */ -const relativeLuminance = (srgb) => { +export const relativeLuminance = (srgb) => { const { r, g, b } = srgbToLinear(srgb) return 0.2126 * r + 0.7152 * g + 0.0722 * b } diff --git a/src/services/theme_data/pleromafe.js b/src/services/theme_data/pleromafe.js index 484874d7..a40d08a6 100644 --- a/src/services/theme_data/pleromafe.js +++ b/src/services/theme_data/pleromafe.js @@ -117,6 +117,11 @@ export const SLOT_INHERITANCE = { depends: ['bg'], color: (mod, bg) => brightness(5 * mod, bg).rgb }, + highlightLightText: { + depends: ['lightText'], + layer: 'highlight', + textColor: true + }, highlightFaintText: { depends: ['faint'], layer: 'highlight', @@ -146,6 +151,11 @@ export const SLOT_INHERITANCE = { depends: ['bg'], opacity: 'popover' }, + popoverLightText: { + depends: ['lightText'], + layer: 'popover', + textColor: true + }, popoverFaintText: { depends: ['faint'], layer: 'popover', @@ -178,6 +188,12 @@ export const SLOT_INHERITANCE = { variant: 'selectedPost', textColor: true }, + selectedPostLightText: { + depends: ['highlightLightText'], + layer: 'highlight', + variant: 'selectedPost', + textColor: true + }, selectedPostFaintLink: { depends: ['highlightFaintLink'], layer: 'highlight', @@ -202,9 +218,15 @@ export const SLOT_INHERITANCE = { }, selectedMenu: { - depends: ['popover'], + depends: ['bg'], color: (mod, bg) => brightness(5 * mod, bg).rgb }, + selectedMenuLightText: { + depends: ['highlightLightText'], + layer: 'selectedMenu', + variant: 'selectedMenu', + textColor: true + }, selectedMenuFaintText: { depends: ['highlightFaintText'], layer: 'selectedMenu', @@ -234,6 +256,45 @@ export const SLOT_INHERITANCE = { color: (mod, bg, text) => mixrgb(bg, text) }, + selectedMenuPopover: { + depends: ['popover'], + color: (mod, bg) => brightness(5 * mod, bg).rgb + }, + selectedMenuPopoverLightText: { + depends: ['selectedMenuLightText'], + layer: 'selectedMenuPopover', + variant: 'selectedMenuPopover', + textColor: true + }, + selectedMenuPopoverFaintText: { + depends: ['selectedMenuFaintText'], + layer: 'selectedMenuPopover', + variant: 'selectedMenuPopover', + textColor: true + }, + selectedMenuPopoverFaintLink: { + depends: ['selectedMenuFaintLink'], + layer: 'selectedMenuPopover', + variant: 'selectedMenuPopover', + textColor: 'preserve' + }, + selectedMenuPopoverText: { + depends: ['selectedMenuText'], + layer: 'selectedMenuPopover', + variant: 'selectedMenuPopover', + textColor: true + }, + selectedMenuPopoverLink: { + depends: ['selectedMenuLink'], + layer: 'selectedMenuPopover', + variant: 'selectedMenuPopover', + textColor: 'preserve' + }, + selectedMenuPopoverIcon: { + depends: ['selectedMenuPopover', 'selectedMenuText'], + color: (mod, bg, text) => mixrgb(bg, text) + }, + lightText: { depends: ['text'], color: (mod, text) => brightness(20 * mod, text).rgb diff --git a/src/services/theme_data/theme_data.service.js b/src/services/theme_data/theme_data.service.js index ea28481b..c0861a4a 100644 --- a/src/services/theme_data/theme_data.service.js +++ b/src/services/theme_data/theme_data.service.js @@ -1,5 +1,5 @@ import { convert, brightness, contrastRatio } from 'chromatism' -import { alphaBlendLayers, getTextColor } from '../color_convert/color_convert.js' +import { alphaBlendLayers, getTextColor, relativeLuminance } from '../color_convert/color_convert.js' import { LAYERS, DEFAULT_OPACITY, SLOT_INHERITANCE } from './pleromafe.js' /* @@ -318,13 +318,14 @@ export const getColors = (sourceColors, sourceOpacity, mod) => SLOT_ORDERED.redu opacity ) ) + const isLightOnDark = relativeLuminance(bg) > 127 + const mod = isLightOnDark ? 1 : -1 + if (value.textColor === 'bw') { outputColor = contrastRatio(bg).rgb } else { let color = { ...colors[deps[0]] } if (value.color) { - const isLightOnDark = convert(bg).hsl.l < convert(color).hsl.l - const mod = isLightOnDark ? 1 : -1 color = value.color(mod, ...deps.map((dep) => ({ ...colors[dep] }))) } diff --git a/static/themes/breezy-dark.json b/static/themes/breezy-dark.json index c3bdcf65..236b94ad 100644 --- a/static/themes/breezy-dark.json +++ b/static/themes/breezy-dark.json @@ -114,8 +114,8 @@ "cGreen": "#27ae60", "cOrange": "#f67400", "btnPressed": "--accent", - "highlight": "--accent", - "selectedPost": "--bg,10" + "selectedMenu": "--accent", + "selectedMenuPopover": "--accent" }, "radii": { "btn": "2", diff --git a/static/themes/breezy-light.json b/static/themes/breezy-light.json index 478407c9..d3f74cec 100644 --- a/static/themes/breezy-light.json +++ b/static/themes/breezy-light.json @@ -117,8 +117,8 @@ "cGreen": "#27ae60", "cOrange": "#f67400", "btnPressed": "--accent", - "highlight": "--accent", - "selectedPost": "--bg,10" + "selectedMenu": "--accent", + "selectedMenuPopover": "--accent" }, "radii": { "btn": "2", -- cgit v1.2.3-70-g09d2 From 7c074b87418602effac03c4bae34afffcfca283f Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 27 Jan 2020 04:20:13 +0200 Subject: fix rgba css generation, add some tests to automatically verify that themes are generated properly --- build/webpack.base.conf.js | 1 + src/services/color_convert/color_convert.js | 2 +- src/services/theme_data/theme_data.service.js | 2 +- static/themes/redmond-xx-se.json | 2 +- static/themes/redmond-xx.json | 2 +- static/themes/redmond-xxi.json | 2 +- .../services/theme_data/sanity_checks.spec.js | 28 ++++ .../specs/services/theme_data/theme_data.spec.js | 147 +++++++++++---------- 8 files changed, 109 insertions(+), 77 deletions(-) create mode 100644 test/unit/specs/services/theme_data/sanity_checks.spec.js (limited to 'static') diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index 5cc0135e..dfef37a6 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -35,6 +35,7 @@ module.exports = { ], alias: { 'vue$': 'vue/dist/vue.runtime.common', + 'static': path.resolve(__dirname, '../static'), 'src': path.resolve(__dirname, '../src'), 'assets': path.resolve(__dirname, '../src/assets'), 'components': path.resolve(__dirname, '../src/components') diff --git a/src/services/color_convert/color_convert.js b/src/services/color_convert/color_convert.js index 0bf8f646..b5461038 100644 --- a/src/services/color_convert/color_convert.js +++ b/src/services/color_convert/color_convert.js @@ -171,7 +171,7 @@ export const mixrgb = (a, b) => { * @returns {String} CSS rgba() color */ export const rgba2css = function (rgba) { - return `rgba(${rgba.r}, ${rgba.g}, ${rgba.b}, ${rgba.a})` + return `rgba(${Math.floor(rgba.r)}, ${Math.floor(rgba.g)}, ${Math.floor(rgba.b)}, .5)` } /** diff --git a/src/services/theme_data/theme_data.service.js b/src/services/theme_data/theme_data.service.js index 0a6733a9..49b99148 100644 --- a/src/services/theme_data/theme_data.service.js +++ b/src/services/theme_data/theme_data.service.js @@ -353,7 +353,7 @@ export const getColors = (sourceColors, sourceOpacity, mod) => SLOT_ORDERED.redu if (dependencySlot && sourceColors[dependencySlot] === 'transparent') { outputColor.a = 0 } else { - outputColor.a = sourceOpacity[opacitySlot] || OPACITIES[opacitySlot].defaultValue || 1 + outputColor.a = Number(sourceOpacity[opacitySlot]) || OPACITIES[opacitySlot].defaultValue || 1 } } if (opacitySlot) { diff --git a/static/themes/redmond-xx-se.json b/static/themes/redmond-xx-se.json index 1a867fcc..8deab7b7 100644 --- a/static/themes/redmond-xx-se.json +++ b/static/themes/redmond-xx-se.json @@ -1,7 +1,7 @@ { "_pleroma_theme_version": 2, "name": "Redmond XX SE", - "theme": { + "source": { "shadows": { "panel": [ { diff --git a/static/themes/redmond-xx.json b/static/themes/redmond-xx.json index 78c92f10..cdb89fe3 100644 --- a/static/themes/redmond-xx.json +++ b/static/themes/redmond-xx.json @@ -1,7 +1,7 @@ { "_pleroma_theme_version": 2, "name": "Redmond XX", - "theme": { + "source": { "shadows": { "panel": [ { diff --git a/static/themes/redmond-xxi.json b/static/themes/redmond-xxi.json index 28f68351..79a2cb26 100644 --- a/static/themes/redmond-xxi.json +++ b/static/themes/redmond-xxi.json @@ -1,7 +1,7 @@ { "_pleroma_theme_version": 2, "name": "Redmond XXI", - "theme": { + "source": { "shadows": { "panel": [ { diff --git a/test/unit/specs/services/theme_data/sanity_checks.spec.js b/test/unit/specs/services/theme_data/sanity_checks.spec.js new file mode 100644 index 00000000..f0072e7d --- /dev/null +++ b/test/unit/specs/services/theme_data/sanity_checks.spec.js @@ -0,0 +1,28 @@ +import { getColors } from 'src/services/theme_data/theme_data.service.js' + +const checkColors = (output) => { + expect(output).to.have.property('colors') + Object.entries(output.colors).forEach(([key, v]) => { + expect(v, key).to.be.an('object') + expect(v, key).to.include.all.keys('r', 'g', 'b') + 'rgba'.split('').forEach(k => { + if ((k === 'a' && v.hasOwnProperty('a')) || k !== 'a') { + expect(v[k], key + '.' + k).to.be.a('number') + expect(v[k], key + '.' + k).to.be.least(0) + expect(v[k], key + '.' + k).to.be.most(k === 'a' ? 1 : 255) + } + }) + }) +} + +describe('Theme Data utility functions', () => { + const context = require.context('static/themes/', false, /\.json$/) + context.keys().forEach((key) => { + it(`Should render all colors for ${key} properly`, () => { + const { theme, source } = context(key) + const data = source || theme + const colors = getColors(data.colors, data.opacity, 1) + checkColors(colors) + }) + }) +}) diff --git a/test/unit/specs/services/theme_data/theme_data.spec.js b/test/unit/specs/services/theme_data/theme_data.spec.js index d8a04ba7..67f4fd5a 100644 --- a/test/unit/specs/services/theme_data/theme_data.spec.js +++ b/test/unit/specs/services/theme_data/theme_data.spec.js @@ -1,87 +1,90 @@ import { getLayersArray, topoSort } from 'src/services/theme_data/theme_data.service.js' -describe('getLayersArray', () => { - const fixture = { - layer1: null, - layer2: 'layer1', - layer3a: 'layer2', - layer3b: 'layer2' - } +describe('Theme Data utility functions', () => { + describe('getLayersArray', () => { + const fixture = { + layer1: null, + layer2: 'layer1', + layer3a: 'layer2', + layer3b: 'layer2' + } - it('should expand layers properly (3b)', () => { - const out = getLayersArray('layer3b', fixture) - expect(out).to.eql(['layer1', 'layer2', 'layer3b']) - }) + it('should expand layers properly (3b)', () => { + const out = getLayersArray('layer3b', fixture) + expect(out).to.eql(['layer1', 'layer2', 'layer3b']) + }) - it('should expand layers properly (3a)', () => { - const out = getLayersArray('layer3a', fixture) - expect(out).to.eql(['layer1', 'layer2', 'layer3a']) - }) + it('should expand layers properly (3a)', () => { + const out = getLayersArray('layer3a', fixture) + expect(out).to.eql(['layer1', 'layer2', 'layer3a']) + }) - it('should expand layers properly (2)', () => { - const out = getLayersArray('layer2', fixture) - expect(out).to.eql(['layer1', 'layer2']) - }) + it('should expand layers properly (2)', () => { + const out = getLayersArray('layer2', fixture) + expect(out).to.eql(['layer1', 'layer2']) + }) - it('should expand layers properly (1)', () => { - const out = getLayersArray('layer1', fixture) - expect(out).to.eql(['layer1']) + it('should expand layers properly (1)', () => { + const out = getLayersArray('layer1', fixture) + expect(out).to.eql(['layer1']) + }) }) -}) -describe('topoSort', () => { - const fixture1 = { - layerA: [], - layer1A: ['layerA'], - layer2A: ['layer1A'], - layerB: [], - layer1B: ['layerB'], - layer2B: ['layer1B'], - layer3AB: ['layer2B', 'layer2A'] - } + describe('topoSort', () => { + const fixture1 = { + layerA: [], + layer1A: ['layerA'], + layer2A: ['layer1A'], + layerB: [], + layer1B: ['layerB'], + layer2B: ['layer1B'], + layer3AB: ['layer2B', 'layer2A'] + } - // Same thing but messed up order - const fixture2 = { - layer1A: ['layerA'], - layer1B: ['layerB'], - layer2A: ['layer1A'], - layerB: [], - layer3AB: ['layer2B', 'layer2A'], - layer2B: ['layer1B'], - layerA: [] - } + // Same thing but messed up order + const fixture2 = { + layer1A: ['layerA'], + layer1B: ['layerB'], + layer2A: ['layer1A'], + layerB: [], + layer3AB: ['layer2B', 'layer2A'], + layer2B: ['layer1B'], + layerA: [] + } - it('should make a topologically sorted array', () => { - const out = topoSort(fixture1, (node, inheritance) => inheritance[node]) - // This basically checks all ordering that matters - expect(out.indexOf('layerA')).to.be.below(out.indexOf('layer1A')) - expect(out.indexOf('layer1A')).to.be.below(out.indexOf('layer2A')) - expect(out.indexOf('layerB')).to.be.below(out.indexOf('layer1B')) - expect(out.indexOf('layer1B')).to.be.below(out.indexOf('layer2B')) - expect(out.indexOf('layer2A')).to.be.below(out.indexOf('layer3AB')) - expect(out.indexOf('layer2B')).to.be.below(out.indexOf('layer3AB')) - }) + it('should make a topologically sorted array', () => { + const out = topoSort(fixture1, (node, inheritance) => inheritance[node]) + // This basically checks all ordering that matters + expect(out.indexOf('layerA')).to.be.below(out.indexOf('layer1A')) + expect(out.indexOf('layer1A')).to.be.below(out.indexOf('layer2A')) + expect(out.indexOf('layerB')).to.be.below(out.indexOf('layer1B')) + expect(out.indexOf('layer1B')).to.be.below(out.indexOf('layer2B')) + expect(out.indexOf('layer2A')).to.be.below(out.indexOf('layer3AB')) + expect(out.indexOf('layer2B')).to.be.below(out.indexOf('layer3AB')) + }) - it('order in object shouldn\'t matter', () => { - const out = topoSort(fixture2, (node, inheritance) => inheritance[node]) - // This basically checks all ordering that matters - expect(out.indexOf('layerA')).to.be.below(out.indexOf('layer1A')) - expect(out.indexOf('layer1A')).to.be.below(out.indexOf('layer2A')) - expect(out.indexOf('layerB')).to.be.below(out.indexOf('layer1B')) - expect(out.indexOf('layer1B')).to.be.below(out.indexOf('layer2B')) - expect(out.indexOf('layer2A')).to.be.below(out.indexOf('layer3AB')) - expect(out.indexOf('layer2B')).to.be.below(out.indexOf('layer3AB')) - }) + it('order in object shouldn\'t matter', () => { + const out = topoSort(fixture2, (node, inheritance) => inheritance[node]) + // This basically checks all ordering that matters + expect(out.indexOf('layerA')).to.be.below(out.indexOf('layer1A')) + expect(out.indexOf('layer1A')).to.be.below(out.indexOf('layer2A')) + expect(out.indexOf('layerB')).to.be.below(out.indexOf('layer1B')) + expect(out.indexOf('layer1B')).to.be.below(out.indexOf('layer2B')) + expect(out.indexOf('layer2A')).to.be.below(out.indexOf('layer3AB')) + expect(out.indexOf('layer2B')).to.be.below(out.indexOf('layer3AB')) + }) - it('dependentless nodes should be first', () => { - const out = topoSort(fixture2, (node, inheritance) => inheritance[node]) - // This basically checks all ordering that matters - expect(out.indexOf('layerA')).to.eql(0) - expect(out.indexOf('layerB')).to.eql(1) - }) + it('dependentless nodes should be first', () => { + const out = topoSort(fixture2, (node, inheritance) => inheritance[node]) + // This basically checks all ordering that matters + expect(out.indexOf('layerA')).to.eql(0) + expect(out.indexOf('layerB')).to.eql(1) + }) - it('ignores cyclic dependencies', () => { - const out = topoSort({ a: 'b', b: 'a', c: 'a' }, (node, inheritance) => [inheritance[node]]) - expect(out.indexOf('a')).to.be.below(out.indexOf('c')) + it('ignores cyclic dependencies', () => { + const out = topoSort({ a: 'b', b: 'a', c: 'a' }, (node, inheritance) => [inheritance[node]]) + expect(out.indexOf('a')).to.be.below(out.indexOf('c')) + }) }) + }) -- cgit v1.2.3-70-g09d2 From 526b43eba66c597c78857da6ded3c7f672f96e49 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 28 Jan 2020 01:29:20 +0200 Subject: Kenomo (see: #624) theme. Ability to define link color for post contents. Fixes --- src/components/emoji_input/emoji_input.vue | 2 + src/components/notifications/notifications.scss | 3 + src/components/popper/popper.scss | 2 + src/components/status/status.vue | 7 +++ src/components/style_switcher/style_switcher.vue | 17 ++++++ src/components/user_card/user_card.vue | 5 ++ src/services/theme_data/pleromafe.js | 34 ++++++++++++ static/themes/kenomo.json | 71 ++++++++++++++++++++++++ 8 files changed, 141 insertions(+) create mode 100644 static/themes/kenomo.json (limited to 'static') diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue index 94eae560..e9ac09c3 100644 --- a/src/components/emoji_input/emoji_input.vue +++ b/src/components/emoji_input/emoji_input.vue @@ -116,6 +116,8 @@ --faint: var(--popoverFaintText, $fallback--faint); --faintLink: var(--popoverFaintLink, $fallback--faint); --lightText: var(--popoverLightText, $fallback--lightText); + --postLink: var(--popoverPostLink, $fallback--link); + --postFaintLink: var(--popoverPostFaintLink, $fallback--link); --icon: var(--popoverIcon, $fallback--icon); } } diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss index 71876b14..ca762432 100644 --- a/src/components/notifications/notifications.scss +++ b/src/components/notifications/notifications.scss @@ -68,6 +68,9 @@ a { color: var(--faintLink); } + .status-content a { + color: var(--postFaintLink); + } } padding: 0; .media-body { diff --git a/src/components/popper/popper.scss b/src/components/popper/popper.scss index 341416c1..8e2dcd55 100644 --- a/src/components/popper/popper.scss +++ b/src/components/popper/popper.scss @@ -15,6 +15,8 @@ --faint: var(--popoverFaintText, $fallback--faint); --faintLink: var(--popoverFaintLink, $fallback--faint); --lightText: var(--popoverLightText, $fallback--lightText); + --postLink: var(--popoverPostLink, $fallback--link); + --postFaintLink: var(--popoverPostFaintLink, $fallback--link); --icon: var(--popoverIcon, $fallback--icon); } diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 1997e187..b1048832 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -451,6 +451,8 @@ $status-margin: 0.75em; --lightText: var(--selectedPostLightText, $fallback--light); --faint: var(--selectedPostFaintText, $fallback--faint); --faintLink: var(--selectedPostFaintLink, $fallback--faint); + --postLink: var(--selectedPostPostLink, $fallback--faint); + --postFaintLink: var(--selectedPostFaintPostLink, $fallback--faint); --icon: var(--selectedPostIcon, $fallback--icon); } @@ -640,6 +642,11 @@ $status-margin: 0.75em; line-height: 1.4em; white-space: pre-wrap; + a { + color: $fallback--link; + color: var(--postLink, $fallback--link); + } + img, video { max-width: 100%; max-height: 400px; diff --git a/src/components/style_switcher/style_switcher.vue b/src/components/style_switcher/style_switcher.vue index 6e38bd8e..0b3b0fbf 100644 --- a/src/components/style_switcher/style_switcher.vue +++ b/src/components/style_switcher/style_switcher.vue @@ -248,6 +248,23 @@
+

{{ $t('settings.style.advanced_colors.post') }}

+ + + +

{{ $t('settings.style.advanced_colors.alert') }}

brightness(20 * mod, text).rgb }, + postLink: { + depends: ['link'] + }, + border: { depends: ['fg'], opacity: 'border', diff --git a/static/themes/kenomo.json b/static/themes/kenomo.json new file mode 100644 index 00000000..98ddf974 --- /dev/null +++ b/static/themes/kenomo.json @@ -0,0 +1,71 @@ +{ + "_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" + } + } +} -- cgit v1.2.3-70-g09d2 From 53a15eec7d3f5d150b6b6b163057345062eefb39 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 28 Jan 2020 01:31:37 +0200 Subject: add theme to list --- static/styles.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'static') diff --git a/static/styles.json b/static/styles.json index 842092c4..2bddc8d8 100644 --- a/static/styles.json +++ b/static/styles.json @@ -11,5 +11,6 @@ "redmond-xxi": "/static/themes/redmond-xxi.json", "breezy-dark": "/static/themes/breezy-dark.json", "breezy-light": "/static/themes/breezy-light.json", - "mammal": "/static/themes/mammal.json" + "mammal": "/static/themes/mammal.json", + "kenomo": "/static/themes/kenomo.json" } -- cgit v1.2.3-70-g09d2 From 846285326900a497c68dc994ce06dcb1d5d1ca9c Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 28 Jan 2020 22:40:15 +0200 Subject: update button toggled state, apply it to emoji reactions --- src/App.scss | 4 +++- src/components/emoji_reactions/emoji_reactions.vue | 8 +------- src/components/style_switcher/style_switcher.vue | 13 +++++++++++++ static/themes/redmond-xx-se.json | 2 ++ static/themes/redmond-xx.json | 2 ++ static/themes/redmond-xxi.json | 2 ++ 6 files changed, 23 insertions(+), 8 deletions(-) (limited to 'static') diff --git a/src/App.scss b/src/App.scss index dd994a38..1fabaaa9 100644 --- a/src/App.scss +++ b/src/App.scss @@ -117,7 +117,9 @@ button { color: $fallback--text; color: var(--btnToggledText, $fallback--text); background-color: $fallback--fg; - background-color: var(--btnToggled, $fallback--fg) + background-color: var(--btnToggled, $fallback--fg); + box-shadow: 0px 0px 4px 0px rgba(255, 255, 255, 0.3), 0px 1px 0px 0px rgba(0, 0, 0, 0.2) inset, 0px -1px 0px 0px rgba(255, 255, 255, 0.2) inset; + box-shadow: var(--buttonPressedShadow); } &.danger { diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue index 00d6d2b7..f5d2e79a 100644 --- a/src/components/emoji_reactions/emoji_reactions.vue +++ b/src/components/emoji_reactions/emoji_reactions.vue @@ -4,7 +4,7 @@ v-for="(reaction) in emojiReactions" :key="reaction.emoji" class="emoji-reaction btn btn-default" - :class="{ 'picked-reaction': reactedWith(reaction.emoji) }" + :class="{ 'toggled': reactedWith(reaction.emoji) }" @click="emojiOnClick(reaction.emoji, $event)" > {{ reaction.emoji }} @@ -40,10 +40,4 @@ } } -.picked-reaction { - border: 1px solid var(--link, $fallback--link); - margin-left: -1px; // offset the border, can't use inset shadows either - margin-right: calc(0.5em - 1px); -} - diff --git a/src/components/style_switcher/style_switcher.vue b/src/components/style_switcher/style_switcher.vue index 9de3a96c..5a42bba7 100644 --- a/src/components/style_switcher/style_switcher.vue +++ b/src/components/style_switcher/style_switcher.vue @@ -460,6 +460,19 @@ :label="$t('settings.text')" /> +

{{ $t('settings.style.advanced_colors.toggled') }}

+ +

{{ $t('settings.style.advanced_colors.tabs') }}

diff --git a/static/themes/redmond-xx-se.json b/static/themes/redmond-xx-se.json index 8deab7b7..7a4a29da 100644 --- a/static/themes/redmond-xx-se.json +++ b/static/themes/redmond-xx-se.json @@ -2,6 +2,7 @@ "_pleroma_theme_version": 2, "name": "Redmond XX SE", "source": { + "themeEngineVersion": 3, "shadows": { "panel": [ { @@ -276,6 +277,7 @@ "topBar": "#000080", "topBarLink": "#ffffff", "btn": "#c0c0c0", + "btnToggled": "--btn", "faint": "#3f3f3f", "faintLink": "#404080", "border": "#808080", diff --git a/static/themes/redmond-xx.json b/static/themes/redmond-xx.json index cdb89fe3..ff95b1e0 100644 --- a/static/themes/redmond-xx.json +++ b/static/themes/redmond-xx.json @@ -2,6 +2,7 @@ "_pleroma_theme_version": 2, "name": "Redmond XX", "source": { + "themeEngineVersion": 3, "shadows": { "panel": [ { @@ -267,6 +268,7 @@ "topBar": "#000080", "topBarLink": "#ffffff", "btn": "#c0c0c0", + "btnToggled": "--btn", "faint": "#3f3f3f", "faintLink": "#404080", "border": "#808080", diff --git a/static/themes/redmond-xxi.json b/static/themes/redmond-xxi.json index 79a2cb26..f788bdb8 100644 --- a/static/themes/redmond-xxi.json +++ b/static/themes/redmond-xxi.json @@ -2,6 +2,7 @@ "_pleroma_theme_version": 2, "name": "Redmond XXI", "source": { + "themeEngineVersion": 3, "shadows": { "panel": [ { @@ -249,6 +250,7 @@ "topBar": "#042967", "topBarLink": "#ffffff", "btn": "#d6d6ce", + "btnToggled": "--btn", "faint": "#3f3f3f", "faintLink": "#404080", "border": "#808080", -- cgit v1.2.3-70-g09d2 From e6f148b8a306bc24a2fa47da468c4e29b1fcb018 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 11 Feb 2020 00:56:51 +0200 Subject: removed base16-related code --- src/services/style_setter/style_setter.js | 51 ------------------------ static/css/base16-3024.css | 33 ---------------- static/css/base16-apathy.css | 33 ---------------- static/css/base16-ashes.css | 33 ---------------- static/css/base16-atelier-cave.css | 33 ---------------- static/css/base16-atelier-dune.css | 33 ---------------- static/css/base16-atelier-estuary.css | 33 ---------------- static/css/base16-atelier-forest.css | 33 ---------------- static/css/base16-atelier-heath.css | 33 ---------------- static/css/base16-atelier-lakeside.css | 33 ---------------- static/css/base16-atelier-plateau.css | 33 ---------------- static/css/base16-atelier-savanna.css | 33 ---------------- static/css/base16-atelier-seaside.css | 33 ---------------- static/css/base16-atelier-sulphurpool.css | 33 ---------------- static/css/base16-bespin.css | 33 ---------------- static/css/base16-brewer.css | 33 ---------------- static/css/base16-bright.css | 33 ---------------- static/css/base16-chalk.css | 33 ---------------- static/css/base16-codeschool.css | 33 ---------------- static/css/base16-darktooth.css | 33 ---------------- static/css/base16-default-dark.css | 33 ---------------- static/css/base16-default-light.css | 33 ---------------- static/css/base16-eighties.css | 33 ---------------- static/css/base16-embers.css | 33 ---------------- static/css/base16-flat.css | 33 ---------------- static/css/base16-github.css | 33 ---------------- static/css/base16-google-dark.css | 33 ---------------- static/css/base16-google-light.css | 33 ---------------- static/css/base16-grayscale-dark.css | 33 ---------------- static/css/base16-grayscale-light.css | 33 ---------------- static/css/base16-green-screen.css | 33 ---------------- static/css/base16-harmonic16-dark.css | 33 ---------------- static/css/base16-harmonic16-light.css | 33 ---------------- static/css/base16-hopscotch.css | 33 ---------------- static/css/base16-ir-black.css | 33 ---------------- static/css/base16-isotope.css | 33 ---------------- static/css/base16-london-tube.css | 33 ---------------- static/css/base16-macintosh.css | 33 ---------------- static/css/base16-marrakesh.css | 33 ---------------- static/css/base16-materia.css | 33 ---------------- static/css/base16-mexico-light.css | 33 ---------------- static/css/base16-mocha.css | 33 ---------------- static/css/base16-monokai.css | 33 ---------------- static/css/base16-ocean.css | 33 ---------------- static/css/base16-oceanicnext.css | 33 ---------------- static/css/base16-paraiso.css | 33 ---------------- static/css/base16-phd.css | 33 ---------------- static/css/base16-pico.css | 33 ---------------- static/css/base16-pleroma-dark.css | 33 ---------------- static/css/base16-pleroma-light.css | 33 ---------------- static/css/base16-pop.css | 33 ---------------- static/css/base16-railscasts.css | 33 ---------------- static/css/base16-seti-ui.css | 33 ---------------- static/css/base16-shapeshifter.css | 33 ---------------- static/css/base16-solar-flare.css | 33 ---------------- static/css/base16-solarized-dark.css | 33 ---------------- static/css/base16-solarized-light.css | 33 ---------------- static/css/base16-spacemacs.css | 33 ---------------- static/css/base16-summerfruit-dark.css | 33 ---------------- static/css/base16-summerfruit-light.css | 33 ---------------- static/css/base16-tomorrow-night.css | 33 ---------------- static/css/base16-tomorrow.css | 33 ---------------- static/css/base16-twilight.css | 33 ---------------- static/css/base16-unikitty-dark.css | 33 ---------------- static/css/base16-unikitty-light.css | 33 ---------------- static/css/themes.json | 66 ------------------------------- 66 files changed, 2229 deletions(-) delete mode 100644 static/css/base16-3024.css delete mode 100644 static/css/base16-apathy.css delete mode 100644 static/css/base16-ashes.css delete mode 100644 static/css/base16-atelier-cave.css delete mode 100644 static/css/base16-atelier-dune.css delete mode 100644 static/css/base16-atelier-estuary.css delete mode 100644 static/css/base16-atelier-forest.css delete mode 100644 static/css/base16-atelier-heath.css delete mode 100644 static/css/base16-atelier-lakeside.css delete mode 100644 static/css/base16-atelier-plateau.css delete mode 100644 static/css/base16-atelier-savanna.css delete mode 100644 static/css/base16-atelier-seaside.css delete mode 100644 static/css/base16-atelier-sulphurpool.css delete mode 100644 static/css/base16-bespin.css delete mode 100644 static/css/base16-brewer.css delete mode 100644 static/css/base16-bright.css delete mode 100644 static/css/base16-chalk.css delete mode 100644 static/css/base16-codeschool.css delete mode 100644 static/css/base16-darktooth.css delete mode 100644 static/css/base16-default-dark.css delete mode 100644 static/css/base16-default-light.css delete mode 100644 static/css/base16-eighties.css delete mode 100644 static/css/base16-embers.css delete mode 100644 static/css/base16-flat.css delete mode 100644 static/css/base16-github.css delete mode 100644 static/css/base16-google-dark.css delete mode 100644 static/css/base16-google-light.css delete mode 100644 static/css/base16-grayscale-dark.css delete mode 100644 static/css/base16-grayscale-light.css delete mode 100644 static/css/base16-green-screen.css delete mode 100644 static/css/base16-harmonic16-dark.css delete mode 100644 static/css/base16-harmonic16-light.css delete mode 100644 static/css/base16-hopscotch.css delete mode 100644 static/css/base16-ir-black.css delete mode 100644 static/css/base16-isotope.css delete mode 100644 static/css/base16-london-tube.css delete mode 100644 static/css/base16-macintosh.css delete mode 100644 static/css/base16-marrakesh.css delete mode 100644 static/css/base16-materia.css delete mode 100644 static/css/base16-mexico-light.css delete mode 100644 static/css/base16-mocha.css delete mode 100644 static/css/base16-monokai.css delete mode 100644 static/css/base16-ocean.css delete mode 100644 static/css/base16-oceanicnext.css delete mode 100644 static/css/base16-paraiso.css delete mode 100644 static/css/base16-phd.css delete mode 100644 static/css/base16-pico.css delete mode 100644 static/css/base16-pleroma-dark.css delete mode 100644 static/css/base16-pleroma-light.css delete mode 100644 static/css/base16-pop.css delete mode 100644 static/css/base16-railscasts.css delete mode 100644 static/css/base16-seti-ui.css delete mode 100644 static/css/base16-shapeshifter.css delete mode 100644 static/css/base16-solar-flare.css delete mode 100644 static/css/base16-solarized-dark.css delete mode 100644 static/css/base16-solarized-light.css delete mode 100644 static/css/base16-spacemacs.css delete mode 100644 static/css/base16-summerfruit-dark.css delete mode 100644 static/css/base16-summerfruit-light.css delete mode 100644 static/css/base16-tomorrow-night.css delete mode 100644 static/css/base16-tomorrow.css delete mode 100644 static/css/base16-twilight.css delete mode 100644 static/css/base16-unikitty-dark.css delete mode 100644 static/css/base16-unikitty-light.css delete mode 100644 static/css/themes.json (limited to 'static') diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js index 32102152..57e3057a 100644 --- a/src/services/style_setter/style_setter.js +++ b/src/services/style_setter/style_setter.js @@ -1,58 +1,7 @@ -import { times } from 'lodash' import { convert } from 'chromatism' import { rgb2hex, hex2rgb, rgba2css, getCssColor, relativeLuminance } from '../color_convert/color_convert.js' import { getColors, computeDynamicColor } from '../theme_data/theme_data.service.js' -// While this is not used anymore right now, I left it in if we want to do custom -// styles that aren't just colors, so user can pick from a few different distinct -// styles as well as set their own colors in the future. - -export const setStyle = (href) => { - /*** - What's going on here? - I want to make it easy for admins to style this application. To have - a good set of default themes, I chose the system from base16 - (https://chriskempson.github.io/base16/) to style all elements. They - all have the base00..0F classes. So the only thing an admin needs to - do to style Pleroma is to change these colors in that one css file. - Some default things (body text color, link color) need to be set dy- - namically, so this is done here by waiting for the stylesheet to be - loaded and then creating an element with the respective classes. - - It is a bit weird, but should make life for admins somewhat easier. - ***/ - const head = document.head - const body = document.body - body.classList.add('hidden') - const cssEl = document.createElement('link') - cssEl.setAttribute('rel', 'stylesheet') - cssEl.setAttribute('href', href) - head.appendChild(cssEl) - - const setDynamic = () => { - const baseEl = document.createElement('div') - body.appendChild(baseEl) - - let colors = {} - times(16, (n) => { - const name = `base0${n.toString(16).toUpperCase()}` - baseEl.setAttribute('class', name) - const color = window.getComputedStyle(baseEl).getPropertyValue('color') - colors[name] = color - }) - - body.removeChild(baseEl) - - const styleEl = document.createElement('style') - head.appendChild(styleEl) - // const styleSheet = styleEl.sheet - - body.classList.remove('hidden') - } - - cssEl.addEventListener('load', setDynamic) -} - export const applyTheme = (input) => { const { rules } = generatePreset(input) const head = document.head diff --git a/static/css/base16-3024.css b/static/css/base16-3024.css deleted file mode 100644 index 91859e27..00000000 --- a/static/css/base16-3024.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #090300; } -.base01-background { background-color: #3a3432; } -.base02-background { background-color: #4a4543; } -.base03-background { background-color: #5c5855; } -.base04-background { background-color: #807d7c; } -.base05-background { background-color: #a5a2a2; } -.base06-background { background-color: #d6d5d4; } -.base07-background { background-color: #f7f7f7; } -.base08-background { background-color: #db2d20; } -.base09-background { background-color: #e8bbd0; } -.base0A-background { background-color: #fded02; } -.base0B-background { background-color: #01a252; } -.base0C-background { background-color: #b5e4f4; } -.base0D-background { background-color: #01a0e4; } -.base0E-background { background-color: #a16a94; } -.base0F-background { background-color: #cdab53; } - -.base00 { color: #090300; } -.base01 { color: #3a3432; } -.base02 { color: #4a4543; } -.base03 { color: #5c5855; } -.base04 { color: #807d7c; } -.base05 { color: #a5a2a2; } -.base06 { color: #d6d5d4; } -.base07 { color: #f7f7f7; } -.base08 { color: #db2d20; } -.base09 { color: #e8bbd0; } -.base0A { color: #fded02; } -.base0B { color: #01a252; } -.base0C { color: #b5e4f4; } -.base0D { color: #01a0e4; } -.base0E { color: #a16a94; } -.base0F { color: #cdab53; } diff --git a/static/css/base16-apathy.css b/static/css/base16-apathy.css deleted file mode 100644 index 2e99ba1f..00000000 --- a/static/css/base16-apathy.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #031A16; } -.base01-background { background-color: #0B342D; } -.base02-background { background-color: #184E45; } -.base03-background { background-color: #2B685E; } -.base04-background { background-color: #5F9C92; } -.base05-background { background-color: #81B5AC; } -.base06-background { background-color: #A7CEC8; } -.base07-background { background-color: #D2E7E4; } -.base08-background { background-color: #3E9688; } -.base09-background { background-color: #3E7996; } -.base0A-background { background-color: #3E4C96; } -.base0B-background { background-color: #883E96; } -.base0C-background { background-color: #963E4C; } -.base0D-background { background-color: #96883E; } -.base0E-background { background-color: #4C963E; } -.base0F-background { background-color: #3E965B; } - -.base00 { color: #031A16; } -.base01 { color: #0B342D; } -.base02 { color: #184E45; } -.base03 { color: #2B685E; } -.base04 { color: #5F9C92; } -.base05 { color: #81B5AC; } -.base06 { color: #A7CEC8; } -.base07 { color: #D2E7E4; } -.base08 { color: #3E9688; } -.base09 { color: #3E7996; } -.base0A { color: #3E4C96; } -.base0B { color: #883E96; } -.base0C { color: #963E4C; } -.base0D { color: #96883E; } -.base0E { color: #4C963E; } -.base0F { color: #3E965B; } diff --git a/static/css/base16-ashes.css b/static/css/base16-ashes.css deleted file mode 100644 index d10e1918..00000000 --- a/static/css/base16-ashes.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #1C2023; } -.base01-background { background-color: #393F45; } -.base02-background { background-color: #565E65; } -.base03-background { background-color: #747C84; } -.base04-background { background-color: #ADB3BA; } -.base05-background { background-color: #C7CCD1; } -.base06-background { background-color: #DFE2E5; } -.base07-background { background-color: #F3F4F5; } -.base08-background { background-color: #C7AE95; } -.base09-background { background-color: #C7C795; } -.base0A-background { background-color: #AEC795; } -.base0B-background { background-color: #95C7AE; } -.base0C-background { background-color: #95AEC7; } -.base0D-background { background-color: #AE95C7; } -.base0E-background { background-color: #C795AE; } -.base0F-background { background-color: #C79595; } - -.base00 { color: #1C2023; } -.base01 { color: #393F45; } -.base02 { color: #565E65; } -.base03 { color: #747C84; } -.base04 { color: #ADB3BA; } -.base05 { color: #C7CCD1; } -.base06 { color: #DFE2E5; } -.base07 { color: #F3F4F5; } -.base08 { color: #C7AE95; } -.base09 { color: #C7C795; } -.base0A { color: #AEC795; } -.base0B { color: #95C7AE; } -.base0C { color: #95AEC7; } -.base0D { color: #AE95C7; } -.base0E { color: #C795AE; } -.base0F { color: #C79595; } diff --git a/static/css/base16-atelier-cave.css b/static/css/base16-atelier-cave.css deleted file mode 100644 index 5ac17f97..00000000 --- a/static/css/base16-atelier-cave.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #19171c; } -.base01-background { background-color: #26232a; } -.base02-background { background-color: #585260; } -.base03-background { background-color: #655f6d; } -.base04-background { background-color: #7e7887; } -.base05-background { background-color: #8b8792; } -.base06-background { background-color: #e2dfe7; } -.base07-background { background-color: #efecf4; } -.base08-background { background-color: #be4678; } -.base09-background { background-color: #aa573c; } -.base0A-background { background-color: #a06e3b; } -.base0B-background { background-color: #2a9292; } -.base0C-background { background-color: #398bc6; } -.base0D-background { background-color: #576ddb; } -.base0E-background { background-color: #955ae7; } -.base0F-background { background-color: #bf40bf; } - -.base00 { color: #19171c; } -.base01 { color: #26232a; } -.base02 { color: #585260; } -.base03 { color: #655f6d; } -.base04 { color: #7e7887; } -.base05 { color: #8b8792; } -.base06 { color: #e2dfe7; } -.base07 { color: #efecf4; } -.base08 { color: #be4678; } -.base09 { color: #aa573c; } -.base0A { color: #a06e3b; } -.base0B { color: #2a9292; } -.base0C { color: #398bc6; } -.base0D { color: #576ddb; } -.base0E { color: #955ae7; } -.base0F { color: #bf40bf; } diff --git a/static/css/base16-atelier-dune.css b/static/css/base16-atelier-dune.css deleted file mode 100644 index cfb2d9a1..00000000 --- a/static/css/base16-atelier-dune.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #20201d; } -.base01-background { background-color: #292824; } -.base02-background { background-color: #6e6b5e; } -.base03-background { background-color: #7d7a68; } -.base04-background { background-color: #999580; } -.base05-background { background-color: #a6a28c; } -.base06-background { background-color: #e8e4cf; } -.base07-background { background-color: #fefbec; } -.base08-background { background-color: #d73737; } -.base09-background { background-color: #b65611; } -.base0A-background { background-color: #ae9513; } -.base0B-background { background-color: #60ac39; } -.base0C-background { background-color: #1fad83; } -.base0D-background { background-color: #6684e1; } -.base0E-background { background-color: #b854d4; } -.base0F-background { background-color: #d43552; } - -.base00 { color: #20201d; } -.base01 { color: #292824; } -.base02 { color: #6e6b5e; } -.base03 { color: #7d7a68; } -.base04 { color: #999580; } -.base05 { color: #a6a28c; } -.base06 { color: #e8e4cf; } -.base07 { color: #fefbec; } -.base08 { color: #d73737; } -.base09 { color: #b65611; } -.base0A { color: #ae9513; } -.base0B { color: #60ac39; } -.base0C { color: #1fad83; } -.base0D { color: #6684e1; } -.base0E { color: #b854d4; } -.base0F { color: #d43552; } diff --git a/static/css/base16-atelier-estuary.css b/static/css/base16-atelier-estuary.css deleted file mode 100644 index 76d82c75..00000000 --- a/static/css/base16-atelier-estuary.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #22221b; } -.base01-background { background-color: #302f27; } -.base02-background { background-color: #5f5e4e; } -.base03-background { background-color: #6c6b5a; } -.base04-background { background-color: #878573; } -.base05-background { background-color: #929181; } -.base06-background { background-color: #e7e6df; } -.base07-background { background-color: #f4f3ec; } -.base08-background { background-color: #ba6236; } -.base09-background { background-color: #ae7313; } -.base0A-background { background-color: #a5980d; } -.base0B-background { background-color: #7d9726; } -.base0C-background { background-color: #5b9d48; } -.base0D-background { background-color: #36a166; } -.base0E-background { background-color: #5f9182; } -.base0F-background { background-color: #9d6c7c; } - -.base00 { color: #22221b; } -.base01 { color: #302f27; } -.base02 { color: #5f5e4e; } -.base03 { color: #6c6b5a; } -.base04 { color: #878573; } -.base05 { color: #929181; } -.base06 { color: #e7e6df; } -.base07 { color: #f4f3ec; } -.base08 { color: #ba6236; } -.base09 { color: #ae7313; } -.base0A { color: #a5980d; } -.base0B { color: #7d9726; } -.base0C { color: #5b9d48; } -.base0D { color: #36a166; } -.base0E { color: #5f9182; } -.base0F { color: #9d6c7c; } diff --git a/static/css/base16-atelier-forest.css b/static/css/base16-atelier-forest.css deleted file mode 100644 index 8108ed8f..00000000 --- a/static/css/base16-atelier-forest.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #1b1918; } -.base01-background { background-color: #2c2421; } -.base02-background { background-color: #68615e; } -.base03-background { background-color: #766e6b; } -.base04-background { background-color: #9c9491; } -.base05-background { background-color: #a8a19f; } -.base06-background { background-color: #e6e2e0; } -.base07-background { background-color: #f1efee; } -.base08-background { background-color: #f22c40; } -.base09-background { background-color: #df5320; } -.base0A-background { background-color: #c38418; } -.base0B-background { background-color: #7b9726; } -.base0C-background { background-color: #3d97b8; } -.base0D-background { background-color: #407ee7; } -.base0E-background { background-color: #6666ea; } -.base0F-background { background-color: #c33ff3; } - -.base00 { color: #1b1918; } -.base01 { color: #2c2421; } -.base02 { color: #68615e; } -.base03 { color: #766e6b; } -.base04 { color: #9c9491; } -.base05 { color: #a8a19f; } -.base06 { color: #e6e2e0; } -.base07 { color: #f1efee; } -.base08 { color: #f22c40; } -.base09 { color: #df5320; } -.base0A { color: #c38418; } -.base0B { color: #7b9726; } -.base0C { color: #3d97b8; } -.base0D { color: #407ee7; } -.base0E { color: #6666ea; } -.base0F { color: #c33ff3; } diff --git a/static/css/base16-atelier-heath.css b/static/css/base16-atelier-heath.css deleted file mode 100644 index 8858cb80..00000000 --- a/static/css/base16-atelier-heath.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #1b181b; } -.base01-background { background-color: #292329; } -.base02-background { background-color: #695d69; } -.base03-background { background-color: #776977; } -.base04-background { background-color: #9e8f9e; } -.base05-background { background-color: #ab9bab; } -.base06-background { background-color: #d8cad8; } -.base07-background { background-color: #f7f3f7; } -.base08-background { background-color: #ca402b; } -.base09-background { background-color: #a65926; } -.base0A-background { background-color: #bb8a35; } -.base0B-background { background-color: #918b3b; } -.base0C-background { background-color: #159393; } -.base0D-background { background-color: #516aec; } -.base0E-background { background-color: #7b59c0; } -.base0F-background { background-color: #cc33cc; } - -.base00 { color: #1b181b; } -.base01 { color: #292329; } -.base02 { color: #695d69; } -.base03 { color: #776977; } -.base04 { color: #9e8f9e; } -.base05 { color: #ab9bab; } -.base06 { color: #d8cad8; } -.base07 { color: #f7f3f7; } -.base08 { color: #ca402b; } -.base09 { color: #a65926; } -.base0A { color: #bb8a35; } -.base0B { color: #918b3b; } -.base0C { color: #159393; } -.base0D { color: #516aec; } -.base0E { color: #7b59c0; } -.base0F { color: #cc33cc; } diff --git a/static/css/base16-atelier-lakeside.css b/static/css/base16-atelier-lakeside.css deleted file mode 100644 index 77d44c5f..00000000 --- a/static/css/base16-atelier-lakeside.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #161b1d; } -.base01-background { background-color: #1f292e; } -.base02-background { background-color: #516d7b; } -.base03-background { background-color: #5a7b8c; } -.base04-background { background-color: #7195a8; } -.base05-background { background-color: #7ea2b4; } -.base06-background { background-color: #c1e4f6; } -.base07-background { background-color: #ebf8ff; } -.base08-background { background-color: #d22d72; } -.base09-background { background-color: #935c25; } -.base0A-background { background-color: #8a8a0f; } -.base0B-background { background-color: #568c3b; } -.base0C-background { background-color: #2d8f6f; } -.base0D-background { background-color: #257fad; } -.base0E-background { background-color: #6b6bb8; } -.base0F-background { background-color: #b72dd2; } - -.base00 { color: #161b1d; } -.base01 { color: #1f292e; } -.base02 { color: #516d7b; } -.base03 { color: #5a7b8c; } -.base04 { color: #7195a8; } -.base05 { color: #7ea2b4; } -.base06 { color: #c1e4f6; } -.base07 { color: #ebf8ff; } -.base08 { color: #d22d72; } -.base09 { color: #935c25; } -.base0A { color: #8a8a0f; } -.base0B { color: #568c3b; } -.base0C { color: #2d8f6f; } -.base0D { color: #257fad; } -.base0E { color: #6b6bb8; } -.base0F { color: #b72dd2; } diff --git a/static/css/base16-atelier-plateau.css b/static/css/base16-atelier-plateau.css deleted file mode 100644 index a7445030..00000000 --- a/static/css/base16-atelier-plateau.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #1b1818; } -.base01-background { background-color: #292424; } -.base02-background { background-color: #585050; } -.base03-background { background-color: #655d5d; } -.base04-background { background-color: #7e7777; } -.base05-background { background-color: #8a8585; } -.base06-background { background-color: #e7dfdf; } -.base07-background { background-color: #f4ecec; } -.base08-background { background-color: #ca4949; } -.base09-background { background-color: #b45a3c; } -.base0A-background { background-color: #a06e3b; } -.base0B-background { background-color: #4b8b8b; } -.base0C-background { background-color: #5485b6; } -.base0D-background { background-color: #7272ca; } -.base0E-background { background-color: #8464c4; } -.base0F-background { background-color: #bd5187; } - -.base00 { color: #1b1818; } -.base01 { color: #292424; } -.base02 { color: #585050; } -.base03 { color: #655d5d; } -.base04 { color: #7e7777; } -.base05 { color: #8a8585; } -.base06 { color: #e7dfdf; } -.base07 { color: #f4ecec; } -.base08 { color: #ca4949; } -.base09 { color: #b45a3c; } -.base0A { color: #a06e3b; } -.base0B { color: #4b8b8b; } -.base0C { color: #5485b6; } -.base0D { color: #7272ca; } -.base0E { color: #8464c4; } -.base0F { color: #bd5187; } diff --git a/static/css/base16-atelier-savanna.css b/static/css/base16-atelier-savanna.css deleted file mode 100644 index be728d07..00000000 --- a/static/css/base16-atelier-savanna.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #171c19; } -.base01-background { background-color: #232a25; } -.base02-background { background-color: #526057; } -.base03-background { background-color: #5f6d64; } -.base04-background { background-color: #78877d; } -.base05-background { background-color: #87928a; } -.base06-background { background-color: #dfe7e2; } -.base07-background { background-color: #ecf4ee; } -.base08-background { background-color: #b16139; } -.base09-background { background-color: #9f713c; } -.base0A-background { background-color: #a07e3b; } -.base0B-background { background-color: #489963; } -.base0C-background { background-color: #1c9aa0; } -.base0D-background { background-color: #478c90; } -.base0E-background { background-color: #55859b; } -.base0F-background { background-color: #867469; } - -.base00 { color: #171c19; } -.base01 { color: #232a25; } -.base02 { color: #526057; } -.base03 { color: #5f6d64; } -.base04 { color: #78877d; } -.base05 { color: #87928a; } -.base06 { color: #dfe7e2; } -.base07 { color: #ecf4ee; } -.base08 { color: #b16139; } -.base09 { color: #9f713c; } -.base0A { color: #a07e3b; } -.base0B { color: #489963; } -.base0C { color: #1c9aa0; } -.base0D { color: #478c90; } -.base0E { color: #55859b; } -.base0F { color: #867469; } diff --git a/static/css/base16-atelier-seaside.css b/static/css/base16-atelier-seaside.css deleted file mode 100644 index 8b391466..00000000 --- a/static/css/base16-atelier-seaside.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #131513; } -.base01-background { background-color: #242924; } -.base02-background { background-color: #5e6e5e; } -.base03-background { background-color: #687d68; } -.base04-background { background-color: #809980; } -.base05-background { background-color: #8ca68c; } -.base06-background { background-color: #cfe8cf; } -.base07-background { background-color: #f4fbf4; } -.base08-background { background-color: #e6193c; } -.base09-background { background-color: #87711d; } -.base0A-background { background-color: #98981b; } -.base0B-background { background-color: #29a329; } -.base0C-background { background-color: #1999b3; } -.base0D-background { background-color: #3d62f5; } -.base0E-background { background-color: #ad2bee; } -.base0F-background { background-color: #e619c3; } - -.base00 { color: #131513; } -.base01 { color: #242924; } -.base02 { color: #5e6e5e; } -.base03 { color: #687d68; } -.base04 { color: #809980; } -.base05 { color: #8ca68c; } -.base06 { color: #cfe8cf; } -.base07 { color: #f4fbf4; } -.base08 { color: #e6193c; } -.base09 { color: #87711d; } -.base0A { color: #98981b; } -.base0B { color: #29a329; } -.base0C { color: #1999b3; } -.base0D { color: #3d62f5; } -.base0E { color: #ad2bee; } -.base0F { color: #e619c3; } diff --git a/static/css/base16-atelier-sulphurpool.css b/static/css/base16-atelier-sulphurpool.css deleted file mode 100644 index fb44d6e0..00000000 --- a/static/css/base16-atelier-sulphurpool.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #202746; } -.base01-background { background-color: #293256; } -.base02-background { background-color: #5e6687; } -.base03-background { background-color: #6b7394; } -.base04-background { background-color: #898ea4; } -.base05-background { background-color: #979db4; } -.base06-background { background-color: #dfe2f1; } -.base07-background { background-color: #f5f7ff; } -.base08-background { background-color: #c94922; } -.base09-background { background-color: #c76b29; } -.base0A-background { background-color: #c08b30; } -.base0B-background { background-color: #ac9739; } -.base0C-background { background-color: #22a2c9; } -.base0D-background { background-color: #3d8fd1; } -.base0E-background { background-color: #6679cc; } -.base0F-background { background-color: #9c637a; } - -.base00 { color: #202746; } -.base01 { color: #293256; } -.base02 { color: #5e6687; } -.base03 { color: #6b7394; } -.base04 { color: #898ea4; } -.base05 { color: #979db4; } -.base06 { color: #dfe2f1; } -.base07 { color: #f5f7ff; } -.base08 { color: #c94922; } -.base09 { color: #c76b29; } -.base0A { color: #c08b30; } -.base0B { color: #ac9739; } -.base0C { color: #22a2c9; } -.base0D { color: #3d8fd1; } -.base0E { color: #6679cc; } -.base0F { color: #9c637a; } diff --git a/static/css/base16-bespin.css b/static/css/base16-bespin.css deleted file mode 100644 index 48a9dcf7..00000000 --- a/static/css/base16-bespin.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #28211c; } -.base01-background { background-color: #36312e; } -.base02-background { background-color: #5e5d5c; } -.base03-background { background-color: #666666; } -.base04-background { background-color: #797977; } -.base05-background { background-color: #8a8986; } -.base06-background { background-color: #9d9b97; } -.base07-background { background-color: #baae9e; } -.base08-background { background-color: #cf6a4c; } -.base09-background { background-color: #cf7d34; } -.base0A-background { background-color: #f9ee98; } -.base0B-background { background-color: #54be0d; } -.base0C-background { background-color: #afc4db; } -.base0D-background { background-color: #5ea6ea; } -.base0E-background { background-color: #9b859d; } -.base0F-background { background-color: #937121; } - -.base00 { color: #28211c; } -.base01 { color: #36312e; } -.base02 { color: #5e5d5c; } -.base03 { color: #666666; } -.base04 { color: #797977; } -.base05 { color: #8a8986; } -.base06 { color: #9d9b97; } -.base07 { color: #baae9e; } -.base08 { color: #cf6a4c; } -.base09 { color: #cf7d34; } -.base0A { color: #f9ee98; } -.base0B { color: #54be0d; } -.base0C { color: #afc4db; } -.base0D { color: #5ea6ea; } -.base0E { color: #9b859d; } -.base0F { color: #937121; } diff --git a/static/css/base16-brewer.css b/static/css/base16-brewer.css deleted file mode 100644 index c88f219b..00000000 --- a/static/css/base16-brewer.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #0c0d0e; } -.base01-background { background-color: #2e2f30; } -.base02-background { background-color: #515253; } -.base03-background { background-color: #737475; } -.base04-background { background-color: #959697; } -.base05-background { background-color: #b7b8b9; } -.base06-background { background-color: #dadbdc; } -.base07-background { background-color: #fcfdfe; } -.base08-background { background-color: #e31a1c; } -.base09-background { background-color: #e6550d; } -.base0A-background { background-color: #dca060; } -.base0B-background { background-color: #31a354; } -.base0C-background { background-color: #80b1d3; } -.base0D-background { background-color: #3182bd; } -.base0E-background { background-color: #756bb1; } -.base0F-background { background-color: #b15928; } - -.base00 { color: #0c0d0e; } -.base01 { color: #2e2f30; } -.base02 { color: #515253; } -.base03 { color: #737475; } -.base04 { color: #959697; } -.base05 { color: #b7b8b9; } -.base06 { color: #dadbdc; } -.base07 { color: #fcfdfe; } -.base08 { color: #e31a1c; } -.base09 { color: #e6550d; } -.base0A { color: #dca060; } -.base0B { color: #31a354; } -.base0C { color: #80b1d3; } -.base0D { color: #3182bd; } -.base0E { color: #756bb1; } -.base0F { color: #b15928; } diff --git a/static/css/base16-bright.css b/static/css/base16-bright.css deleted file mode 100644 index c2333b8d..00000000 --- a/static/css/base16-bright.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #000000; } -.base01-background { background-color: #303030; } -.base02-background { background-color: #505050; } -.base03-background { background-color: #b0b0b0; } -.base04-background { background-color: #d0d0d0; } -.base05-background { background-color: #e0e0e0; } -.base06-background { background-color: #f5f5f5; } -.base07-background { background-color: #ffffff; } -.base08-background { background-color: #fb0120; } -.base09-background { background-color: #fc6d24; } -.base0A-background { background-color: #fda331; } -.base0B-background { background-color: #a1c659; } -.base0C-background { background-color: #76c7b7; } -.base0D-background { background-color: #6fb3d2; } -.base0E-background { background-color: #d381c3; } -.base0F-background { background-color: #be643c; } - -.base00 { color: #000000; } -.base01 { color: #303030; } -.base02 { color: #505050; } -.base03 { color: #b0b0b0; } -.base04 { color: #d0d0d0; } -.base05 { color: #e0e0e0; } -.base06 { color: #f5f5f5; } -.base07 { color: #ffffff; } -.base08 { color: #fb0120; } -.base09 { color: #fc6d24; } -.base0A { color: #fda331; } -.base0B { color: #a1c659; } -.base0C { color: #76c7b7; } -.base0D { color: #6fb3d2; } -.base0E { color: #d381c3; } -.base0F { color: #be643c; } diff --git a/static/css/base16-chalk.css b/static/css/base16-chalk.css deleted file mode 100644 index e3cb3c20..00000000 --- a/static/css/base16-chalk.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #151515; } -.base01-background { background-color: #202020; } -.base02-background { background-color: #303030; } -.base03-background { background-color: #505050; } -.base04-background { background-color: #b0b0b0; } -.base05-background { background-color: #d0d0d0; } -.base06-background { background-color: #e0e0e0; } -.base07-background { background-color: #f5f5f5; } -.base08-background { background-color: #fb9fb1; } -.base09-background { background-color: #eda987; } -.base0A-background { background-color: #ddb26f; } -.base0B-background { background-color: #acc267; } -.base0C-background { background-color: #12cfc0; } -.base0D-background { background-color: #6fc2ef; } -.base0E-background { background-color: #e1a3ee; } -.base0F-background { background-color: #deaf8f; } - -.base00 { color: #151515; } -.base01 { color: #202020; } -.base02 { color: #303030; } -.base03 { color: #505050; } -.base04 { color: #b0b0b0; } -.base05 { color: #d0d0d0; } -.base06 { color: #e0e0e0; } -.base07 { color: #f5f5f5; } -.base08 { color: #fb9fb1; } -.base09 { color: #eda987; } -.base0A { color: #ddb26f; } -.base0B { color: #acc267; } -.base0C { color: #12cfc0; } -.base0D { color: #6fc2ef; } -.base0E { color: #e1a3ee; } -.base0F { color: #deaf8f; } diff --git a/static/css/base16-codeschool.css b/static/css/base16-codeschool.css deleted file mode 100644 index 00194bbf..00000000 --- a/static/css/base16-codeschool.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #232c31; } -.base01-background { background-color: #1c3657; } -.base02-background { background-color: #2a343a; } -.base03-background { background-color: #3f4944; } -.base04-background { background-color: #84898c; } -.base05-background { background-color: #9ea7a6; } -.base06-background { background-color: #a7cfa3; } -.base07-background { background-color: #b5d8f6; } -.base08-background { background-color: #2a5491; } -.base09-background { background-color: #43820d; } -.base0A-background { background-color: #a03b1e; } -.base0B-background { background-color: #237986; } -.base0C-background { background-color: #b02f30; } -.base0D-background { background-color: #484d79; } -.base0E-background { background-color: #c59820; } -.base0F-background { background-color: #c98344; } - -.base00 { color: #232c31; } -.base01 { color: #1c3657; } -.base02 { color: #2a343a; } -.base03 { color: #3f4944; } -.base04 { color: #84898c; } -.base05 { color: #9ea7a6; } -.base06 { color: #a7cfa3; } -.base07 { color: #b5d8f6; } -.base08 { color: #2a5491; } -.base09 { color: #43820d; } -.base0A { color: #a03b1e; } -.base0B { color: #237986; } -.base0C { color: #b02f30; } -.base0D { color: #484d79; } -.base0E { color: #c59820; } -.base0F { color: #c98344; } diff --git a/static/css/base16-darktooth.css b/static/css/base16-darktooth.css deleted file mode 100644 index 53448706..00000000 --- a/static/css/base16-darktooth.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #1D2021; } -.base01-background { background-color: #32302F; } -.base02-background { background-color: #504945; } -.base03-background { background-color: #665C54; } -.base04-background { background-color: #928374; } -.base05-background { background-color: #A89984; } -.base06-background { background-color: #D5C4A1; } -.base07-background { background-color: #FDF4C1; } -.base08-background { background-color: #FB543F; } -.base09-background { background-color: #FE8625; } -.base0A-background { background-color: #FAC03B; } -.base0B-background { background-color: #95C085; } -.base0C-background { background-color: #8BA59B; } -.base0D-background { background-color: #0D6678; } -.base0E-background { background-color: #8F4673; } -.base0F-background { background-color: #A87322; } - -.base00 { color: #1D2021; } -.base01 { color: #32302F; } -.base02 { color: #504945; } -.base03 { color: #665C54; } -.base04 { color: #928374; } -.base05 { color: #A89984; } -.base06 { color: #D5C4A1; } -.base07 { color: #FDF4C1; } -.base08 { color: #FB543F; } -.base09 { color: #FE8625; } -.base0A { color: #FAC03B; } -.base0B { color: #95C085; } -.base0C { color: #8BA59B; } -.base0D { color: #0D6678; } -.base0E { color: #8F4673; } -.base0F { color: #A87322; } diff --git a/static/css/base16-default-dark.css b/static/css/base16-default-dark.css deleted file mode 100644 index 3cd7e860..00000000 --- a/static/css/base16-default-dark.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #181818; } -.base01-background { background-color: #282828; } -.base02-background { background-color: #383838; } -.base03-background { background-color: #585858; } -.base04-background { background-color: #b8b8b8; } -.base05-background { background-color: #d8d8d8; } -.base06-background { background-color: #e8e8e8; } -.base07-background { background-color: #f8f8f8; } -.base08-background { background-color: #ab4642; } -.base09-background { background-color: #dc9656; } -.base0A-background { background-color: #f7ca88; } -.base0B-background { background-color: #a1b56c; } -.base0C-background { background-color: #86c1b9; } -.base0D-background { background-color: #7cafc2; } -.base0E-background { background-color: #ba8baf; } -.base0F-background { background-color: #a16946; } - -.base00 { color: #181818; } -.base01 { color: #282828; } -.base02 { color: #383838; } -.base03 { color: #585858; } -.base04 { color: #b8b8b8; } -.base05 { color: #d8d8d8; } -.base06 { color: #e8e8e8; } -.base07 { color: #f8f8f8; } -.base08 { color: #ab4642; } -.base09 { color: #dc9656; } -.base0A { color: #f7ca88; } -.base0B { color: #a1b56c; } -.base0C { color: #86c1b9; } -.base0D { color: #7cafc2; } -.base0E { color: #ba8baf; } -.base0F { color: #a16946; } diff --git a/static/css/base16-default-light.css b/static/css/base16-default-light.css deleted file mode 100644 index 7e660c30..00000000 --- a/static/css/base16-default-light.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #f8f8f8; } -.base01-background { background-color: #e8e8e8; } -.base02-background { background-color: #d8d8d8; } -.base03-background { background-color: #b8b8b8; } -.base04-background { background-color: #585858; } -.base05-background { background-color: #383838; } -.base06-background { background-color: #282828; } -.base07-background { background-color: #181818; } -.base08-background { background-color: #ab4642; } -.base09-background { background-color: #dc9656; } -.base0A-background { background-color: #f7ca88; } -.base0B-background { background-color: #a1b56c; } -.base0C-background { background-color: #86c1b9; } -.base0D-background { background-color: #7cafc2; } -.base0E-background { background-color: #ba8baf; } -.base0F-background { background-color: #a16946; } - -.base00 { color: #f8f8f8; } -.base01 { color: #e8e8e8; } -.base02 { color: #d8d8d8; } -.base03 { color: #b8b8b8; } -.base04 { color: #585858; } -.base05 { color: #383838; } -.base06 { color: #282828; } -.base07 { color: #181818; } -.base08 { color: #ab4642; } -.base09 { color: #dc9656; } -.base0A { color: #f7ca88; } -.base0B { color: #a1b56c; } -.base0C { color: #86c1b9; } -.base0D { color: #7cafc2; } -.base0E { color: #ba8baf; } -.base0F { color: #a16946; } diff --git a/static/css/base16-eighties.css b/static/css/base16-eighties.css deleted file mode 100644 index 8ffcf04d..00000000 --- a/static/css/base16-eighties.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #2d2d2d; } -.base01-background { background-color: #393939; } -.base02-background { background-color: #515151; } -.base03-background { background-color: #747369; } -.base04-background { background-color: #a09f93; } -.base05-background { background-color: #d3d0c8; } -.base06-background { background-color: #e8e6df; } -.base07-background { background-color: #f2f0ec; } -.base08-background { background-color: #f2777a; } -.base09-background { background-color: #f99157; } -.base0A-background { background-color: #ffcc66; } -.base0B-background { background-color: #99cc99; } -.base0C-background { background-color: #66cccc; } -.base0D-background { background-color: #6699cc; } -.base0E-background { background-color: #cc99cc; } -.base0F-background { background-color: #d27b53; } - -.base00 { color: #2d2d2d; } -.base01 { color: #393939; } -.base02 { color: #515151; } -.base03 { color: #747369; } -.base04 { color: #a09f93; } -.base05 { color: #d3d0c8; } -.base06 { color: #e8e6df; } -.base07 { color: #f2f0ec; } -.base08 { color: #f2777a; } -.base09 { color: #f99157; } -.base0A { color: #ffcc66; } -.base0B { color: #99cc99; } -.base0C { color: #66cccc; } -.base0D { color: #6699cc; } -.base0E { color: #cc99cc; } -.base0F { color: #d27b53; } diff --git a/static/css/base16-embers.css b/static/css/base16-embers.css deleted file mode 100644 index 74e9b769..00000000 --- a/static/css/base16-embers.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #16130F; } -.base01-background { background-color: #2C2620; } -.base02-background { background-color: #433B32; } -.base03-background { background-color: #5A5047; } -.base04-background { background-color: #8A8075; } -.base05-background { background-color: #A39A90; } -.base06-background { background-color: #BEB6AE; } -.base07-background { background-color: #DBD6D1; } -.base08-background { background-color: #826D57; } -.base09-background { background-color: #828257; } -.base0A-background { background-color: #6D8257; } -.base0B-background { background-color: #57826D; } -.base0C-background { background-color: #576D82; } -.base0D-background { background-color: #6D5782; } -.base0E-background { background-color: #82576D; } -.base0F-background { background-color: #825757; } - -.base00 { color: #16130F; } -.base01 { color: #2C2620; } -.base02 { color: #433B32; } -.base03 { color: #5A5047; } -.base04 { color: #8A8075; } -.base05 { color: #A39A90; } -.base06 { color: #BEB6AE; } -.base07 { color: #DBD6D1; } -.base08 { color: #826D57; } -.base09 { color: #828257; } -.base0A { color: #6D8257; } -.base0B { color: #57826D; } -.base0C { color: #576D82; } -.base0D { color: #6D5782; } -.base0E { color: #82576D; } -.base0F { color: #825757; } diff --git a/static/css/base16-flat.css b/static/css/base16-flat.css deleted file mode 100644 index 72918a5d..00000000 --- a/static/css/base16-flat.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #2C3E50; } -.base01-background { background-color: #34495E; } -.base02-background { background-color: #7F8C8D; } -.base03-background { background-color: #95A5A6; } -.base04-background { background-color: #BDC3C7; } -.base05-background { background-color: #e0e0e0; } -.base06-background { background-color: #f5f5f5; } -.base07-background { background-color: #ECF0F1; } -.base08-background { background-color: #E74C3C; } -.base09-background { background-color: #E67E22; } -.base0A-background { background-color: #F1C40F; } -.base0B-background { background-color: #2ECC71; } -.base0C-background { background-color: #1ABC9C; } -.base0D-background { background-color: #3498DB; } -.base0E-background { background-color: #9B59B6; } -.base0F-background { background-color: #be643c; } - -.base00 { color: #2C3E50; } -.base01 { color: #34495E; } -.base02 { color: #7F8C8D; } -.base03 { color: #95A5A6; } -.base04 { color: #BDC3C7; } -.base05 { color: #e0e0e0; } -.base06 { color: #f5f5f5; } -.base07 { color: #ECF0F1; } -.base08 { color: #E74C3C; } -.base09 { color: #E67E22; } -.base0A { color: #F1C40F; } -.base0B { color: #2ECC71; } -.base0C { color: #1ABC9C; } -.base0D { color: #3498DB; } -.base0E { color: #9B59B6; } -.base0F { color: #be643c; } diff --git a/static/css/base16-github.css b/static/css/base16-github.css deleted file mode 100644 index 080ed34c..00000000 --- a/static/css/base16-github.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #ffffff; } -.base01-background { background-color: #f5f5f5; } -.base02-background { background-color: #c8c8fa; } -.base03-background { background-color: #969896; } -.base04-background { background-color: #e8e8e8; } -.base05-background { background-color: #333333; } -.base06-background { background-color: #ffffff; } -.base07-background { background-color: #ffffff; } -.base08-background { background-color: #ed6a43; } -.base09-background { background-color: #0086b3; } -.base0A-background { background-color: #795da3; } -.base0B-background { background-color: #183691; } -.base0C-background { background-color: #183691; } -.base0D-background { background-color: #795da3; } -.base0E-background { background-color: #a71d5d; } -.base0F-background { background-color: #333333; } - -.base00 { color: #ffffff; } -.base01 { color: #f5f5f5; } -.base02 { color: #c8c8fa; } -.base03 { color: #969896; } -.base04 { color: #e8e8e8; } -.base05 { color: #333333; } -.base06 { color: #ffffff; } -.base07 { color: #ffffff; } -.base08 { color: #ed6a43; } -.base09 { color: #0086b3; } -.base0A { color: #795da3; } -.base0B { color: #183691; } -.base0C { color: #183691; } -.base0D { color: #795da3; } -.base0E { color: #a71d5d; } -.base0F { color: #333333; } diff --git a/static/css/base16-google-dark.css b/static/css/base16-google-dark.css deleted file mode 100644 index 988eac51..00000000 --- a/static/css/base16-google-dark.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #1d1f21; } -.base01-background { background-color: #282a2e; } -.base02-background { background-color: #373b41; } -.base03-background { background-color: #969896; } -.base04-background { background-color: #b4b7b4; } -.base05-background { background-color: #c5c8c6; } -.base06-background { background-color: #e0e0e0; } -.base07-background { background-color: #ffffff; } -.base08-background { background-color: #CC342B; } -.base09-background { background-color: #F96A38; } -.base0A-background { background-color: #FBA922; } -.base0B-background { background-color: #198844; } -.base0C-background { background-color: #3971ED; } -.base0D-background { background-color: #3971ED; } -.base0E-background { background-color: #A36AC7; } -.base0F-background { background-color: #3971ED; } - -.base00 { color: #1d1f21; } -.base01 { color: #282a2e; } -.base02 { color: #373b41; } -.base03 { color: #969896; } -.base04 { color: #b4b7b4; } -.base05 { color: #c5c8c6; } -.base06 { color: #e0e0e0; } -.base07 { color: #ffffff; } -.base08 { color: #CC342B; } -.base09 { color: #F96A38; } -.base0A { color: #FBA922; } -.base0B { color: #198844; } -.base0C { color: #3971ED; } -.base0D { color: #3971ED; } -.base0E { color: #A36AC7; } -.base0F { color: #3971ED; } diff --git a/static/css/base16-google-light.css b/static/css/base16-google-light.css deleted file mode 100644 index 2ee2a606..00000000 --- a/static/css/base16-google-light.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #ffffff; } -.base01-background { background-color: #e0e0e0; } -.base02-background { background-color: #c5c8c6; } -.base03-background { background-color: #b4b7b4; } -.base04-background { background-color: #969896; } -.base05-background { background-color: #373b41; } -.base06-background { background-color: #282a2e; } -.base07-background { background-color: #1d1f21; } -.base08-background { background-color: #CC342B; } -.base09-background { background-color: #F96A38; } -.base0A-background { background-color: #FBA922; } -.base0B-background { background-color: #198844; } -.base0C-background { background-color: #3971ED; } -.base0D-background { background-color: #3971ED; } -.base0E-background { background-color: #A36AC7; } -.base0F-background { background-color: #3971ED; } - -.base00 { color: #ffffff; } -.base01 { color: #e0e0e0; } -.base02 { color: #c5c8c6; } -.base03 { color: #b4b7b4; } -.base04 { color: #969896; } -.base05 { color: #373b41; } -.base06 { color: #282a2e; } -.base07 { color: #1d1f21; } -.base08 { color: #CC342B; } -.base09 { color: #F96A38; } -.base0A { color: #FBA922; } -.base0B { color: #198844; } -.base0C { color: #3971ED; } -.base0D { color: #3971ED; } -.base0E { color: #A36AC7; } -.base0F { color: #3971ED; } diff --git a/static/css/base16-grayscale-dark.css b/static/css/base16-grayscale-dark.css deleted file mode 100644 index dc0dd03a..00000000 --- a/static/css/base16-grayscale-dark.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #101010; } -.base01-background { background-color: #252525; } -.base02-background { background-color: #464646; } -.base03-background { background-color: #525252; } -.base04-background { background-color: #ababab; } -.base05-background { background-color: #b9b9b9; } -.base06-background { background-color: #e3e3e3; } -.base07-background { background-color: #f7f7f7; } -.base08-background { background-color: #7c7c7c; } -.base09-background { background-color: #999999; } -.base0A-background { background-color: #a0a0a0; } -.base0B-background { background-color: #8e8e8e; } -.base0C-background { background-color: #868686; } -.base0D-background { background-color: #686868; } -.base0E-background { background-color: #747474; } -.base0F-background { background-color: #5e5e5e; } - -.base00 { color: #101010; } -.base01 { color: #252525; } -.base02 { color: #464646; } -.base03 { color: #525252; } -.base04 { color: #ababab; } -.base05 { color: #b9b9b9; } -.base06 { color: #e3e3e3; } -.base07 { color: #f7f7f7; } -.base08 { color: #7c7c7c; } -.base09 { color: #999999; } -.base0A { color: #a0a0a0; } -.base0B { color: #8e8e8e; } -.base0C { color: #868686; } -.base0D { color: #686868; } -.base0E { color: #747474; } -.base0F { color: #5e5e5e; } diff --git a/static/css/base16-grayscale-light.css b/static/css/base16-grayscale-light.css deleted file mode 100644 index f9fd213a..00000000 --- a/static/css/base16-grayscale-light.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #f7f7f7; } -.base01-background { background-color: #e3e3e3; } -.base02-background { background-color: #b9b9b9; } -.base03-background { background-color: #ababab; } -.base04-background { background-color: #525252; } -.base05-background { background-color: #464646; } -.base06-background { background-color: #252525; } -.base07-background { background-color: #101010; } -.base08-background { background-color: #7c7c7c; } -.base09-background { background-color: #999999; } -.base0A-background { background-color: #a0a0a0; } -.base0B-background { background-color: #8e8e8e; } -.base0C-background { background-color: #868686; } -.base0D-background { background-color: #686868; } -.base0E-background { background-color: #747474; } -.base0F-background { background-color: #5e5e5e; } - -.base00 { color: #f7f7f7; } -.base01 { color: #e3e3e3; } -.base02 { color: #b9b9b9; } -.base03 { color: #ababab; } -.base04 { color: #525252; } -.base05 { color: #464646; } -.base06 { color: #252525; } -.base07 { color: #101010; } -.base08 { color: #7c7c7c; } -.base09 { color: #999999; } -.base0A { color: #a0a0a0; } -.base0B { color: #8e8e8e; } -.base0C { color: #868686; } -.base0D { color: #686868; } -.base0E { color: #747474; } -.base0F { color: #5e5e5e; } diff --git a/static/css/base16-green-screen.css b/static/css/base16-green-screen.css deleted file mode 100644 index 205efeae..00000000 --- a/static/css/base16-green-screen.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #001100; } -.base01-background { background-color: #003300; } -.base02-background { background-color: #005500; } -.base03-background { background-color: #007700; } -.base04-background { background-color: #009900; } -.base05-background { background-color: #00bb00; } -.base06-background { background-color: #00dd00; } -.base07-background { background-color: #00ff00; } -.base08-background { background-color: #007700; } -.base09-background { background-color: #009900; } -.base0A-background { background-color: #007700; } -.base0B-background { background-color: #00bb00; } -.base0C-background { background-color: #005500; } -.base0D-background { background-color: #009900; } -.base0E-background { background-color: #00bb00; } -.base0F-background { background-color: #005500; } - -.base00 { color: #001100; } -.base01 { color: #003300; } -.base02 { color: #005500; } -.base03 { color: #007700; } -.base04 { color: #009900; } -.base05 { color: #00bb00; } -.base06 { color: #00dd00; } -.base07 { color: #00ff00; } -.base08 { color: #007700; } -.base09 { color: #009900; } -.base0A { color: #007700; } -.base0B { color: #00bb00; } -.base0C { color: #005500; } -.base0D { color: #009900; } -.base0E { color: #00bb00; } -.base0F { color: #005500; } diff --git a/static/css/base16-harmonic16-dark.css b/static/css/base16-harmonic16-dark.css deleted file mode 100644 index 0c2c7ce4..00000000 --- a/static/css/base16-harmonic16-dark.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #0b1c2c; } -.base01-background { background-color: #223b54; } -.base02-background { background-color: #405c79; } -.base03-background { background-color: #627e99; } -.base04-background { background-color: #aabcce; } -.base05-background { background-color: #cbd6e2; } -.base06-background { background-color: #e5ebf1; } -.base07-background { background-color: #f7f9fb; } -.base08-background { background-color: #bf8b56; } -.base09-background { background-color: #bfbf56; } -.base0A-background { background-color: #8bbf56; } -.base0B-background { background-color: #56bf8b; } -.base0C-background { background-color: #568bbf; } -.base0D-background { background-color: #8b56bf; } -.base0E-background { background-color: #bf568b; } -.base0F-background { background-color: #bf5656; } - -.base00 { color: #0b1c2c; } -.base01 { color: #223b54; } -.base02 { color: #405c79; } -.base03 { color: #627e99; } -.base04 { color: #aabcce; } -.base05 { color: #cbd6e2; } -.base06 { color: #e5ebf1; } -.base07 { color: #f7f9fb; } -.base08 { color: #bf8b56; } -.base09 { color: #bfbf56; } -.base0A { color: #8bbf56; } -.base0B { color: #56bf8b; } -.base0C { color: #568bbf; } -.base0D { color: #8b56bf; } -.base0E { color: #bf568b; } -.base0F { color: #bf5656; } diff --git a/static/css/base16-harmonic16-light.css b/static/css/base16-harmonic16-light.css deleted file mode 100644 index 37bb7679..00000000 --- a/static/css/base16-harmonic16-light.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #f7f9fb; } -.base01-background { background-color: #e5ebf1; } -.base02-background { background-color: #cbd6e2; } -.base03-background { background-color: #aabcce; } -.base04-background { background-color: #627e99; } -.base05-background { background-color: #405c79; } -.base06-background { background-color: #223b54; } -.base07-background { background-color: #0b1c2c; } -.base08-background { background-color: #bf8b56; } -.base09-background { background-color: #bfbf56; } -.base0A-background { background-color: #8bbf56; } -.base0B-background { background-color: #56bf8b; } -.base0C-background { background-color: #568bbf; } -.base0D-background { background-color: #8b56bf; } -.base0E-background { background-color: #bf568b; } -.base0F-background { background-color: #bf5656; } - -.base00 { color: #f7f9fb; } -.base01 { color: #e5ebf1; } -.base02 { color: #cbd6e2; } -.base03 { color: #aabcce; } -.base04 { color: #627e99; } -.base05 { color: #405c79; } -.base06 { color: #223b54; } -.base07 { color: #0b1c2c; } -.base08 { color: #bf8b56; } -.base09 { color: #bfbf56; } -.base0A { color: #8bbf56; } -.base0B { color: #56bf8b; } -.base0C { color: #568bbf; } -.base0D { color: #8b56bf; } -.base0E { color: #bf568b; } -.base0F { color: #bf5656; } diff --git a/static/css/base16-hopscotch.css b/static/css/base16-hopscotch.css deleted file mode 100644 index f2ad232c..00000000 --- a/static/css/base16-hopscotch.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #322931; } -.base01-background { background-color: #433b42; } -.base02-background { background-color: #5c545b; } -.base03-background { background-color: #797379; } -.base04-background { background-color: #989498; } -.base05-background { background-color: #b9b5b8; } -.base06-background { background-color: #d5d3d5; } -.base07-background { background-color: #ffffff; } -.base08-background { background-color: #dd464c; } -.base09-background { background-color: #fd8b19; } -.base0A-background { background-color: #fdcc59; } -.base0B-background { background-color: #8fc13e; } -.base0C-background { background-color: #149b93; } -.base0D-background { background-color: #1290bf; } -.base0E-background { background-color: #c85e7c; } -.base0F-background { background-color: #b33508; } - -.base00 { color: #322931; } -.base01 { color: #433b42; } -.base02 { color: #5c545b; } -.base03 { color: #797379; } -.base04 { color: #989498; } -.base05 { color: #b9b5b8; } -.base06 { color: #d5d3d5; } -.base07 { color: #ffffff; } -.base08 { color: #dd464c; } -.base09 { color: #fd8b19; } -.base0A { color: #fdcc59; } -.base0B { color: #8fc13e; } -.base0C { color: #149b93; } -.base0D { color: #1290bf; } -.base0E { color: #c85e7c; } -.base0F { color: #b33508; } diff --git a/static/css/base16-ir-black.css b/static/css/base16-ir-black.css deleted file mode 100644 index 8d14ab9b..00000000 --- a/static/css/base16-ir-black.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #000000; } -.base01-background { background-color: #242422; } -.base02-background { background-color: #484844; } -.base03-background { background-color: #6c6c66; } -.base04-background { background-color: #918f88; } -.base05-background { background-color: #b5b3aa; } -.base06-background { background-color: #d9d7cc; } -.base07-background { background-color: #fdfbee; } -.base08-background { background-color: #ff6c60; } -.base09-background { background-color: #e9c062; } -.base0A-background { background-color: #ffffb6; } -.base0B-background { background-color: #a8ff60; } -.base0C-background { background-color: #c6c5fe; } -.base0D-background { background-color: #96cbfe; } -.base0E-background { background-color: #ff73fd; } -.base0F-background { background-color: #b18a3d; } - -.base00 { color: #000000; } -.base01 { color: #242422; } -.base02 { color: #484844; } -.base03 { color: #6c6c66; } -.base04 { color: #918f88; } -.base05 { color: #b5b3aa; } -.base06 { color: #d9d7cc; } -.base07 { color: #fdfbee; } -.base08 { color: #ff6c60; } -.base09 { color: #e9c062; } -.base0A { color: #ffffb6; } -.base0B { color: #a8ff60; } -.base0C { color: #c6c5fe; } -.base0D { color: #96cbfe; } -.base0E { color: #ff73fd; } -.base0F { color: #b18a3d; } diff --git a/static/css/base16-isotope.css b/static/css/base16-isotope.css deleted file mode 100644 index f7a4a0b4..00000000 --- a/static/css/base16-isotope.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #000000; } -.base01-background { background-color: #404040; } -.base02-background { background-color: #606060; } -.base03-background { background-color: #808080; } -.base04-background { background-color: #c0c0c0; } -.base05-background { background-color: #d0d0d0; } -.base06-background { background-color: #e0e0e0; } -.base07-background { background-color: #ffffff; } -.base08-background { background-color: #ff0000; } -.base09-background { background-color: #ff9900; } -.base0A-background { background-color: #ff0099; } -.base0B-background { background-color: #33ff00; } -.base0C-background { background-color: #00ffff; } -.base0D-background { background-color: #0066ff; } -.base0E-background { background-color: #cc00ff; } -.base0F-background { background-color: #3300ff; } - -.base00 { color: #000000; } -.base01 { color: #404040; } -.base02 { color: #606060; } -.base03 { color: #808080; } -.base04 { color: #c0c0c0; } -.base05 { color: #d0d0d0; } -.base06 { color: #e0e0e0; } -.base07 { color: #ffffff; } -.base08 { color: #ff0000; } -.base09 { color: #ff9900; } -.base0A { color: #ff0099; } -.base0B { color: #33ff00; } -.base0C { color: #00ffff; } -.base0D { color: #0066ff; } -.base0E { color: #cc00ff; } -.base0F { color: #3300ff; } diff --git a/static/css/base16-london-tube.css b/static/css/base16-london-tube.css deleted file mode 100644 index 0537d1ad..00000000 --- a/static/css/base16-london-tube.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #231f20; } -.base01-background { background-color: #1c3f95; } -.base02-background { background-color: #5a5758; } -.base03-background { background-color: #737171; } -.base04-background { background-color: #959ca1; } -.base05-background { background-color: #d9d8d8; } -.base06-background { background-color: #e7e7e8; } -.base07-background { background-color: #ffffff; } -.base08-background { background-color: #ee2e24; } -.base09-background { background-color: #f386a1; } -.base0A-background { background-color: #ffd204; } -.base0B-background { background-color: #00853e; } -.base0C-background { background-color: #85cebc; } -.base0D-background { background-color: #009ddc; } -.base0E-background { background-color: #98005d; } -.base0F-background { background-color: #b06110; } - -.base00 { color: #231f20; } -.base01 { color: #1c3f95; } -.base02 { color: #5a5758; } -.base03 { color: #737171; } -.base04 { color: #959ca1; } -.base05 { color: #d9d8d8; } -.base06 { color: #e7e7e8; } -.base07 { color: #ffffff; } -.base08 { color: #ee2e24; } -.base09 { color: #f386a1; } -.base0A { color: #ffd204; } -.base0B { color: #00853e; } -.base0C { color: #85cebc; } -.base0D { color: #009ddc; } -.base0E { color: #98005d; } -.base0F { color: #b06110; } diff --git a/static/css/base16-macintosh.css b/static/css/base16-macintosh.css deleted file mode 100644 index d5969fec..00000000 --- a/static/css/base16-macintosh.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #000000; } -.base01-background { background-color: #404040; } -.base02-background { background-color: #404040; } -.base03-background { background-color: #808080; } -.base04-background { background-color: #808080; } -.base05-background { background-color: #c0c0c0; } -.base06-background { background-color: #c0c0c0; } -.base07-background { background-color: #ffffff; } -.base08-background { background-color: #dd0907; } -.base09-background { background-color: #ff6403; } -.base0A-background { background-color: #fbf305; } -.base0B-background { background-color: #1fb714; } -.base0C-background { background-color: #02abea; } -.base0D-background { background-color: #0000d3; } -.base0E-background { background-color: #4700a5; } -.base0F-background { background-color: #90713a; } - -.base00 { color: #000000; } -.base01 { color: #404040; } -.base02 { color: #404040; } -.base03 { color: #808080; } -.base04 { color: #808080; } -.base05 { color: #c0c0c0; } -.base06 { color: #c0c0c0; } -.base07 { color: #ffffff; } -.base08 { color: #dd0907; } -.base09 { color: #ff6403; } -.base0A { color: #fbf305; } -.base0B { color: #1fb714; } -.base0C { color: #02abea; } -.base0D { color: #0000d3; } -.base0E { color: #4700a5; } -.base0F { color: #90713a; } diff --git a/static/css/base16-marrakesh.css b/static/css/base16-marrakesh.css deleted file mode 100644 index 91f0471f..00000000 --- a/static/css/base16-marrakesh.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #201602; } -.base01-background { background-color: #302e00; } -.base02-background { background-color: #5f5b17; } -.base03-background { background-color: #6c6823; } -.base04-background { background-color: #86813b; } -.base05-background { background-color: #948e48; } -.base06-background { background-color: #ccc37a; } -.base07-background { background-color: #faf0a5; } -.base08-background { background-color: #c35359; } -.base09-background { background-color: #b36144; } -.base0A-background { background-color: #a88339; } -.base0B-background { background-color: #18974e; } -.base0C-background { background-color: #75a738; } -.base0D-background { background-color: #477ca1; } -.base0E-background { background-color: #8868b3; } -.base0F-background { background-color: #b3588e; } - -.base00 { color: #201602; } -.base01 { color: #302e00; } -.base02 { color: #5f5b17; } -.base03 { color: #6c6823; } -.base04 { color: #86813b; } -.base05 { color: #948e48; } -.base06 { color: #ccc37a; } -.base07 { color: #faf0a5; } -.base08 { color: #c35359; } -.base09 { color: #b36144; } -.base0A { color: #a88339; } -.base0B { color: #18974e; } -.base0C { color: #75a738; } -.base0D { color: #477ca1; } -.base0E { color: #8868b3; } -.base0F { color: #b3588e; } diff --git a/static/css/base16-materia.css b/static/css/base16-materia.css deleted file mode 100644 index 41d935dd..00000000 --- a/static/css/base16-materia.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #263238; } -.base01-background { background-color: #2C393F; } -.base02-background { background-color: #37474F; } -.base03-background { background-color: #707880; } -.base04-background { background-color: #C9CCD3; } -.base05-background { background-color: #CDD3DE; } -.base06-background { background-color: #D5DBE5; } -.base07-background { background-color: #FFFFFF; } -.base08-background { background-color: #EC5F67; } -.base09-background { background-color: #EA9560; } -.base0A-background { background-color: #FFCC00; } -.base0B-background { background-color: #8BD649; } -.base0C-background { background-color: #80CBC4; } -.base0D-background { background-color: #89DDFF; } -.base0E-background { background-color: #82AAFF; } -.base0F-background { background-color: #EC5F67; } - -.base00 { color: #263238; } -.base01 { color: #2C393F; } -.base02 { color: #37474F; } -.base03 { color: #707880; } -.base04 { color: #C9CCD3; } -.base05 { color: #CDD3DE; } -.base06 { color: #D5DBE5; } -.base07 { color: #FFFFFF; } -.base08 { color: #EC5F67; } -.base09 { color: #EA9560; } -.base0A { color: #FFCC00; } -.base0B { color: #8BD649; } -.base0C { color: #80CBC4; } -.base0D { color: #89DDFF; } -.base0E { color: #82AAFF; } -.base0F { color: #EC5F67; } diff --git a/static/css/base16-mexico-light.css b/static/css/base16-mexico-light.css deleted file mode 100644 index 1916c67b..00000000 --- a/static/css/base16-mexico-light.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #f8f8f8; } -.base01-background { background-color: #e8e8e8; } -.base02-background { background-color: #d8d8d8; } -.base03-background { background-color: #b8b8b8; } -.base04-background { background-color: #585858; } -.base05-background { background-color: #383838; } -.base06-background { background-color: #282828; } -.base07-background { background-color: #181818; } -.base08-background { background-color: #ab4642; } -.base09-background { background-color: #dc9656; } -.base0A-background { background-color: #f79a0e; } -.base0B-background { background-color: #538947; } -.base0C-background { background-color: #4b8093; } -.base0D-background { background-color: #7cafc2; } -.base0E-background { background-color: #96609e; } -.base0F-background { background-color: #a16946; } - -.base00 { color: #f8f8f8; } -.base01 { color: #e8e8e8; } -.base02 { color: #d8d8d8; } -.base03 { color: #b8b8b8; } -.base04 { color: #585858; } -.base05 { color: #383838; } -.base06 { color: #282828; } -.base07 { color: #181818; } -.base08 { color: #ab4642; } -.base09 { color: #dc9656; } -.base0A { color: #f79a0e; } -.base0B { color: #538947; } -.base0C { color: #4b8093; } -.base0D { color: #7cafc2; } -.base0E { color: #96609e; } -.base0F { color: #a16946; } diff --git a/static/css/base16-mocha.css b/static/css/base16-mocha.css deleted file mode 100644 index 6cb2fb58..00000000 --- a/static/css/base16-mocha.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #3B3228; } -.base01-background { background-color: #534636; } -.base02-background { background-color: #645240; } -.base03-background { background-color: #7e705a; } -.base04-background { background-color: #b8afad; } -.base05-background { background-color: #d0c8c6; } -.base06-background { background-color: #e9e1dd; } -.base07-background { background-color: #f5eeeb; } -.base08-background { background-color: #cb6077; } -.base09-background { background-color: #d28b71; } -.base0A-background { background-color: #f4bc87; } -.base0B-background { background-color: #beb55b; } -.base0C-background { background-color: #7bbda4; } -.base0D-background { background-color: #8ab3b5; } -.base0E-background { background-color: #a89bb9; } -.base0F-background { background-color: #bb9584; } - -.base00 { color: #3B3228; } -.base01 { color: #534636; } -.base02 { color: #645240; } -.base03 { color: #7e705a; } -.base04 { color: #b8afad; } -.base05 { color: #d0c8c6; } -.base06 { color: #e9e1dd; } -.base07 { color: #f5eeeb; } -.base08 { color: #cb6077; } -.base09 { color: #d28b71; } -.base0A { color: #f4bc87; } -.base0B { color: #beb55b; } -.base0C { color: #7bbda4; } -.base0D { color: #8ab3b5; } -.base0E { color: #a89bb9; } -.base0F { color: #bb9584; } diff --git a/static/css/base16-monokai.css b/static/css/base16-monokai.css deleted file mode 100644 index fc7ccf47..00000000 --- a/static/css/base16-monokai.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #272822; } -.base01-background { background-color: #383830; } -.base02-background { background-color: #49483e; } -.base03-background { background-color: #75715e; } -.base04-background { background-color: #a59f85; } -.base05-background { background-color: #f8f8f2; } -.base06-background { background-color: #f5f4f1; } -.base07-background { background-color: #f9f8f5; } -.base08-background { background-color: #f92672; } -.base09-background { background-color: #fd971f; } -.base0A-background { background-color: #f4bf75; } -.base0B-background { background-color: #a6e22e; } -.base0C-background { background-color: #a1efe4; } -.base0D-background { background-color: #66d9ef; } -.base0E-background { background-color: #ae81ff; } -.base0F-background { background-color: #cc6633; } - -.base00 { color: #272822; } -.base01 { color: #383830; } -.base02 { color: #49483e; } -.base03 { color: #75715e; } -.base04 { color: #a59f85; } -.base05 { color: #f8f8f2; } -.base06 { color: #f5f4f1; } -.base07 { color: #f9f8f5; } -.base08 { color: #f92672; } -.base09 { color: #fd971f; } -.base0A { color: #f4bf75; } -.base0B { color: #a6e22e; } -.base0C { color: #a1efe4; } -.base0D { color: #66d9ef; } -.base0E { color: #ae81ff; } -.base0F { color: #cc6633; } diff --git a/static/css/base16-ocean.css b/static/css/base16-ocean.css deleted file mode 100644 index 8622d17e..00000000 --- a/static/css/base16-ocean.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #2b303b; } -.base01-background { background-color: #343d46; } -.base02-background { background-color: #4f5b66; } -.base03-background { background-color: #65737e; } -.base04-background { background-color: #a7adba; } -.base05-background { background-color: #c0c5ce; } -.base06-background { background-color: #dfe1e8; } -.base07-background { background-color: #eff1f5; } -.base08-background { background-color: #bf616a; } -.base09-background { background-color: #d08770; } -.base0A-background { background-color: #ebcb8b; } -.base0B-background { background-color: #a3be8c; } -.base0C-background { background-color: #96b5b4; } -.base0D-background { background-color: #8fa1b3; } -.base0E-background { background-color: #b48ead; } -.base0F-background { background-color: #ab7967; } - -.base00 { color: #2b303b; } -.base01 { color: #343d46; } -.base02 { color: #4f5b66; } -.base03 { color: #65737e; } -.base04 { color: #a7adba; } -.base05 { color: #c0c5ce; } -.base06 { color: #dfe1e8; } -.base07 { color: #eff1f5; } -.base08 { color: #bf616a; } -.base09 { color: #d08770; } -.base0A { color: #ebcb8b; } -.base0B { color: #a3be8c; } -.base0C { color: #96b5b4; } -.base0D { color: #8fa1b3; } -.base0E { color: #b48ead; } -.base0F { color: #ab7967; } diff --git a/static/css/base16-oceanicnext.css b/static/css/base16-oceanicnext.css deleted file mode 100644 index df4d9ef5..00000000 --- a/static/css/base16-oceanicnext.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #1B2B34; } -.base01-background { background-color: #343D46; } -.base02-background { background-color: #4F5B66; } -.base03-background { background-color: #65737E; } -.base04-background { background-color: #A7ADBA; } -.base05-background { background-color: #C0C5CE; } -.base06-background { background-color: #CDD3DE; } -.base07-background { background-color: #D8DEE9; } -.base08-background { background-color: #EC5f67; } -.base09-background { background-color: #F99157; } -.base0A-background { background-color: #FAC863; } -.base0B-background { background-color: #99C794; } -.base0C-background { background-color: #5FB3B3; } -.base0D-background { background-color: #6699CC; } -.base0E-background { background-color: #C594C5; } -.base0F-background { background-color: #AB7967; } - -.base00 { color: #1B2B34; } -.base01 { color: #343D46; } -.base02 { color: #4F5B66; } -.base03 { color: #65737E; } -.base04 { color: #A7ADBA; } -.base05 { color: #C0C5CE; } -.base06 { color: #CDD3DE; } -.base07 { color: #D8DEE9; } -.base08 { color: #EC5f67; } -.base09 { color: #F99157; } -.base0A { color: #FAC863; } -.base0B { color: #99C794; } -.base0C { color: #5FB3B3; } -.base0D { color: #6699CC; } -.base0E { color: #C594C5; } -.base0F { color: #AB7967; } diff --git a/static/css/base16-paraiso.css b/static/css/base16-paraiso.css deleted file mode 100644 index b68c9407..00000000 --- a/static/css/base16-paraiso.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #2f1e2e; } -.base01-background { background-color: #41323f; } -.base02-background { background-color: #4f424c; } -.base03-background { background-color: #776e71; } -.base04-background { background-color: #8d8687; } -.base05-background { background-color: #a39e9b; } -.base06-background { background-color: #b9b6b0; } -.base07-background { background-color: #e7e9db; } -.base08-background { background-color: #ef6155; } -.base09-background { background-color: #f99b15; } -.base0A-background { background-color: #fec418; } -.base0B-background { background-color: #48b685; } -.base0C-background { background-color: #5bc4bf; } -.base0D-background { background-color: #06b6ef; } -.base0E-background { background-color: #815ba4; } -.base0F-background { background-color: #e96ba8; } - -.base00 { color: #2f1e2e; } -.base01 { color: #41323f; } -.base02 { color: #4f424c; } -.base03 { color: #776e71; } -.base04 { color: #8d8687; } -.base05 { color: #a39e9b; } -.base06 { color: #b9b6b0; } -.base07 { color: #e7e9db; } -.base08 { color: #ef6155; } -.base09 { color: #f99b15; } -.base0A { color: #fec418; } -.base0B { color: #48b685; } -.base0C { color: #5bc4bf; } -.base0D { color: #06b6ef; } -.base0E { color: #815ba4; } -.base0F { color: #e96ba8; } diff --git a/static/css/base16-phd.css b/static/css/base16-phd.css deleted file mode 100644 index 54276ab1..00000000 --- a/static/css/base16-phd.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #061229; } -.base01-background { background-color: #2a3448; } -.base02-background { background-color: #4d5666; } -.base03-background { background-color: #717885; } -.base04-background { background-color: #9a99a3; } -.base05-background { background-color: #b8bbc2; } -.base06-background { background-color: #dbdde0; } -.base07-background { background-color: #ffffff; } -.base08-background { background-color: #d07346; } -.base09-background { background-color: #f0a000; } -.base0A-background { background-color: #fbd461; } -.base0B-background { background-color: #99bf52; } -.base0C-background { background-color: #72b9bf; } -.base0D-background { background-color: #5299bf; } -.base0E-background { background-color: #9989cc; } -.base0F-background { background-color: #b08060; } - -.base00 { color: #061229; } -.base01 { color: #2a3448; } -.base02 { color: #4d5666; } -.base03 { color: #717885; } -.base04 { color: #9a99a3; } -.base05 { color: #b8bbc2; } -.base06 { color: #dbdde0; } -.base07 { color: #ffffff; } -.base08 { color: #d07346; } -.base09 { color: #f0a000; } -.base0A { color: #fbd461; } -.base0B { color: #99bf52; } -.base0C { color: #72b9bf; } -.base0D { color: #5299bf; } -.base0E { color: #9989cc; } -.base0F { color: #b08060; } diff --git a/static/css/base16-pico.css b/static/css/base16-pico.css deleted file mode 100644 index 86482b72..00000000 --- a/static/css/base16-pico.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #000000; } -.base01-background { background-color: #1d2b53; } -.base02-background { background-color: #7e2553; } -.base03-background { background-color: #008751; } -.base04-background { background-color: #ab5236; } -.base05-background { background-color: #5f574f; } -.base06-background { background-color: #c2c3c7; } -.base07-background { background-color: #fff1e8; } -.base08-background { background-color: #ff004d; } -.base09-background { background-color: #ffa300; } -.base0A-background { background-color: #fff024; } -.base0B-background { background-color: #00e756; } -.base0C-background { background-color: #29adff; } -.base0D-background { background-color: #83769c; } -.base0E-background { background-color: #ff77a8; } -.base0F-background { background-color: #ffccaa; } - -.base00 { color: #000000; } -.base01 { color: #1d2b53; } -.base02 { color: #7e2553; } -.base03 { color: #008751; } -.base04 { color: #ab5236; } -.base05 { color: #5f574f; } -.base06 { color: #c2c3c7; } -.base07 { color: #fff1e8; } -.base08 { color: #ff004d; } -.base09 { color: #ffa300; } -.base0A { color: #fff024; } -.base0B { color: #00e756; } -.base0C { color: #29adff; } -.base0D { color: #83769c; } -.base0E { color: #ff77a8; } -.base0F { color: #ffccaa; } diff --git a/static/css/base16-pleroma-dark.css b/static/css/base16-pleroma-dark.css deleted file mode 100644 index e1d46f92..00000000 --- a/static/css/base16-pleroma-dark.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #161c20; } -.base01-background { background-color: #282e32; } -.base02-background { background-color: #343a3f; } -.base03-background { background-color: #4e5256; } -.base04-background { background-color: #ababab; } -.base05-background { background-color: #b9b9b9; } -.base06-background { background-color: #d0d0d0; } -.base07-background { background-color: #e7e7e7; } -.base08-background { background-color: #baaa9c; } -.base09-background { background-color: #999999; } -.base0A-background { background-color: #a0a0a0; } -.base0B-background { background-color: #8e8e8e; } -.base0C-background { background-color: #868686; } -.base0D-background { background-color: #686868; } -.base0E-background { background-color: #747474; } -.base0F-background { background-color: #5e5e5e; } - -.base00 { color: #161c20; } -.base01 { color: #282e32; } -.base02 { color: #343a3f; } -.base03 { color: #4e5256; } -.base04 { color: #ababab; } -.base05 { color: #b9b9b9; } -.base06 { color: #d0d0d0; } -.base07 { color: #e7e7e7; } -.base08 { color: #baaa9c; } -.base09 { color: #999999; } -.base0A { color: #a0a0a0; } -.base0B { color: #8e8e8e; } -.base0C { color: #868686; } -.base0D { color: #686868; } -.base0E { color: #747474; } -.base0F { color: #5e5e5e; } diff --git a/static/css/base16-pleroma-light.css b/static/css/base16-pleroma-light.css deleted file mode 100644 index 1a85689a..00000000 --- a/static/css/base16-pleroma-light.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #f2f4f6; } -.base01-background { background-color: #dde2e6; } -.base02-background { background-color: #c0c6cb; } -.base03-background { background-color: #a4a4a4; } -.base04-background { background-color: #545454; } -.base05-background { background-color: #304055; } -.base06-background { background-color: #040404; } -.base07-background { background-color: #000000; } -.base08-background { background-color: #e92f2f; } -.base09-background { background-color: #e09448; } -.base0A-background { background-color: #dddd13; } -.base0B-background { background-color: #0ed839; } -.base0C-background { background-color: #23edda; } -.base0D-background { background-color: #3b48e3; } -.base0E-background { background-color: #f996e2; } -.base0F-background { background-color: #69542d; } - -.base00 { color: #f2f4f6; } -.base01 { color: #dde2e6; } -.base02 { color: #c0c6cb; } -.base03 { color: #a4a4a4; } -.base04 { color: #545454; } -.base05 { color: #304055; } -.base06 { color: #040404; } -.base07 { color: #000000; } -.base08 { color: #e46f0f; } -.base09 { color: #e09448; } -.base0A { color: #dddd13; } -.base0B { color: #0ed839; } -.base0C { color: #23edda; } -.base0D { color: #3b48e3; } -.base0E { color: #f996e2; } -.base0F { color: #69542d; } diff --git a/static/css/base16-pop.css b/static/css/base16-pop.css deleted file mode 100644 index 14acac17..00000000 --- a/static/css/base16-pop.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #000000; } -.base01-background { background-color: #202020; } -.base02-background { background-color: #303030; } -.base03-background { background-color: #505050; } -.base04-background { background-color: #b0b0b0; } -.base05-background { background-color: #d0d0d0; } -.base06-background { background-color: #e0e0e0; } -.base07-background { background-color: #ffffff; } -.base08-background { background-color: #eb008a; } -.base09-background { background-color: #f29333; } -.base0A-background { background-color: #f8ca12; } -.base0B-background { background-color: #37b349; } -.base0C-background { background-color: #00aabb; } -.base0D-background { background-color: #0e5a94; } -.base0E-background { background-color: #b31e8d; } -.base0F-background { background-color: #7a2d00; } - -.base00 { color: #000000; } -.base01 { color: #202020; } -.base02 { color: #303030; } -.base03 { color: #505050; } -.base04 { color: #b0b0b0; } -.base05 { color: #d0d0d0; } -.base06 { color: #e0e0e0; } -.base07 { color: #ffffff; } -.base08 { color: #eb008a; } -.base09 { color: #f29333; } -.base0A { color: #f8ca12; } -.base0B { color: #37b349; } -.base0C { color: #00aabb; } -.base0D { color: #0e5a94; } -.base0E { color: #b31e8d; } -.base0F { color: #7a2d00; } diff --git a/static/css/base16-railscasts.css b/static/css/base16-railscasts.css deleted file mode 100644 index 18f43bfd..00000000 --- a/static/css/base16-railscasts.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #2b2b2b; } -.base01-background { background-color: #272935; } -.base02-background { background-color: #3a4055; } -.base03-background { background-color: #5a647e; } -.base04-background { background-color: #d4cfc9; } -.base05-background { background-color: #e6e1dc; } -.base06-background { background-color: #f4f1ed; } -.base07-background { background-color: #f9f7f3; } -.base08-background { background-color: #da4939; } -.base09-background { background-color: #cc7833; } -.base0A-background { background-color: #ffc66d; } -.base0B-background { background-color: #a5c261; } -.base0C-background { background-color: #519f50; } -.base0D-background { background-color: #6d9cbe; } -.base0E-background { background-color: #b6b3eb; } -.base0F-background { background-color: #bc9458; } - -.base00 { color: #2b2b2b; } -.base01 { color: #272935; } -.base02 { color: #3a4055; } -.base03 { color: #5a647e; } -.base04 { color: #d4cfc9; } -.base05 { color: #e6e1dc; } -.base06 { color: #f4f1ed; } -.base07 { color: #f9f7f3; } -.base08 { color: #da4939; } -.base09 { color: #cc7833; } -.base0A { color: #ffc66d; } -.base0B { color: #a5c261; } -.base0C { color: #519f50; } -.base0D { color: #6d9cbe; } -.base0E { color: #b6b3eb; } -.base0F { color: #bc9458; } diff --git a/static/css/base16-seti-ui.css b/static/css/base16-seti-ui.css deleted file mode 100644 index bd4f9cc4..00000000 --- a/static/css/base16-seti-ui.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #151718; } -.base01-background { background-color: #8ec43d; } -.base02-background { background-color: #3B758C; } -.base03-background { background-color: #41535B; } -.base04-background { background-color: #43a5d5; } -.base05-background { background-color: #d6d6d6; } -.base06-background { background-color: #eeeeee; } -.base07-background { background-color: #ffffff; } -.base08-background { background-color: #Cd3f45; } -.base09-background { background-color: #db7b55; } -.base0A-background { background-color: #e6cd69; } -.base0B-background { background-color: #9fca56; } -.base0C-background { background-color: #55dbbe; } -.base0D-background { background-color: #55b5db; } -.base0E-background { background-color: #a074c4; } -.base0F-background { background-color: #8a553f; } - -.base00 { color: #151718; } -.base01 { color: #8ec43d; } -.base02 { color: #3B758C; } -.base03 { color: #41535B; } -.base04 { color: #43a5d5; } -.base05 { color: #d6d6d6; } -.base06 { color: #eeeeee; } -.base07 { color: #ffffff; } -.base08 { color: #Cd3f45; } -.base09 { color: #db7b55; } -.base0A { color: #e6cd69; } -.base0B { color: #9fca56; } -.base0C { color: #55dbbe; } -.base0D { color: #55b5db; } -.base0E { color: #a074c4; } -.base0F { color: #8a553f; } diff --git a/static/css/base16-shapeshifter.css b/static/css/base16-shapeshifter.css deleted file mode 100644 index ded18069..00000000 --- a/static/css/base16-shapeshifter.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #f9f9f9; } -.base01-background { background-color: #e0e0e0; } -.base02-background { background-color: #ababab; } -.base03-background { background-color: #555555; } -.base04-background { background-color: #343434; } -.base05-background { background-color: #102015; } -.base06-background { background-color: #040404; } -.base07-background { background-color: #000000; } -.base08-background { background-color: #e92f2f; } -.base09-background { background-color: #e09448; } -.base0A-background { background-color: #dddd13; } -.base0B-background { background-color: #0ed839; } -.base0C-background { background-color: #23edda; } -.base0D-background { background-color: #3b48e3; } -.base0E-background { background-color: #f996e2; } -.base0F-background { background-color: #69542d; } - -.base00 { color: #f9f9f9; } -.base01 { color: #e0e0e0; } -.base02 { color: #ababab; } -.base03 { color: #555555; } -.base04 { color: #343434; } -.base05 { color: #102015; } -.base06 { color: #040404; } -.base07 { color: #000000; } -.base08 { color: #e92f2f; } -.base09 { color: #e09448; } -.base0A { color: #dddd13; } -.base0B { color: #0ed839; } -.base0C { color: #23edda; } -.base0D { color: #3b48e3; } -.base0E { color: #f996e2; } -.base0F { color: #69542d; } diff --git a/static/css/base16-solar-flare.css b/static/css/base16-solar-flare.css deleted file mode 100644 index 7d1d3862..00000000 --- a/static/css/base16-solar-flare.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #18262F; } -.base01-background { background-color: #222E38; } -.base02-background { background-color: #586875; } -.base03-background { background-color: #667581; } -.base04-background { background-color: #85939E; } -.base05-background { background-color: #A6AFB8; } -.base06-background { background-color: #E8E9ED; } -.base07-background { background-color: #F5F7FA; } -.base08-background { background-color: #EF5253; } -.base09-background { background-color: #E66B2B; } -.base0A-background { background-color: #E4B51C; } -.base0B-background { background-color: #7CC844; } -.base0C-background { background-color: #52CBB0; } -.base0D-background { background-color: #33B5E1; } -.base0E-background { background-color: #A363D5; } -.base0F-background { background-color: #D73C9A; } - -.base00 { color: #18262F; } -.base01 { color: #222E38; } -.base02 { color: #586875; } -.base03 { color: #667581; } -.base04 { color: #85939E; } -.base05 { color: #A6AFB8; } -.base06 { color: #E8E9ED; } -.base07 { color: #F5F7FA; } -.base08 { color: #EF5253; } -.base09 { color: #E66B2B; } -.base0A { color: #E4B51C; } -.base0B { color: #7CC844; } -.base0C { color: #52CBB0; } -.base0D { color: #33B5E1; } -.base0E { color: #A363D5; } -.base0F { color: #D73C9A; } diff --git a/static/css/base16-solarized-dark.css b/static/css/base16-solarized-dark.css deleted file mode 100644 index ac16f12c..00000000 --- a/static/css/base16-solarized-dark.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #002b36; } -.base01-background { background-color: #073642; } -.base02-background { background-color: #586e75; } -.base03-background { background-color: #657b83; } -.base04-background { background-color: #839496; } -.base05-background { background-color: #93a1a1; } -.base06-background { background-color: #eee8d5; } -.base07-background { background-color: #fdf6e3; } -.base08-background { background-color: #dc322f; } -.base09-background { background-color: #cb4b16; } -.base0A-background { background-color: #b58900; } -.base0B-background { background-color: #859900; } -.base0C-background { background-color: #2aa198; } -.base0D-background { background-color: #268bd2; } -.base0E-background { background-color: #6c71c4; } -.base0F-background { background-color: #d33682; } - -.base00 { color: #002b36; } -.base01 { color: #073642; } -.base02 { color: #586e75; } -.base03 { color: #657b83; } -.base04 { color: #839496; } -.base05 { color: #93a1a1; } -.base06 { color: #eee8d5; } -.base07 { color: #fdf6e3; } -.base08 { color: #dc322f; } -.base09 { color: #cb4b16; } -.base0A { color: #b58900; } -.base0B { color: #859900; } -.base0C { color: #2aa198; } -.base0D { color: #268bd2; } -.base0E { color: #6c71c4; } -.base0F { color: #d33682; } diff --git a/static/css/base16-solarized-light.css b/static/css/base16-solarized-light.css deleted file mode 100644 index 7164cb04..00000000 --- a/static/css/base16-solarized-light.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #fdf6e3; } -.base01-background { background-color: #eee8d5; } -.base02-background { background-color: #93a1a1; } -.base03-background { background-color: #839496; } -.base04-background { background-color: #657b83; } -.base05-background { background-color: #586e75; } -.base06-background { background-color: #073642; } -.base07-background { background-color: #002b36; } -.base08-background { background-color: #dc322f; } -.base09-background { background-color: #cb4b16; } -.base0A-background { background-color: #b58900; } -.base0B-background { background-color: #859900; } -.base0C-background { background-color: #2aa198; } -.base0D-background { background-color: #268bd2; } -.base0E-background { background-color: #6c71c4; } -.base0F-background { background-color: #d33682; } - -.base00 { color: #fdf6e3; } -.base01 { color: #eee8d5; } -.base02 { color: #93a1a1; } -.base03 { color: #839496; } -.base04 { color: #657b83; } -.base05 { color: #586e75; } -.base06 { color: #073642; } -.base07 { color: #002b36; } -.base08 { color: #dc322f; } -.base09 { color: #cb4b16; } -.base0A { color: #b58900; } -.base0B { color: #859900; } -.base0C { color: #2aa198; } -.base0D { color: #268bd2; } -.base0E { color: #6c71c4; } -.base0F { color: #d33682; } diff --git a/static/css/base16-spacemacs.css b/static/css/base16-spacemacs.css deleted file mode 100644 index 48737650..00000000 --- a/static/css/base16-spacemacs.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #1f2022; } -.base01-background { background-color: #282828; } -.base02-background { background-color: #444155; } -.base03-background { background-color: #585858; } -.base04-background { background-color: #b8b8b8; } -.base05-background { background-color: #a3a3a3; } -.base06-background { background-color: #e8e8e8; } -.base07-background { background-color: #f8f8f8; } -.base08-background { background-color: #f2241f; } -.base09-background { background-color: #ffa500; } -.base0A-background { background-color: #b1951d; } -.base0B-background { background-color: #67b11d; } -.base0C-background { background-color: #2d9574; } -.base0D-background { background-color: #4f97d7; } -.base0E-background { background-color: #a31db1; } -.base0F-background { background-color: #b03060; } - -.base00 { color: #1f2022; } -.base01 { color: #282828; } -.base02 { color: #444155; } -.base03 { color: #585858; } -.base04 { color: #b8b8b8; } -.base05 { color: #a3a3a3; } -.base06 { color: #e8e8e8; } -.base07 { color: #f8f8f8; } -.base08 { color: #f2241f; } -.base09 { color: #ffa500; } -.base0A { color: #b1951d; } -.base0B { color: #67b11d; } -.base0C { color: #2d9574; } -.base0D { color: #4f97d7; } -.base0E { color: #a31db1; } -.base0F { color: #b03060; } diff --git a/static/css/base16-summerfruit-dark.css b/static/css/base16-summerfruit-dark.css deleted file mode 100644 index 1c8f2332..00000000 --- a/static/css/base16-summerfruit-dark.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #151515; } -.base01-background { background-color: #202020; } -.base02-background { background-color: #303030; } -.base03-background { background-color: #505050; } -.base04-background { background-color: #B0B0B0; } -.base05-background { background-color: #D0D0D0; } -.base06-background { background-color: #E0E0E0; } -.base07-background { background-color: #FFFFFF; } -.base08-background { background-color: #FF0086; } -.base09-background { background-color: #FD8900; } -.base0A-background { background-color: #ABA800; } -.base0B-background { background-color: #00C918; } -.base0C-background { background-color: #1FAAAA; } -.base0D-background { background-color: #3777E6; } -.base0E-background { background-color: #AD00A1; } -.base0F-background { background-color: #CC6633; } - -.base00 { color: #151515; } -.base01 { color: #202020; } -.base02 { color: #303030; } -.base03 { color: #505050; } -.base04 { color: #B0B0B0; } -.base05 { color: #D0D0D0; } -.base06 { color: #E0E0E0; } -.base07 { color: #FFFFFF; } -.base08 { color: #FF0086; } -.base09 { color: #FD8900; } -.base0A { color: #ABA800; } -.base0B { color: #00C918; } -.base0C { color: #1FAAAA; } -.base0D { color: #3777E6; } -.base0E { color: #AD00A1; } -.base0F { color: #CC6633; } diff --git a/static/css/base16-summerfruit-light.css b/static/css/base16-summerfruit-light.css deleted file mode 100644 index cb54d4c5..00000000 --- a/static/css/base16-summerfruit-light.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #FFFFFF; } -.base01-background { background-color: #E0E0E0; } -.base02-background { background-color: #D0D0D0; } -.base03-background { background-color: #B0B0B0; } -.base04-background { background-color: #000000; } -.base05-background { background-color: #101010; } -.base06-background { background-color: #151515; } -.base07-background { background-color: #202020; } -.base08-background { background-color: #FF0086; } -.base09-background { background-color: #FD8900; } -.base0A-background { background-color: #ABA800; } -.base0B-background { background-color: #00C918; } -.base0C-background { background-color: #1FAAAA; } -.base0D-background { background-color: #3777E6; } -.base0E-background { background-color: #AD00A1; } -.base0F-background { background-color: #CC6633; } - -.base00 { color: #FFFFFF; } -.base01 { color: #E0E0E0; } -.base02 { color: #D0D0D0; } -.base03 { color: #B0B0B0; } -.base04 { color: #000000; } -.base05 { color: #101010; } -.base06 { color: #151515; } -.base07 { color: #202020; } -.base08 { color: #FF0086; } -.base09 { color: #FD8900; } -.base0A { color: #ABA800; } -.base0B { color: #00C918; } -.base0C { color: #1FAAAA; } -.base0D { color: #3777E6; } -.base0E { color: #AD00A1; } -.base0F { color: #CC6633; } diff --git a/static/css/base16-tomorrow-night.css b/static/css/base16-tomorrow-night.css deleted file mode 100644 index 09ecf08e..00000000 --- a/static/css/base16-tomorrow-night.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #1d1f21; } -.base01-background { background-color: #282a2e; } -.base02-background { background-color: #373b41; } -.base03-background { background-color: #969896; } -.base04-background { background-color: #b4b7b4; } -.base05-background { background-color: #c5c8c6; } -.base06-background { background-color: #e0e0e0; } -.base07-background { background-color: #ffffff; } -.base08-background { background-color: #cc6666; } -.base09-background { background-color: #de935f; } -.base0A-background { background-color: #f0c674; } -.base0B-background { background-color: #b5bd68; } -.base0C-background { background-color: #8abeb7; } -.base0D-background { background-color: #81a2be; } -.base0E-background { background-color: #b294bb; } -.base0F-background { background-color: #a3685a; } - -.base00 { color: #1d1f21; } -.base01 { color: #282a2e; } -.base02 { color: #373b41; } -.base03 { color: #969896; } -.base04 { color: #b4b7b4; } -.base05 { color: #c5c8c6; } -.base06 { color: #e0e0e0; } -.base07 { color: #ffffff; } -.base08 { color: #cc6666; } -.base09 { color: #de935f; } -.base0A { color: #f0c674; } -.base0B { color: #b5bd68; } -.base0C { color: #8abeb7; } -.base0D { color: #81a2be; } -.base0E { color: #b294bb; } -.base0F { color: #a3685a; } diff --git a/static/css/base16-tomorrow.css b/static/css/base16-tomorrow.css deleted file mode 100644 index f1486823..00000000 --- a/static/css/base16-tomorrow.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #ffffff; } -.base01-background { background-color: #e0e0e0; } -.base02-background { background-color: #d6d6d6; } -.base03-background { background-color: #8e908c; } -.base04-background { background-color: #969896; } -.base05-background { background-color: #4d4d4c; } -.base06-background { background-color: #282a2e; } -.base07-background { background-color: #1d1f21; } -.base08-background { background-color: #c82829; } -.base09-background { background-color: #f5871f; } -.base0A-background { background-color: #eab700; } -.base0B-background { background-color: #718c00; } -.base0C-background { background-color: #3e999f; } -.base0D-background { background-color: #4271ae; } -.base0E-background { background-color: #8959a8; } -.base0F-background { background-color: #a3685a; } - -.base00 { color: #ffffff; } -.base01 { color: #e0e0e0; } -.base02 { color: #d6d6d6; } -.base03 { color: #8e908c; } -.base04 { color: #969896; } -.base05 { color: #4d4d4c; } -.base06 { color: #282a2e; } -.base07 { color: #1d1f21; } -.base08 { color: #c82829; } -.base09 { color: #f5871f; } -.base0A { color: #eab700; } -.base0B { color: #718c00; } -.base0C { color: #3e999f; } -.base0D { color: #4271ae; } -.base0E { color: #8959a8; } -.base0F { color: #a3685a; } diff --git a/static/css/base16-twilight.css b/static/css/base16-twilight.css deleted file mode 100644 index c8dfda3f..00000000 --- a/static/css/base16-twilight.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #1e1e1e; } -.base01-background { background-color: #323537; } -.base02-background { background-color: #464b50; } -.base03-background { background-color: #5f5a60; } -.base04-background { background-color: #838184; } -.base05-background { background-color: #a7a7a7; } -.base06-background { background-color: #c3c3c3; } -.base07-background { background-color: #ffffff; } -.base08-background { background-color: #cf6a4c; } -.base09-background { background-color: #cda869; } -.base0A-background { background-color: #f9ee98; } -.base0B-background { background-color: #8f9d6a; } -.base0C-background { background-color: #afc4db; } -.base0D-background { background-color: #7587a6; } -.base0E-background { background-color: #9b859d; } -.base0F-background { background-color: #9b703f; } - -.base00 { color: #1e1e1e; } -.base01 { color: #323537; } -.base02 { color: #464b50; } -.base03 { color: #5f5a60; } -.base04 { color: #838184; } -.base05 { color: #a7a7a7; } -.base06 { color: #c3c3c3; } -.base07 { color: #ffffff; } -.base08 { color: #cf6a4c; } -.base09 { color: #cda869; } -.base0A { color: #f9ee98; } -.base0B { color: #8f9d6a; } -.base0C { color: #afc4db; } -.base0D { color: #7587a6; } -.base0E { color: #9b859d; } -.base0F { color: #9b703f; } diff --git a/static/css/base16-unikitty-dark.css b/static/css/base16-unikitty-dark.css deleted file mode 100644 index e6ef32e3..00000000 --- a/static/css/base16-unikitty-dark.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #2e2a31; } -.base01-background { background-color: #4a464d; } -.base02-background { background-color: #666369; } -.base03-background { background-color: #838085; } -.base04-background { background-color: #9f9da2; } -.base05-background { background-color: #bcbabe; } -.base06-background { background-color: #d8d7da; } -.base07-background { background-color: #f5f4f7; } -.base08-background { background-color: #d8137f; } -.base09-background { background-color: #d65407; } -.base0A-background { background-color: #dc8a0e; } -.base0B-background { background-color: #17ad98; } -.base0C-background { background-color: #149bda; } -.base0D-background { background-color: #796af5; } -.base0E-background { background-color: #bb60ea; } -.base0F-background { background-color: #c720ca; } - -.base00 { color: #2e2a31; } -.base01 { color: #4a464d; } -.base02 { color: #666369; } -.base03 { color: #838085; } -.base04 { color: #9f9da2; } -.base05 { color: #bcbabe; } -.base06 { color: #d8d7da; } -.base07 { color: #f5f4f7; } -.base08 { color: #d8137f; } -.base09 { color: #d65407; } -.base0A { color: #dc8a0e; } -.base0B { color: #17ad98; } -.base0C { color: #149bda; } -.base0D { color: #796af5; } -.base0E { color: #bb60ea; } -.base0F { color: #c720ca; } diff --git a/static/css/base16-unikitty-light.css b/static/css/base16-unikitty-light.css deleted file mode 100644 index 7e4c51b7..00000000 --- a/static/css/base16-unikitty-light.css +++ /dev/null @@ -1,33 +0,0 @@ -.base00-background { background-color: #ffffff; } -.base01-background { background-color: #e1e1e2; } -.base02-background { background-color: #c4c3c5; } -.base03-background { background-color: #a7a5a8; } -.base04-background { background-color: #89878b; } -.base05-background { background-color: #6c696e; } -.base06-background { background-color: #4f4b51; } -.base07-background { background-color: #322d34; } -.base08-background { background-color: #d8137f; } -.base09-background { background-color: #d65407; } -.base0A-background { background-color: #dc8a0e; } -.base0B-background { background-color: #17ad98; } -.base0C-background { background-color: #149bda; } -.base0D-background { background-color: #775dff; } -.base0E-background { background-color: #aa17e6; } -.base0F-background { background-color: #e013d0; } - -.base00 { color: #ffffff; } -.base01 { color: #e1e1e2; } -.base02 { color: #c4c3c5; } -.base03 { color: #a7a5a8; } -.base04 { color: #89878b; } -.base05 { color: #6c696e; } -.base06 { color: #4f4b51; } -.base07 { color: #322d34; } -.base08 { color: #d8137f; } -.base09 { color: #d65407; } -.base0A { color: #dc8a0e; } -.base0B { color: #17ad98; } -.base0C { color: #149bda; } -.base0D { color: #775dff; } -.base0E { color: #aa17e6; } -.base0F { color: #e013d0; } diff --git a/static/css/themes.json b/static/css/themes.json deleted file mode 100644 index ea8e5a0c..00000000 --- a/static/css/themes.json +++ /dev/null @@ -1,66 +0,0 @@ -[ -"base16-pleroma-dark.css", -"base16-pleroma-light.css", -"base16-3024.css", -"base16-apathy.css", -"base16-ashes.css", -"base16-atelier-cave.css", -"base16-atelier-dune.css", -"base16-atelier-estuary.css", -"base16-atelier-forest.css", -"base16-atelier-heath.css", -"base16-atelier-lakeside.css", -"base16-atelier-plateau.css", -"base16-atelier-savanna.css", -"base16-atelier-seaside.css", -"base16-atelier-sulphurpool.css", -"base16-bespin.css", -"base16-brewer.css", -"base16-bright.css", -"base16-chalk.css", -"base16-codeschool.css", -"base16-darktooth.css", -"base16-default-dark.css", -"base16-default-light.css", -"base16-eighties.css", -"base16-embers.css", -"base16-flat.css", -"base16-github.css", -"base16-google-dark.css", -"base16-google-light.css", -"base16-grayscale-dark.css", -"base16-grayscale-light.css", -"base16-green-screen.css", -"base16-harmonic16-dark.css", -"base16-harmonic16-light.css", -"base16-hopscotch.css", -"base16-ir-black.css", -"base16-isotope.css", -"base16-london-tube.css", -"base16-macintosh.css", -"base16-marrakesh.css", -"base16-materia.css", -"base16-mexico-light.css", -"base16-mocha.css", -"base16-monokai.css", -"base16-ocean.css", -"base16-oceanicnext.css", -"base16-paraiso.css", -"base16-phd.css", -"base16-pico.css", -"base16-pop.css", -"base16-railscasts.css", -"base16-seti-ui.css", -"base16-shapeshifter.css", -"base16-solar-flare.css", -"base16-solarized-dark.css", -"base16-solarized-light.css", -"base16-spacemacs.css", -"base16-summerfruit-dark.css", -"base16-summerfruit-light.css", -"base16-tomorrow-night.css", -"base16-tomorrow.css", -"base16-twilight.css", -"base16-unikitty-dark.css", -"base16-unikitty-light.css" -] -- cgit v1.2.3-70-g09d2 From 60446c56a5c8d4b4d669fbd4803e77ce686daac9 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 12 Feb 2020 00:45:37 +0200 Subject: fix v2 breezy themes having messed up pressed buttons. updated v2.1 breezy themes to have derived colors instead of fixed ones. --- src/components/style_switcher/style_switcher.js | 7 +++++-- src/services/color_convert/color_convert.js | 2 -- src/services/style_setter/style_setter.js | 9 +++++---- static/themes/breezy-dark.json | 14 +++++++------- static/themes/breezy-light.json | 19 ++++++++----------- 5 files changed, 25 insertions(+), 26 deletions(-) (limited to 'static') diff --git a/src/components/style_switcher/style_switcher.js b/src/components/style_switcher/style_switcher.js index 17ae9f30..807f9efc 100644 --- a/src/components/style_switcher/style_switcher.js +++ b/src/components/style_switcher/style_switcher.js @@ -62,6 +62,7 @@ export default { selected: this.$store.getters.mergedConfig.theme, themeWarning: undefined, tempImportFile: undefined, + engineVersion: 0, previewShadows: {}, previewColors: {}, @@ -510,7 +511,7 @@ export default { colors: this.currentColors }) this.previewShadows = generateShadows( - { shadows: this.shadowsLocal }, + { shadows: this.shadowsLocal, opacity: this.previewTheme.opacity, themeEngineVersion: this.engineVersion }, this.previewColors.theme.colors, this.previewColors.mod ) @@ -607,6 +608,8 @@ export default { } } + this.engineVersion = version + // Stuff that differs between V1 and V2 if (version === 1) { this.fgColorLocal = rgb2hex(colors.btn) @@ -653,7 +656,7 @@ export default { if (!this.keepShadows) { this.clearShadows() if (version === 2) { - this.shadowsLocal = shadows2to3(shadows) + this.shadowsLocal = shadows2to3(shadows, this.previewTheme.opacity) } else { this.shadowsLocal = shadows } diff --git a/src/services/color_convert/color_convert.js b/src/services/color_convert/color_convert.js index 3b6fdcc7..ec104269 100644 --- a/src/services/color_convert/color_convert.js +++ b/src/services/color_convert/color_convert.js @@ -214,8 +214,6 @@ export const getCssColor = (input, a) => { } else if (typeof input === 'string') { if (input.startsWith('#')) { rgb = hex2rgb(input) - } else if (input.startsWith('--')) { - return `var(${input})` } else { return input } diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js index 48f51c59..c8610507 100644 --- a/src/services/style_setter/style_setter.js +++ b/src/services/style_setter/style_setter.js @@ -1,6 +1,6 @@ import { convert } from 'chromatism' import { rgb2hex, hex2rgb, rgba2css, getCssColor, relativeLuminance } from '../color_convert/color_convert.js' -import { getColors, computeDynamicColor } from '../theme_data/theme_data.service.js' +import { getColors, computeDynamicColor, getOpacitySlot } from '../theme_data/theme_data.service.js' export const applyTheme = (input) => { const { rules } = generatePreset(input) @@ -242,7 +242,7 @@ export const generateShadows = (input, colors) => { input: 'input' } const inputShadows = input.shadows && !input.themeEngineVersion - ? shadows2to3(input.shadows) + ? shadows2to3(input.shadows, input.opacity) : input.shadows || {} const shadows = Object.entries({ ...DEFAULT_SHADOWS, @@ -368,14 +368,15 @@ export const colors2to3 = (colors) => { * * Back in v2 shadows allowed you to use dynamic colors however those used pure CSS3 variables */ -export const shadows2to3 = (shadows) => { +export const shadows2to3 = (shadows, opacity) => { return Object.entries(shadows).reduce((shadowsAcc, [slotName, shadowDefs]) => { const isDynamic = ({ color }) => color.startsWith('--') + const getOpacity = ({ color }) => opacity[getOpacitySlot(color.substring(2).split(',')[0])] const newShadow = shadowDefs.reduce((shadowAcc, def) => [ ...shadowAcc, { ...def, - alpha: isDynamic(def) ? 1 : def.alpha + alpha: isDynamic(def) ? getOpacity(def) || 1 : def.alpha } ], []) return { ...shadowsAcc, [slotName]: newShadow } diff --git a/static/themes/breezy-dark.json b/static/themes/breezy-dark.json index 236b94ad..76b962c5 100644 --- a/static/themes/breezy-dark.json +++ b/static/themes/breezy-dark.json @@ -21,7 +21,7 @@ "y": "0", "blur": "0", "spread": "1", - "color": "#ffffff", + "color": "--btn,900", "alpha": "0.15", "inset": true }, @@ -42,7 +42,7 @@ "blur": "40", "spread": "-40", "inset": true, - "color": "#ffffff", + "color": "--panel,900", "alpha": "0.1" } ], @@ -72,7 +72,7 @@ "y": "0", "blur": 0, "spread": "1", - "color": "#ffffff", + "color": "--btn,900", "alpha": 0.2, "inset": true }, @@ -92,7 +92,7 @@ "y": "0", "blur": 0, "spread": "1", - "color": "#FFFFFF", + "color": "--input,900", "alpha": "0.2", "inset": true } @@ -105,9 +105,9 @@ "link": "#3daee9", "fg": "#31363b", "panel": "transparent", - "input": "#232629", - "topBarLink": "#eff0f1", - "btn": "#31363b", + "input": "--bg,-6.47", + "topBarLink": "--topBarText", + "btn": "--bg", "border": "#4c545b", "cRed": "#da4453", "cBlue": "#3daee9", diff --git a/static/themes/breezy-light.json b/static/themes/breezy-light.json index d3f74cec..0968fff0 100644 --- a/static/themes/breezy-light.json +++ b/static/themes/breezy-light.json @@ -21,7 +21,7 @@ "y": "0", "blur": "0", "spread": "1", - "color": "#000000", + "color": "--btn,900", "alpha": "0.3", "inset": true }, @@ -42,7 +42,7 @@ "blur": "40", "spread": "-40", "inset": true, - "color": "#ffffff", + "color": "--panel,900", "alpha": "0.1" } ], @@ -72,7 +72,7 @@ "y": "0", "blur": 0, "spread": "1", - "color": "#ffffff", + "color": "--btn,900", "alpha": 0.2, "inset": true }, @@ -92,7 +92,7 @@ "y": "0", "blur": 0, "spread": "1", - "color": "#000000", + "color": "--input,900", "alpha": "0.2", "inset": true } @@ -104,14 +104,11 @@ "colors": { "bg": "#eff0f1", "text": "#232627", - "fg": "#bcc2c7", + "fg": "#475057", "accent": "#2980b9", - "panel": "#475057", - "panelText": "#fcfcfc", - "input": "#fcfcfc", - "topBar": "#475057", - "topBarLink": "#eff0f1", - "btn": "#eff0f1", + "input": "--bg,-6.47", + "topBarLink": "--topBarText", + "btn": "--bg", "cRed": "#da4453", "cBlue": "#2980b9", "cGreen": "#27ae60", -- cgit v1.2.3-70-g09d2 From 1e95a0795a6f7f1db49244430d1498987f6b3969 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 17 Feb 2020 23:59:52 +0200 Subject: 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 (limited to 'static') diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js index c8610507..fbdcf562 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 54c0335f..3349a837 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 98ddf974..00000000 --- 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 00000000..a3b90a0a --- /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" + } + } +} -- cgit v1.2.3-70-g09d2