git-svn-id:...

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55599 954022d7-b5bf-4e40-9824-e11837661b57

Word/Drawing/DrawingDocument.js

@@ -957,7 +957,7 @@ function CPage()
     {
         if (null != this.drawingPage.cachedImage)
         {
-            context.strokeStyle = "#81878F";
+            context.strokeStyle = GlobalSkin.PageOutline;
             context.strokeRect(xDst, yDst, wDst, hDst);
             // ����� ���������� �� �������� ���������
             context.drawImage(this.drawingPage.cachedImage.image, xDst, yDst, wDst, hDst);
@@ -965,7 +965,7 @@ function CPage()
         else
         {
             context.fillStyle = "#ffffff";
-            context.strokeStyle = "#81878F";
+            context.strokeStyle = GlobalSkin.PageOutline;
             context.strokeRect(xDst, yDst, wDst, hDst);
             context.fillRect(xDst, yDst, wDst, hDst);
         }

Word/Drawing/HtmlPage.js

@@ -49,14 +49,20 @@ var GlobalSkinTeamlab = {
     RulerDark : "#B0B0B0",
     RulerLight : "EDEDED",
     BackgroundScroll : "#D3D3D3",
+    RulerOutline : "#929292",
+    RulerMarkersFillColor : "#E7E7E7",
+    PageOutline : "#81878F",
     STYLE_THUMBNAIL_WIDTH : 80,
     STYLE_THUMBNAIL_HEIGHT : 40
 };
 var GlobalSkinFlat = {
     BackgroundColor : "#F4F4F4",
-    RulerDark : "#E5E5E5",
-    RulerLight : "#F4F4F4",
-    BackgroundScroll : "#E5E5E5",
+    RulerDark : "#D8DADC",
+    RulerLight : "#FFFFFF",
+    BackgroundScroll : "#F4F4F4",
+    RulerOutline : "#BBBEC2",
+    RulerMarkersFillColor : "#FFFFFF",
+    PageOutline : "#BBBEC2",
     STYLE_THUMBNAIL_WIDTH : 109,
     STYLE_THUMBNAIL_HEIGHT : 45
 };

Word/Drawing/Rulers.js

@@ -487,7 +487,7 @@ function CHorRuler()
         //context.shadowBlur = 0;
         //context.shadowColor = "#81878F";
 
-        context.strokeStyle = "#929292";
+        context.strokeStyle = GlobalSkin.RulerOutline;
 
         context.lineWidth = 1;
         context.strokeRect(0.5, this.m_nTop + 0.5, Math.max(intW - 1, 1), this.m_nBottom - this.m_nTop);
@@ -610,7 +610,7 @@ function CHorRuler()
             if (0 != _count)
             {
                 context.fillStyle = GlobalSkin.RulerDark;
-                context.strokeStyle = "#929292";
+                context.strokeStyle = GlobalSkin.RulerOutline;
 
                 var _offset = markup.X;
                 for (var i = 0; i <= _count; i++)
@@ -1648,7 +1648,7 @@ function CHorRuler()
 
             if (posL < posR)
             {
-                context.fillStyle = "#E7E7E7";
+                context.fillStyle = GlobalSkin.RulerMarkersFillColor;
 
                 // left indent
                 dCenterX = left + (_margin_left +  this.m_dIndentLeft) * dKoef_mm_to_pix;
@@ -2025,7 +2025,7 @@ function CVerRuler()
         }
 
         // �����
-        context.strokeStyle = "#929292";
+        context.strokeStyle = GlobalSkin.RulerOutline;
 
         context.lineWidth = 1;
         context.strokeRect(this.m_nLeft + 0.5, 0.5, this.m_nRight - this.m_nLeft, Math.max(intH - 1, 1));
@@ -2171,7 +2171,7 @@ function CVerRuler()
             var end_dark = 0;
 
             context.fillStyle = GlobalSkin.RulerDark;
-            context.strokeStyle = "#929292";
+            context.strokeStyle = GlobalSkin.RulerOutline;
 
             var _x = this.m_nLeft + 0.5;
             var _w = this.m_nRight - this.m_nLeft;