diff --git a/images/avi.png b/images/avi.png new file mode 100644 index 00000000..03984e8f Binary files /dev/null and b/images/avi.png differ diff --git a/images/banner.png b/images/banner.png new file mode 100644 index 00000000..36b7c5dd Binary files /dev/null and b/images/banner.png differ diff --git a/images/city.jpg b/images/city.jpg new file mode 100644 index 00000000..20fa7d2e Binary files /dev/null and b/images/city.jpg differ diff --git a/src/assets/nsfw.png b/src/assets/nsfw.png index e0d1fc2a..0aa96885 100644 Binary files a/src/assets/nsfw.png and b/src/assets/nsfw.png differ diff --git a/src/components/gallery/gallery.js b/src/components/gallery/gallery.js index 4e1bda55..f9310c4f 100644 --- a/src/components/gallery/gallery.js +++ b/src/components/gallery/gallery.js @@ -91,7 +91,7 @@ const Gallery = { if (row.audio) { return { 'padding-bottom': '25%' } // fixed reduced height for audio } else if (!row.minimal && !row.grid) { - return { 'padding-bottom': `${(100 / (row.items.length + 0.6))}%` } + return { 'padding-bottom': `${(100 / (row.items.length + 0.77))}%` } } }, itemStyle (id, row) { diff --git a/static/akko.png b/static/akko.png new file mode 100644 index 00000000..7174463f Binary files /dev/null and b/static/akko.png differ diff --git a/static/background.jpg b/static/background.jpg new file mode 100644 index 00000000..c9979481 Binary files /dev/null and b/static/background.jpg differ diff --git a/static/config.json b/static/config.json index b1d412e7..b56a030f 100644 --- a/static/config.json +++ b/static/config.json @@ -1,10 +1,10 @@ { "alwaysShowSubjectInput": true, - "background": "/static/aurora_borealis.jpg", - "collapseMessageWithSubject": false, - "greentext": false, - "hideFilteredStatuses": false, - "hideMutedPosts": false, + "background": "/static/background.jpg", + "collapseMessageWithSubject": true, + "greentext": true, + "hideFilteredStatuses": true, + "hideMutedPosts": true, "hidePostStats": false, "hideSitename": false, "hideUserStats": false, @@ -21,6 +21,6 @@ "showInstanceSpecificPanel": false, "sidebarRight": false, "subjectLineBehavior": "email", - "theme": "ihatebeingalive", + "theme": "witch-inn", "webPushNotifications": false } diff --git a/static/styles.json b/static/styles.json index 990cdc85..be650638 100644 --- a/static/styles.json +++ b/static/styles.json @@ -1,4 +1,5 @@ { + "witch-inn": "/static/themes/witch_inn.json", "pleroma-dark": "/static/themes/pleroma-dark.json", "pleroma-light": "/static/themes/pleroma-light.json", "pleroma-amoled": [ "Pleroma Dark AMOLED", "#000000", "#111111", "#b0b0b1", "#d8a070", "#aa0000", "#0fa00f", "#0095ff", "#d59500"], @@ -14,5 +15,6 @@ "breezy-light": "/static/themes/breezy-light.json", "ihatebeingalive": "/static/themes/ihatebeingalive.json", "paper": "/static/themes/paper.json", - "thekanata": "/static/themes/thekanata.json" + "thekanata": "/static/themes/thekanata.json", + "charred-coal": "/static/themes/charred-coal.json" } diff --git a/static/themes/charred-coal.json b/static/themes/charred-coal.json new file mode 100644 index 00000000..cbd0fffd --- /dev/null +++ b/static/themes/charred-coal.json @@ -0,0 +1,377 @@ + +{ + "_pleroma_theme_version": 2, + "name": "Charred Coal", + "theme": { + "themeEngineVersion": 3, + "shadows": { + "panel": [ + { + "x": "1", + "y": "1", + "blur": "0", + "spread": "0", + "color": "#000000", + "alpha": "0" + } + ], + "topBar": [ + { + "x": 0, + "y": "3", + "blur": "0", + "spread": "1", + "color": "#000000", + "alpha": "0.35" + } + ], + "popup": [ + { + "x": "3", + "y": "3", + "blur": "0", + "spread": "0", + "color": "#000000", + "alpha": "0" + } + ], + "avatar": [ + { + "x": 0, + "y": 1, + "blur": 8, + "spread": 0, + "color": "#000000", + "alpha": 0.7 + } + ], + "avatarStatus": [ + { + "x": 0, + "y": 0, + "blur": 0, + "spread": 0, + "inset": false, + "color": "#000000", + "alpha": "0" + } + ], + "panelHeader": [], + "button": [ + { + "x": 0, + "y": 0, + "blur": 0, + "spread": 0, + "inset": false, + "color": "#000000", + "alpha": "0" + } + ], + "buttonHover": [ + { + "x": 0, + "y": 0, + "blur": "1", + "spread": "2", + "color": "#888888", + "alpha": "0.35", + "inset": false + } + ], + "buttonPressed": [ + { + "x": 0, + "y": 0, + "blur": "1", + "spread": "2", + "color": "#888888", + "alpha": "0.1" + } + ], + "input": [ + { + "x": "0", + "y": "0", + "blur": "0", + "spread": "1", + "color": "#888888", + "alpha": "0", + "inset": true + } + ] + }, + "colors": { + "underlay": "#000000", + "bg": "#353535", + "fg": "#525252", + "cRed": "#a56969", + "cOrange": "#afae7a", + "cGreen": "#6ca569", + "cBlue": "#a4bec8", + "accent": "#ffffff", + "link": "#ffffff", + "text": "#b9b9b9", + "badgeNotification": "#a56969", + "badgeNotificationText": "#ffffff", + "panel": "#525252", + "panelText": "#ffffff", + "alertNeutral": "#b9b9b9", + "alertNeutralPanelText": "#000000", + "alertNeutralText": "#ffffff", + "alertWarning": "#afae7a", + "alertWarningPanelText": "#000000", + "alertWarningText": "#ffffff", + "alertError": "#a56969", + "alertErrorPanelText": "#ffffff", + "alertErrorText": "#ffffff", + "fgText": "#ffffff", + "topBar": "#373737", + "topBarText": "#ffffff", + "input": "#676767", + "inputTopbarText": "#ffffff", + "inputPanelText": "#ffffff", + "inputText": "#b9b9b9", + "btn": "#676767", + "btnText": "#ffffff", + "btnTopBarText": "#ffffff", + "btnDisabled": "#424242", + "btnDisabledTopBarText": "#717171", + "btnPanelText": "#ffffff", + "btnDisabledPanelText": "#717171", + "btnDisabledText": "#717171", + "btnToggled": "#9a9a9a", + "btnToggledTopBarText": "#ffffff", + "btnToggledPanelText": "#ffffff", + "btnToggledText": "#ffffff", + "btnPressed": "#676767", + "btnPressedTopBarText": "#ffffff", + "btnPressedTopBar": "#676767", + "btnPressedPanelText": "#ffffff", + "btnPressedPanel": "#676767", + "btnPressedText": "#ffffff", + "tabActiveText": "#b9b9b9", + "tabText": "#ffffff", + "tab": "#676767", + "fgLink": "#ffffff", + "topBarLink": "#b9b9b9", + "panelLink": "#ffffff", + "panelFaint": "#ffffff", + "icon": "#777777", + "poll": "#868686", + "pollText": "#000000", + "border": "#585858", + "postLink": "#ffffff", + "lightText": "#ececec", + "popover": "#353535", + "selectedMenuPopover": "#424242", + "highlight": "#424242", + "highlightText": "#b9b9b9", + "selectedMenu": "#424242", + "selectedMenuText": "#b9b9b9", + "selectedMenuPopoverIcon": "#7e7e7e", + "highlightLink": "#ffffff", + "selectedMenuLink": "#ffffff", + "selectedMenuPopoverLink": "#ffffff", + "selectedMenuPopoverText": "#b9b9b9", + "faintLink": "#ffffff", + "highlightFaintLink": "#ffffff", + "selectedMenuFaintLink": "#ffffff", + "selectedMenuPopoverFaintLink": "#ffffff", + "faint": "#b9b9b9", + "highlightFaintText": "#b9b9b9", + "selectedMenuFaintText": "#b9b9b9", + "selectedMenuPopoverFaintText": "#b9b9b9", + "highlightLightText": "#ececec", + "selectedMenuLightText": "#ececec", + "selectedMenuPopoverLightText": "#ececec", + "selectedMenuIcon": "#7e7e7e", + "selectedPost": "#424242", + "selectedPostText": "#b9b9b9", + "selectedPostIcon": "#7e7e7e", + "selectedPostLink": "#ffffff", + "selectedPostFaintLink": "#ffffff", + "highlightPostLink": "#ffffff", + "selectedPostPostLink": "#ffffff", + "selectedPostLightText": "#ececec", + "selectedPostFaintText": "#b9b9b9", + "popoverText": "#b9b9b9", + "popoverIcon": "#777777", + "popoverLink": "#ffffff", + "postFaintLink": "#ffffff", + "popoverPostFaintLink": "#ffffff", + "popoverFaintLink": "#ffffff", + "popoverFaintText": "#b9b9b9", + "popoverPostLink": "#ffffff", + "popoverLightText": "#ececec", + "highlightIcon": "#7e7e7e", + "highlightPostFaintLink": "#ffffff", + "profileTint": "#353535", + "profileBg": "#1c1d1f" + }, + "opacity": { + "underlay": 0.15, + "bg": 0.9, + "panel": 0, + "alert": 0.5, + "input": 0.35, + "btn": 0.35, + "faint": 0.5, + "border": 0, + "popover": 1, + "profileTint": 0.5 + }, + "radii": { + "btn": "0", + "input": "0", + "checkbox": "0", + "panel": "0", + "avatar": "0", + "avatarAlt": "0", + "tooltip": "0", + "attachment": "0" + }, + "fonts": { + "interface": { + "family": "sans-serif" + }, + "input": { + "family": "inherit" + }, + "post": { + "family": "inherit" + }, + "postCode": { + "family": "monospace" + } + } + }, + "source": { + "themeEngineVersion": 3, + "fonts": { + "interface": { + "family": "sans-serif" + } + }, + "shadows": { + "avatarStatus": [ + { + "x": 0, + "y": 0, + "blur": 0, + "spread": 0, + "inset": false, + "color": "#000000", + "alpha": "0" + } + ], + "button": [ + { + "x": 0, + "y": 0, + "blur": 0, + "spread": 0, + "inset": false, + "color": "#000000", + "alpha": "0" + } + ], + "buttonHover": [ + { + "x": 0, + "y": 0, + "blur": "1", + "spread": "2", + "color": "#888888", + "alpha": "0.35", + "inset": false + } + ], + "buttonPressed": [ + { + "x": 0, + "y": 0, + "blur": "1", + "spread": "2", + "color": "#888888", + "alpha": "0.1" + } + ], + "input": [ + { + "x": "0", + "y": "0", + "blur": "0", + "spread": "1", + "color": "#888888", + "alpha": "0", + "inset": true + } + ], + "panel": [ + { + "x": "1", + "y": "1", + "blur": "0", + "spread": "0", + "color": "#000000", + "alpha": "0" + } + ], + "panelHeader": [], + "popup": [ + { + "x": "3", + "y": "3", + "blur": "0", + "spread": "0", + "color": "#000000", + "alpha": "0" + } + ], + "topBar": [ + { + "x": 0, + "y": "3", + "blur": "0", + "spread": "1", + "color": "#000000", + "alpha": "0.35" + } + ] + }, + "opacity": { + "bg": "0.9", + "faint": "0.75", + "border": "0", + "panel": "0", + "btn": "0.35", + "input": "0.35" + }, + "colors": { + "bg": "#353535", + "fg": "#525252", + "text": "#b9b9b9", + "link": "#ffffff", + "cBlue": "#a4bec8", + "cRed": "#a56969", + "cGreen": "#6ca569", + "cOrange": "#afae7a", + "topBar": "#373737", + "topBarLink": "#b9b9b9", + "btn": "#676767", + "input": "#676767", + "inputText": "#b9b9b9" + }, + "radii": { + "btn": "0", + "input": "0", + "checkbox": "0", + "panel": "0", + "avatar": "0", + "avatarAlt": "0", + "tooltip": "0", + "attachment": "0" + } + } +} diff --git a/static/themes/witch_inn.json b/static/themes/witch_inn.json new file mode 100644 index 00000000..5ad5d43f --- /dev/null +++ b/static/themes/witch_inn.json @@ -0,0 +1,454 @@ +{ + "name": "Witch' Inn", + "_pleroma_theme_version": 2, + "theme": { + "themeEngineVersion": 3, + "shadows": { + "panel": [ + { + "color": "#000000", + "x": 2, + "y": 2, + "blur": "1", + "spread": 0, + "alpha": "0.2" + } + ], + "topBar": [ + { + "color": "#000000", + "x": 0, + "y": 3, + "blur": "0", + "spread": 0, + "alpha": "0.3" + } + ], + "popup": [ + { + "color": "#000000", + "x": 2, + "y": 2, + "blur": "1", + "spread": 0, + "alpha": "0.2" + } + ], + "avatar": [ + { + "color": "#ffffff", + "x": 0, + "y": 0, + "blur": "20", + "spread": 0, + "alpha": "0.3" + } + ], + "avatarStatus": [ + { + "color": "#ffffff", + "x": 0, + "y": 0, + "blur": "20", + "spread": 0, + "inset": false, + "alpha": "0.3" + } + ], + "panelHeader": [], + "button": [ + { + "color": "#000000", + "x": 0, + "y": "0", + "blur": 0, + "spread": 1, + "alpha": "0.2", + "inset": true + }, + { + "color": "#000000", + "x": 0, + "y": 2, + "blur": 0, + "spread": 0, + "alpha": "0.3", + "inset": false + } + ], + "buttonHover": [ + { + "color": "#3e974e", + "x": 0, + "y": "0", + "blur": 0, + "spread": "1", + "alpha": "1", + "inset": true + }, + { + "color": "#3e974e", + "x": 0, + "y": 2, + "blur": 0, + "spread": 0, + "alpha": "0.6", + "inset": false + } + ], + "buttonPressed": [ + { + "color": "#000000", + "x": 0, + "y": "0", + "blur": 0, + "spread": "1", + "alpha": "0.2", + "inset": true + }, + { + "color": "#000000", + "x": 0, + "y": 0, + "blur": 0, + "spread": 0, + "alpha": "0", + "inset": false + } + ], + "input": [ + { + "color": "#000000", + "x": 0, + "y": 0, + "blur": 0, + "spread": 1, + "alpha": "0.2", + "inset": true + } + ] + }, + "colors": { + "underlay": "#000000", + "bg": "#d9cbb3", + "fg": "#73392b", + "cRed": "#e3312d", + "cGreen": "#249d36", + "cOrange": "#ef9925", + "cBlue": "#2186eb", + "accent": "#3e974e", + "link": "#3e974e", + "text": "#232627", + "badgeNotification": "#e3312d", + "badgeNotificationText": "#ffffff", + "alertNeutral": "#232627", + "alertNeutralText": "#ffffff", + "alertPopupNeutral": "#232627", + "alertPopupNeutralText": "#ffffff", + "alertSuccess": "#249d36", + "alertSuccessText": "#232627", + "alertPopupSuccess": "#249d36", + "alertPopupSuccessText": "#ffffff", + "alertWarning": "#ef9925", + "alertWarningText": "#232627", + "alertPopupWarning": "#ef9925", + "alertPopupWarningText": "#232627", + "alertError": "#e3312d", + "alertErrorText": "#232627", + "alertPopupError": "#e3312d", + "alertPopupErrorText": "#ffffff", + "panel": "#73392b", + "panelText": "#d8dbdc", + "alertNeutralPanelText": "#d8dbdc", + "alertSuccessPanelText": "#ffffff", + "alertWarningPanelText": "#ffffff", + "alertErrorPanelText": "#d8dbdc", + "fgText": "#d8dbdc", + "topBar": "#73392b", + "topBarText": "#d8dbdc", + "input": "#e5dbca", + "inputTopbarText": "#242628", + "inputPanelText": "#242628", + "inputText": "#232627", + "btn": "#e5dbca", + "btnText": "#242628", + "btnTopBarText": "#242628", + "btnDisabled": "#dccfb9", + "btnDisabledTopBarText": "#aea595", + "btnPanelText": "#242628", + "btnDisabledPanelText": "#aea595", + "btnDisabledText": "#aea595", + "btnToggled": "#c3ac86", + "btnToggledTopBarText": "#242628", + "btnToggledPanelText": "#242628", + "btnToggledText": "#242628", + "btnPressed": "#3e974e", + "btnPressedTopBarText": "#ffffff", + "btnPressedTopBar": "#3e974e", + "btnPressedPanelText": "#ffffff", + "btnPressedPanel": "#3e974e", + "btnPressedText": "#ffffff", + "tabActiveText": "#232627", + "tabText": "#242628", + "tab": "#e5dbca", + "fgLink": "#69c179", + "topBarLink": "#d8dbdc", + "panelLink": "#3f974f", + "panelFaint": "#d8dbdc", + "icon": "#7e796d", + "poll": "#9bb78b", + "pollText": "#232627", + "border": "#6c3629", + "postCyantext": "#1579de", + "postGreentext": "#5c835a", + "postLink": "#69c179", + "lightText": "#000000", + "popover": "#d9cbb3", + "selectedMenuPopover": "#3e974e", + "highlight": "#d1c0a2", + "highlightText": "#232627", + "selectedMenu": "#e5dbca", + "selectedMenuText": "#337b40", + "selectedMenuPopoverIcon": "#398947", + "highlightLink": "#69c179", + "selectedMenuLink": "#3f974f", + "selectedMenuPopoverLink": "#69c179", + "selectedMenuPopoverText": "#ffffff", + "faintLink": "#3e974e", + "highlightFaintLink": "#69c179", + "selectedMenuFaintLink": "#3f974f", + "selectedMenuPopoverFaintLink": "#69c179", + "faint": "#232627", + "highlightFaintText": "#232627", + "selectedMenuFaintText": "#232627", + "selectedMenuPopoverFaintText": "#ffffff", + "highlightLightText": "#000000", + "selectedMenuLightText": "#000000", + "selectedMenuPopoverLightText": "#000000", + "selectedMenuIcon": "#8cab85", + "selectedPost": "#d1c0a2", + "selectedPostText": "#232627", + "selectedPostIcon": "#7a7365", + "selectedPostLink": "#3f974f", + "selectedPostFaintLink": "#3f974f", + "highlightPostLink": "#3f974f", + "selectedPostPostLink": "#69c179", + "selectedPostLightText": "#000000", + "selectedPostFaintText": "#232627", + "popoverText": "#232627", + "popoverIcon": "#7e796d", + "popoverLink": "#69c179", + "postFaintLink": "#69c179", + "popoverPostFaintLink": "#3f974f", + "popoverFaintLink": "#69c179", + "popoverFaintText": "#232627", + "popoverPostLink": "#3f974f", + "popoverLightText": "#000000", + "highlightIcon": "#7a7365", + "highlightPostFaintLink": "#3f974f", + "profileTint": "#d9cbb3", + "profileBg": "#737169", + "wallpaper": "#ddd0ba" + }, + "opacity": { + "underlay": 0, + "bg": 0.95, + "alert": 0.5, + "alertPopup": 0.95, + "panel": 1, + "input": 1, + "btn": 1, + "faint": 0.5, + "border": 0.15, + "popover": 1, + "profileTint": 0.5 + }, + "radii": { + "btn": "3", + "input": "3", + "checkbox": "3", + "panel": "4", + "avatar": "4", + "avatarAlt": "4", + "tooltip": "3", + "attachment": "4" + }, + "fonts": { + "interface": { + "family": "sans-serif" + }, + "input": { + "family": "inherit" + }, + "post": { + "family": "inherit" + }, + "postCode": { + "family": "monospace" + } + } + }, + "source": { + "themeEngineVersion": 3, + "fonts": {}, + "shadows": { + "panel": [ + { + "x": 2, + "y": 2, + "blur": "1", + "spread": 0, + "color": "#000000", + "alpha": "0.2" + } + ], + "button": [ + { + "x": 0, + "y": "0", + "blur": 0, + "spread": 1, + "color": "--btn,900", + "alpha": "0.2", + "inset": true + }, + { + "x": 0, + "y": 2, + "blur": 0, + "spread": 0, + "color": "#000000", + "alpha": "0.3", + "inset": false + } + ], + "panelHeader": [], + "buttonHover": [ + { + "x": 0, + "y": "0", + "blur": 0, + "spread": "1", + "color": "--accent", + "alpha": "1", + "inset": true + }, + { + "x": 0, + "y": 2, + "blur": 0, + "spread": 0, + "color": "--accent", + "alpha": "0.6", + "inset": false + } + ], + "buttonPressed": [ + { + "x": 0, + "y": "0", + "blur": 0, + "spread": "1", + "color": "--btn,900", + "alpha": "0.2", + "inset": true + }, + { + "x": 0, + "y": 0, + "blur": 0, + "spread": 0, + "color": "--btn,900", + "alpha": "0", + "inset": false + } + ], + "input": [ + { + "x": 0, + "y": 0, + "blur": 0, + "spread": 1, + "color": "--input,900", + "alpha": "0.2", + "inset": true + } + ], + "topBar": [ + { + "x": 0, + "y": 3, + "blur": "0", + "spread": 0, + "color": "#000000", + "alpha": "0.3" + } + ], + "popup": [ + { + "x": 2, + "y": 2, + "blur": "1", + "spread": 0, + "color": "#000000", + "alpha": "0.2" + } + ], + "avatarStatus": [ + { + "x": 0, + "y": 0, + "blur": "20", + "spread": 0, + "inset": false, + "color": "#ffffff", + "alpha": "0.3" + } + ], + "avatar": [ + { + "x": 0, + "y": 0, + "blur": "20", + "spread": 0, + "color": "#ffffff", + "alpha": "0.3" + } + ] + }, + "opacity": { + "bg": "0.95", + "underlay": "0", + "border": "0.15", + "input": "1" + }, + "colors": { + "bg": "#d9cbb3", + "fg": "#73392b", + "text": "#232627", + "accent": "#3E974E", + "cBlue": "#2186eb", + "cRed": "#e3312d", + "cGreen": "#249d36", + "cOrange": "#ef9925", + "selectedMenu": "--bg, -6.5", + "selectedMenuText": "#337b40", + "selectedMenuPopover": "--accent", + "postGreentext": "#5c835a", + "topBarLink": "--topBarText", + "btn": "--bg, -6.5", + "btnPressed": "--accent", + "input": "--bg,-6.5" + }, + "radii": { + "btn": "3", + "input": "3", + "checkbox": "3", + "panel": "4", + "avatar": "4", + "avatarAlt": "4", + "tooltip": "3", + "attachment": "4" + } + } +}