diff --git a/apps/common/main/lib/component/DataView.js b/apps/common/main/lib/component/DataView.js index dc309e1d1..766d9dcd4 100644 --- a/apps/common/main/lib/component/DataView.js +++ b/apps/common/main/lib/component/DataView.js @@ -575,8 +575,8 @@ define([ var div_top = div.offset().top, div_first = $(this.dataViewItems[0].el), - div_first_top = (div_first.length>0) ? div_first[0].offsetTop : 0; - if (div_top < inner_top + div_first_top || div_top+div.outerHeight() > inner_top + innerEl.height()) { + div_first_top = (div_first.length>0) ? div_first[0].clientTop : 0; + if (div_top < inner_top + div_first_top || div_top+div.outerHeight()*0.9 > inner_top + div_first_top + innerEl.height()) { if (this.scroller && this.allowScrollbar) { this.scroller.scrollTop(innerEl.scrollTop() + div_top - inner_top - div_first_top, 0); } else { diff --git a/apps/common/main/resources/less/listview.less b/apps/common/main/resources/less/listview.less index 4dc18d461..25228220f 100644 --- a/apps/common/main/resources/less/listview.less +++ b/apps/common/main/resources/less/listview.less @@ -1,5 +1,6 @@ .listview { border: 1px solid @input-border; + line-height: 15px; &.inner { width: 100%; diff --git a/apps/documenteditor/main/app/template/ControlSettingsDialog.template b/apps/documenteditor/main/app/template/ControlSettingsDialog.template index 26f132647..7637f6d0e 100644 --- a/apps/documenteditor/main/app/template/ControlSettingsDialog.template +++ b/apps/documenteditor/main/app/template/ControlSettingsDialog.template @@ -83,7 +83,7 @@ -
+
@@ -111,7 +111,7 @@ -
+
diff --git a/apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template b/apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template index c510b0b83..8d9420889 100644 --- a/apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template +++ b/apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template @@ -170,7 +170,7 @@
-
+
diff --git a/apps/documenteditor/main/app/view/BookmarksDialog.js b/apps/documenteditor/main/app/view/BookmarksDialog.js index 9210e9648..45b0db979 100644 --- a/apps/documenteditor/main/app/view/BookmarksDialog.js +++ b/apps/documenteditor/main/app/view/BookmarksDialog.js @@ -51,7 +51,7 @@ define([ DE.Views.BookmarksDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 310, - height: 360, + height: 366, buttons: null }, @@ -85,7 +85,7 @@ define([ '', '', '', - '
', + '
', '', '', '', diff --git a/apps/documenteditor/main/app/view/DateTimeDialog.js b/apps/documenteditor/main/app/view/DateTimeDialog.js index bc9dc93f9..99694b148 100644 --- a/apps/documenteditor/main/app/view/DateTimeDialog.js +++ b/apps/documenteditor/main/app/view/DateTimeDialog.js @@ -62,7 +62,7 @@ define([ }, options || {}); this.template = [ - '
', + '
', '
', '', '
', @@ -70,7 +70,7 @@ define([ '
', '', '
', - '
', + '
', '
', '
', '', diff --git a/apps/documenteditor/main/app/view/TableOfContentsSettings.js b/apps/documenteditor/main/app/view/TableOfContentsSettings.js index a574c969f..3dc09edc5 100644 --- a/apps/documenteditor/main/app/view/TableOfContentsSettings.js +++ b/apps/documenteditor/main/app/view/TableOfContentsSettings.js @@ -107,7 +107,7 @@ define([ '', '', '', - '
', + '
', '', '
', '', diff --git a/apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template b/apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template index ccba9ab31..65ce45a2a 100644 --- a/apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template +++ b/apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template @@ -102,7 +102,7 @@
-
+
diff --git a/apps/presentationeditor/main/app/view/DateTimeDialog.js b/apps/presentationeditor/main/app/view/DateTimeDialog.js index 2f3d9a3f6..9e9e0c22c 100644 --- a/apps/presentationeditor/main/app/view/DateTimeDialog.js +++ b/apps/presentationeditor/main/app/view/DateTimeDialog.js @@ -70,7 +70,7 @@ define([ '
', '', '
', - '
', + '
', '
', '
', '', diff --git a/apps/spreadsheeteditor/main/app/template/NameManagerDlg.template b/apps/spreadsheeteditor/main/app/template/NameManagerDlg.template index 7f619ba8b..dc6533b0f 100644 --- a/apps/spreadsheeteditor/main/app/template/NameManagerDlg.template +++ b/apps/spreadsheeteditor/main/app/template/NameManagerDlg.template @@ -20,7 +20,7 @@ -
+
diff --git a/apps/spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.template b/apps/spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.template index ccba9ab31..65ce45a2a 100644 --- a/apps/spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.template +++ b/apps/spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.template @@ -102,7 +102,7 @@
-
+
diff --git a/apps/spreadsheeteditor/main/app/template/SortDialog.template b/apps/spreadsheeteditor/main/app/template/SortDialog.template index 4ba910c20..77bbbd1e9 100644 --- a/apps/spreadsheeteditor/main/app/template/SortDialog.template +++ b/apps/spreadsheeteditor/main/app/template/SortDialog.template @@ -20,7 +20,7 @@ -
+
diff --git a/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js b/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js index 175d3dd24..f44ecab9b 100644 --- a/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js +++ b/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js @@ -53,7 +53,7 @@ define([ 'text!spreadsheeteditor/main/app/template/NameManagerDlg.template', options: { alias: 'NameManagerDlg', contentWidth: 510, - height: 353, + height: 351, buttons: null }, diff --git a/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js b/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js index 922540fae..3810e550b 100644 --- a/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js +++ b/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js @@ -67,14 +67,13 @@ define([ '', '', '', - '
', + '
', '', '', '', '
', '
', - '
', - '
' + '' ].join('') }, options); diff --git a/apps/spreadsheeteditor/main/app/view/RemoveDuplicatesDialog.js b/apps/spreadsheeteditor/main/app/view/RemoveDuplicatesDialog.js index 887c691ff..b124eb5d7 100644 --- a/apps/spreadsheeteditor/main/app/view/RemoveDuplicatesDialog.js +++ b/apps/spreadsheeteditor/main/app/view/RemoveDuplicatesDialog.js @@ -62,7 +62,7 @@ define([ }, options || {}); this.template = [ - '
', + '
', '
', '', '
', @@ -72,7 +72,7 @@ define([ '
', '', '
', - '
', + '
', '
' ].join(''); diff --git a/apps/spreadsheeteditor/main/app/view/Statusbar.js b/apps/spreadsheeteditor/main/app/view/Statusbar.js index db0460ba6..78c14aa29 100644 --- a/apps/spreadsheeteditor/main/app/view/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/view/Statusbar.js @@ -791,7 +791,7 @@ define([ '
' + '' + '
' + - '
' + + '
' + '
', initialize : function(options) {