diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 57a72c501..13f2bcf8a 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -1166,7 +1166,7 @@ define([ this.lblApplication = $markup.findById('#id-info-appname'); this.tblAuthor = $markup.findById('#id-info-author table'); this.trAuthor = $markup.findById('#id-info-add-author').closest('tr'); - this.authorTpl = '
'; + this.authorTpl = '
'; this.tblAuthor.on('click', function(e) { var btn = $markup.find(e.target); diff --git a/apps/documenteditor/main/resources/less/filemenu.less b/apps/documenteditor/main/resources/less/filemenu.less index 36307e86f..90f8fb942 100644 --- a/apps/documenteditor/main/resources/less/filemenu.less +++ b/apps/documenteditor/main/resources/less/filemenu.less @@ -378,45 +378,62 @@ font-size: 12px; } - .close { - width: 16px; - height: 16px; - cursor: pointer; - display: inline-block; - vertical-align: middle; - margin-left: 5px; - - background-position: @but-close-offset-x @but-close-offset-y; - - &.over, - &:hover { - background-position: @but-close-offset-x @but-close-offset-y - 16px; - } - - &.disabled { - background-position: @but-close-offset-x @but-close-offset-y - 32px; - cursor: default; - } + .tool { + margin-left: 4px; + background-image: none; + &.close{ + &:before, &:after { + height: 12px; + left: 8px; + width: 2px; + width: @scaled-two-px-value; + } + &.disabled { + opacity: 0.4; + } + } } + +/*.close { + width: 16px; + height: 16px; + cursor: pointer; + display: inline-block; + vertical-align: middle; + margin-left: 5px; + + background-position: @but-close-offset-x @but-close-offset-y; + + &.over, + &:hover { + background-position: @but-close-offset-x @but-close-offset-y - 16px; + opacity: 1; + } + + &.disabled { + background-position: @but-close-offset-x @but-close-offset-y - 32px; + cursor: default; + } +}*/ } #panel-protect { - label { - font-size: 12px; - } +label { + font-size: 12px; +} - #file-menu-panel & { - padding: 30px 30px; - } +#file-menu-panel & { + padding: 30px 30px; +} - .header { - font-weight: bold; - margin: 30px 0 10px; - } +.header { + font-weight: bold; + margin: 30px 0 10px; +} - table { - td { - padding: 5px 0; - } +table { + td { + padding: 5px 0; } +} } \ No newline at end of file diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index 7aabc1d5b..a9dee9f0b 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -991,7 +991,7 @@ define([ this.lblApplication = $markup.findById('#id-info-appname'); this.tblAuthor = $markup.findById('#id-info-author table'); this.trAuthor = $markup.findById('#id-info-add-author').closest('tr'); - this.authorTpl = '
'; + this.authorTpl = '
'; this.tblAuthor.on('click', function(e) { var btn = $markup.find(e.target); diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less index de7588ba6..13da79c99 100644 --- a/apps/presentationeditor/main/resources/less/leftmenu.less +++ b/apps/presentationeditor/main/resources/less/leftmenu.less @@ -413,24 +413,19 @@ font-size: 12px; } - .close { - width: 16px; - height: 16px; - cursor: pointer; - display: inline-block; - vertical-align: middle; - margin-left: 5px; - - background-position: @but-close-offset-x @but-close-offset-y; - - &.over, - &:hover { - background-position: @but-close-offset-x @but-close-offset-y - 16px; - } - - &.disabled { - background-position: @but-close-offset-x @but-close-offset-y - 32px; - cursor: default; + .tool { + margin-left: 4px; + background-image: none; + &.close{ + &:before, &:after { + height: 12px; + left: 8px; + width: 2px; + width: @scaled-two-px-value; + } + &.disabled { + opacity: 0.4; + } } } } diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 255ed98cd..936855bb1 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -1954,7 +1954,7 @@ define([ this.lblApplication = $markup.findById('#id-info-appname'); this.tblAuthor = $markup.findById('#id-info-author table'); this.trAuthor = $markup.findById('#id-info-add-author').closest('tr'); - this.authorTpl = '
'; + this.authorTpl = '
'; this.tblAuthor.on('click', function(e) { var btn = $markup.find(e.target); diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less index 1e410b56e..b219bf62d 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -481,24 +481,19 @@ font-size: 12px; } - .close { - width: 16px; - height: 16px; - cursor: pointer; - display: inline-block; - vertical-align: middle; - margin-left: 5px; - - background-position: @but-close-offset-x @but-close-offset-y; - - &.over, - &:hover { - background-position: @but-close-offset-x @but-close-offset-y - 16px; - } - - &.disabled { - background-position: @but-close-offset-x @but-close-offset-y - 32px; - cursor: default; + .tool { + margin-left: 4px; + background-image: none; + &.close{ + &:before, &:after { + height: 12px; + left: 8px; + width: 2px; + width: @scaled-two-px-value; + } + &.disabled { + opacity: 0.4; + } } } }