diff options
Diffstat (limited to 'js/document')
-rwxr-xr-x | js/document/html-document.js | 11 | ||||
-rwxr-xr-x | js/document/templates/montage-html/default_html.css | 4 |
2 files changed, 5 insertions, 10 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js index 42a7d537..2bb277e7 100755 --- a/js/document/html-document.js +++ b/js/document/html-document.js | |||
@@ -307,19 +307,15 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
307 | { | 307 | { |
308 | shapeModel.GLGeomObj = root; | 308 | shapeModel.GLGeomObj = root; |
309 | shapeModel.strokeSize = root._strokeWidth; | 309 | shapeModel.strokeSize = root._strokeWidth; |
310 | shapeModel.stroke = root._strokeColor.slice(); | 310 | shapeModel.stroke = root._strokeColor; |
311 | shapeModel.strokeMaterial = root._strikeMaterial ? root._strokeMaterial.dup() : null; | ||
312 | shapeModel.strokeStyle = "solid"; | 311 | shapeModel.strokeStyle = "solid"; |
313 | //shapeModel.strokeStyleIndex | 312 | //shapeModel.strokeStyleIndex |
314 | //shapeModel.border | ||
315 | //shapeModel.background | ||
316 | switch (root.geomType()) | 313 | switch (root.geomType()) |
317 | { | 314 | { |
318 | case root.GEOM_TYPE_RECTANGLE: | 315 | case root.GEOM_TYPE_RECTANGLE: |
319 | elementModel.selection = "Rectangle"; | 316 | elementModel.selection = "Rectangle"; |
320 | elementModel.pi = "RectanglePi"; | 317 | elementModel.pi = "RectanglePi"; |
321 | shapeModel.fill = root._fillColor.slice(); | 318 | shapeModel.fill = root._fillColor; |
322 | shapeModel.fillMaterial = root._fillMaterial ? root._fillMaterial.dup() : null; | ||
323 | shapeModel.tlRadius = root._tlRadius; | 319 | shapeModel.tlRadius = root._tlRadius; |
324 | shapeModel.trRadius = root._trRadius; | 320 | shapeModel.trRadius = root._trRadius; |
325 | shapeModel.blRadius = root._blRadius; | 321 | shapeModel.blRadius = root._blRadius; |
@@ -329,8 +325,7 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
329 | case root.GEOM_TYPE_CIRCLE: | 325 | case root.GEOM_TYPE_CIRCLE: |
330 | elementModel.selection = "Oval"; | 326 | elementModel.selection = "Oval"; |
331 | elementModel.pi = "OvalPi"; | 327 | elementModel.pi = "OvalPi"; |
332 | shapeModel.fill = root._fillColor.slice(); | 328 | shapeModel.fill = root._fillColor; |
333 | shapeModel.fillMaterial = root._fillMaterial ? root._fillMaterial.dup() : null; | ||
334 | shapeModel.innerRadius = root._innerRadius; | 329 | shapeModel.innerRadius = root._innerRadius; |
335 | break; | 330 | break; |
336 | 331 | ||
diff --git a/js/document/templates/montage-html/default_html.css b/js/document/templates/montage-html/default_html.css index 6c2b415f..424c5801 100755 --- a/js/document/templates/montage-html/default_html.css +++ b/js/document/templates/montage-html/default_html.css | |||
@@ -70,8 +70,8 @@ body | |||
70 | -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); | 70 | -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); |
71 | } | 71 | } |
72 | 72 | ||
73 | .elem-red-outline { | 73 | .active-element-outline { |
74 | outline: red solid thin; | 74 | outline: #adff2f solid 2px; |
75 | } | 75 | } |
76 | 76 | ||
77 | .nj-preset-transition { | 77 | .nj-preset-transition { |