scroll ver 4

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

Excel/css/main.css

@@ -9,8 +9,8 @@
 	position: absolute;
 	left: 0;
 	top: 0;
-	right: 16px;
-	bottom: 16px;
+	right: 14px;
+	bottom: 14px;
 }
 
 #ws-canvas {
@@ -33,9 +33,9 @@
 #ws-v-scrollbar {
 	position: absolute;
 	right: 0;
-	width: 16px;
+	width: 14px;
 	top: 0px;
-	bottom: 15px;
+	bottom: 14px;
 	overflow: hidden;
 	z-index: 10;
     background-color: #f1f1f1;
@@ -48,9 +48,9 @@
 #ws-h-scrollbar {
 	position: absolute;
 	bottom: 0;
-	height: 16px;
+	height: 14px;
 	left: 0px;
-	right: 15px;
+	right: 14px;
 	overflow: hidden;
 	z-index: 10;
     background-color: #f1f1f1;
@@ -64,8 +64,8 @@
 	position: absolute;
 	right: 0;
 	bottom: 0;
-	width: 15px;
-	height: 15px;
+	width: 14px;
+	height: 14px;
 	background-color: #F4F4F4;
 	border: 0;
 	z-index: 10;

Excel/view/WorkbookView.js

@@ -117,8 +117,8 @@
 		function WorkbookView(model, controller, handlers, elem, inputElem, Api, collaborativeEditing, fontRenderingMode) {
 			this.defaults = {
 				scroll: {
-					widthPx	: 16,
-					heightPx: 16
+					widthPx	: 14,
+					heightPx: 14
 				},
 				worksheetView: new WorksheetViewSettings()
 			};

PowerPoint/Drawing/HtmlPage.js

@@ -93,7 +93,7 @@ function CEditorPage(api)
     this.m_oTopRuler                    = null;
     this.m_oTopRuler_horRuler           = null;
 
-    this.ScrollWidthPx      = 16;
+    this.ScrollWidthPx      = 14;
 
     // main view
     this.m_oMainView        = null;

PowerPoint/api.js

@@ -938,15 +938,15 @@ asc_docs_api.prototype.CreateComponents = function()
                                 </div>\
 							    <div id=\"id_panel_right\" class=\"block_elem\" style=\"margin-right:1px;background-color:#F1F1F1;\">\
 							        <div id=\"id_buttonRulers\" class=\"block_elem buttonRuler\"></div>\
-								    <div id=\"id_vertical_scroll\" style=\"left:0;top:0;width:16px;overflow:hidden;position:absolute;\">\
-									    <div id=\"panel_right_scroll\" class=\"block_elem\" style=\"left:0;top:0;width:16px;height:6000px;\"></div>\
+								    <div id=\"id_vertical_scroll\" style=\"left:0;top:0;width:14px;overflow:hidden;position:absolute;\">\
+									    <div id=\"panel_right_scroll\" class=\"block_elem\" style=\"left:0;top:0;width:1px;height:6000px;\"></div>\
 								    </div>\
 								    <div id=\"id_buttonPrevPage\" class=\"block_elem buttonPrevPage\"></div>\
 								    <div id=\"id_buttonNextPage\" class=\"block_elem buttonNextPage\"></div>\
                                 </div>\
                                 <div id=\"id_horscrollpanel\" class=\"block_elem\" style=\"margin-bottom:1px;background-color:#B0B0B0;\">\
-                                    <div id=\"id_horizontal_scroll\" style=\"left:0;top:0;height:16px;overflow:hidden;position:absolute;width:100%;\">\
-                                        <div id=\"panel_hor_scroll\" class=\"block_elem\" style=\"left:0;top:0;width:6000px;height:16px;\"></div>\
+                                    <div id=\"id_horizontal_scroll\" style=\"left:0;top:0;height:14px;overflow:hidden;position:absolute;width:100%;\">\
+                                        <div id=\"panel_hor_scroll\" class=\"block_elem\" style=\"left:0;top:0;width:6000px;height:1px;\"></div>\
                                     </div>\
                                 </div>\
                             </div>\

Word/Drawing/HtmlPage.js

@@ -55,7 +55,7 @@ var GlobalSkinFlat = {
     Name : "flat",
     RulersButton : false,
     BackgroundColor : "#F4F4F4",
-    RulerDark : "#D8DADC",
+    RulerDark : "#CFCFCF",
     RulerLight : "#FFFFFF",
     BackgroundScroll : "#F1F1F1",
     RulerOutline : "#BBBEC2",
@@ -128,7 +128,7 @@ function CEditorPage(api)
     this.NoneRepaintPages   = false;
 
     this.m_bIsScroll        = false;
-    this.ScrollsWidthPx     = 16;
+    this.ScrollsWidthPx     = 14;
 
     this.m_oHorRuler        = new CHorRuler();
     this.m_oVerRuler        = new CVerRuler();

Word/api.js

@@ -1167,15 +1167,15 @@ asc_docs_api.prototype.CreateComponents = function()
 								</div>\
 									<div id=\"id_panel_right\" class=\"block_elem\" style=\"margin-right:1px;background-color:" + GlobalSkin.BackgroundScroll + ";\">\
 									<div id=\"id_buttonRulers\" class=\"block_elem buttonRuler\"></div>\
-									<div id=\"id_vertical_scroll\" style=\"left:0;top:0px;width:16px;overflow:hidden;position:absolute;\">\
-									<div id=\"panel_right_scroll\" class=\"block_elem\" style=\"left:0;top:0;width:16px;height:6000px;\"></div>\
+									<div id=\"id_vertical_scroll\" style=\"left:0;top:0px;width:14px;overflow:hidden;position:absolute;\">\
+									<div id=\"panel_right_scroll\" class=\"block_elem\" style=\"left:0;top:0;width:1px;height:6000px;\"></div>\
 									</div>\
 									<div id=\"id_buttonPrevPage\" class=\"block_elem buttonPrevPage\"></div>\
 									<div id=\"id_buttonNextPage\" class=\"block_elem buttonNextPage\"></div>\
 								</div>\
 									<div id=\"id_horscrollpanel\" class=\"block_elem\" style=\"margin-bottom:1px;background-color:" + GlobalSkin.BackgroundScroll + ";\">\
-									<div id=\"id_horizontal_scroll\" style=\"left:0px;top:0;height:16px;overflow:hidden;position:absolute;width:100%;\">\
-										<div id=\"panel_hor_scroll\" class=\"block_elem\" style=\"left:0;top:0;width:6000px;height:16px;\"></div>\
+									<div id=\"id_horizontal_scroll\" style=\"left:0px;top:0;height:14px;overflow:hidden;position:absolute;width:100%;\">\
+										<div id=\"panel_hor_scroll\" class=\"block_elem\" style=\"left:0;top:0;width:6000px;height:1px;\"></div>\
 									</div>\
 									</div>";
 };