diff --git a/apps/common/main/resources/img/right-panels/arrows.svg b/apps/common/main/resources/img/right-panels/arrows.svg new file mode 100644 index 000000000..597d116d5 --- /dev/null +++ b/apps/common/main/resources/img/right-panels/arrows.svg @@ -0,0 +1,162 @@ + + + + + + + + diff --git a/apps/common/main/resources/img/toolbar/arrows.svg b/apps/common/main/resources/img/toolbar/arrows.svg new file mode 100644 index 000000000..b26de68b4 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/arrows.svg @@ -0,0 +1,129 @@ + \ No newline at end of file diff --git a/apps/common/main/resources/less/advanced-settings-window.less b/apps/common/main/resources/less/advanced-settings-window.less index 2cfd6bbf6..98c132b44 100644 --- a/apps/common/main/resources/less/advanced-settings-window.less +++ b/apps/common/main/resources/less/advanced-settings-window.less @@ -58,20 +58,31 @@ .form-control { cursor: pointer; - .image { + .img-arrows { width: 100%; - height: 100%; + height: 18px; display: block; background-color: transparent; - margin: 0 0 0 -3px; + margin: auto; + text-align: center; + overflow: hidden; + padding-right: 4px; + .svg-mirror{ + margin-right: 1px; + } } } } -.img-arrows { - .background-ximage-v2('right-panels/Begin-EndStyle.png', 480px); - -webkit-filter: @img-border-type-filter; - filter: @img-border-type-filter; +.img-arrows svg{ + width: 44px; + height: 20px; + fill: @icon-normal-ie; + fill: @icon-normal; + + &.svg-mirror{ + transform: scale(-1,1); + } } .item-arrow { diff --git a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js index 96ad6a0bc..8567ede08 100644 --- a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js @@ -987,18 +987,18 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat var _arrStyles = [], _arrSize = []; - for ( var i=0; i<6; i++ ) - _arrStyles.push({value: i, offsetx: 80*i+10, offsety: 0}); + _arrStyles.push({type: Asc.c_oAscLineBeginType.None, idsvg: 'no-'}); + _arrStyles.push({type: Asc.c_oAscLineBeginType.Triangle, idsvg: ''}); + _arrStyles.push({type: Asc.c_oAscLineBeginType.Arrow, idsvg: 'open-'}); + _arrStyles.push({type: Asc.c_oAscLineBeginType.Stealth, idsvg: 'stealth-'}); + _arrStyles.push({type: Asc.c_oAscLineBeginType.Diamond, idsvg: 'dimond-'}); + _arrStyles.push({type: Asc.c_oAscLineBeginType.Oval, idsvg: 'oval-'}); - _arrStyles[0].type = Asc.c_oAscLineBeginType.None; - _arrStyles[1].type = Asc.c_oAscLineBeginType.Triangle; - _arrStyles[2].type = Asc.c_oAscLineBeginType.Arrow; - _arrStyles[3].type = Asc.c_oAscLineBeginType.Stealth; - _arrStyles[4].type = Asc.c_oAscLineBeginType.Diamond; - _arrStyles[5].type = Asc.c_oAscLineBeginType.Oval; + for ( var i=0; i<6; i++ ) + _arrStyles[i].value = i; for ( i=0; i<9; i++ ) - _arrSize.push({value: i, offsetx: 80+10, offsety: 20*(i+1)}); + _arrSize.push({value: i, typearrow:''}); _arrSize[0].type = Asc.c_oAscLineBeginSize.small_small; _arrSize[1].type = Asc.c_oAscLineBeginSize.small_mid; @@ -1016,7 +1016,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat template: _.template([ '