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

Merge pull request #130 from johanjeppsson/mnt

Browse Source 
Use active stroke/fill/text settings for shapes and notes
This commit is contained in:
mntmn
2020-11-21 16:56:03 +01:00
committed by GitHub
parent 9f111bc679 0e7da09685
commit 1d6514c8ee
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/javascripts/spacedeck_sections.js
View File

@@ -1723,10 +1723,10 @@ var SpacedeckSections = {
z: point.z,
w: w,
h: h,
stroke_color: "#ffffff",
text_color: "#ffffff",
stroke_color: this.active_style.stroke_color,
text_color: this.active_style.text_color,
stroke: 0,
fill_color: "#000000",
fill_color: this.active_style.fill_color,
shape: shape_type,
valign: "middle",
align: "center",

5
public/javascripts/spacedeck_whiteboard.js
View File

@@ -549,8 +549,9 @@ function setup_whiteboard_directives() {
h: note_h,
align: "center",
valign: "middle",
stroke_color: "#000000",
fill_color: "rgb(241, 196, 15)",
stroke_color: $scope.active_style.stroke_color,
text_color: $scope.active_style.text_color,
fill_color: $scope.active_style.fill_color,
stroke: 0,
padding_left: 10,
padding_right: 10,