mirror/spacedeck-open
1
0
Fork 0
mirror of https://github.com/spacedeck/spacedeck-open.git synced 2025-12-15 17:37:30 +01:00
Code Issues Projects Releases Wiki Activity

allow for custom color swatches

Browse Source 
reset colors to black on deselect
fix fill_color default black
This commit is contained in:
dm
2021-01-18 20:53:54 +01:00
parent 8b5aaed92a
commit 5a9a79addb
3 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/default.json
View File

@@ -26,5 +26,6 @@
"mail_smtp_secure": true, "mail_smtp_secure": true,
"mail_smtp_require_tls": true, "mail_smtp_require_tls": true,
"mail_smtp_user": "your.smtp.user", "mail_smtp_user": "your.smtp.user",
"mail_smtp_pass": "your.secret.smtp.password" "mail_smtp_pass": "your.secret.smtp.password",
"spacedeck": {}
} }

21
public/javascripts/spacedeck_sections.js
View File

@@ -69,7 +69,7 @@ var SpacedeckSections = {
letter_spacing: 0, letter_spacing: 0,
stroke_color: "#000000", stroke_color: "#000000",
fill_color: "#00000000", fill_color: "#000000",
text_color: "#000000", text_color: "#000000",
background_color: "#ffffff", background_color: "#ffffff",
@@ -109,7 +109,7 @@ var SpacedeckSections = {
color_picker_hue: 127, color_picker_hue: 127,
color_picker_opacity: 255, color_picker_opacity: 255,
swatches: [ swatches: ENV.options.swatches ? ENV.options.swatches : [
{id:1, hex:"#ff00ff"}, {id:1, hex:"#ff00ff"},
{id:2, hex:"#ffff00"}, {id:2, hex:"#ffff00"},
{id:3, hex:"#00ffff"}, {id:3, hex:"#00ffff"},
@@ -133,18 +133,7 @@ var SpacedeckSections = {
{id:26, hex:"#d55c4b"}, {id:26, hex:"#d55c4b"},
{id:27, hex:"#6f4021"}, {id:27, hex:"#6f4021"},
{id:29, hex:"#95a5a6"}, {id:29, hex:"#95a5a6"},
{id:30, hex:"rgba(0,0,0,0)"}, {id:30, hex:"rgba(0,0,0,0)"}
],
swatches_text: [
{id:1, hex:"#9b59b6"},
{id:2, hex:"#3498db"},
{id:3, hex:"#2ecc71"},
{id:4, hex:"#f1c40f"},
{id:5, hex:"#e67e22"},
{id:6, hex:"#d55c4b"},
{id:8, hex:"#ffffff"},
{id:10, hex:"#252525"},
], ],
fonts: [ fonts: [
@@ -933,6 +922,10 @@ var SpacedeckSections = {
} }
this.hide_toolbar_props(); this.hide_toolbar_props();
// reset active_style to black for new creation of artifacts
this.active_style.text_color = "#000000";
this.active_style.stroke_color = "#000000";
this.active_style.fill_color = "#000000";
document.getSelection().removeAllRanges(); document.getSelection().removeAllRanges();

3
views/spacedeck.ejs
View File

@@ -21,7 +21,8 @@
webHost: location.host, webHost: location.host,
webEndpoint: location.origin, webEndpoint: location.origin,
apiEndpoint: location.origin, apiEndpoint: location.origin,
websocketsEndpoint: location.origin.replace("https:","wss:").replace("http:","ws:") websocketsEndpoint: location.origin.replace("https:","wss:").replace("http:","ws:"),
options: <%- JSON.stringify(config.spacedeck) %>
}; };
</script> </script>