diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index e7fa9d01f..bd5778e39 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -1365,18 +1365,18 @@ define([ this.fillControls.push(this.cmbGradType); this._viewDataLinear = [ - { offsetx: 0, offsety: 0, type:45, subtype:-1, iconcls:'gradient-left-top' }, - { offsetx: 50, offsety: 0, type:90, subtype:4, iconcls:'gradient-top'}, - { offsetx: 100, offsety: 0, type:135, subtype:5, iconcls:'gradient-right-top'}, - { offsetx: 0, offsety: 50, type:0, subtype:6, iconcls:'gradient-left', cls: 'item-gradient-separator', selected: true}, - { offsetx: 100, offsety: 50, type:180, subtype:1, iconcls:'gradient-right'}, - { offsetx: 0, offsety: 100, type:315, subtype:2, iconcls:'gradient-left-bottom'}, - { offsetx: 50, offsety: 100, type:270, subtype:3, iconcls:'gradient-bottom'}, - { offsetx: 100, offsety: 100, type:225, subtype:7, iconcls:'gradient-right-bottom'} + { type:45, subtype:-1}, + { type:90, subtype:4}, + { type:135, subtype:5}, + { type:0, subtype:6, cls: 'item-gradient-separator', selected: true}, + { type:180, subtype:1}, + { type:315, subtype:2}, + { type:270, subtype:3}, + { type:225, subtype:7} ]; this._viewDataRadial = [ - { offsetx: 100, offsety: 150, type:2, subtype:5, iconcls:'gradient-radial-center'} + { type:2, subtype:5} ]; this.btnDirection = new Common.UI.Button({ diff --git a/apps/documenteditor/main/resources/less/rightmenu.less b/apps/documenteditor/main/resources/less/rightmenu.less index 1f30fc168..c6510e63c 100644 --- a/apps/documenteditor/main/resources/less/rightmenu.less +++ b/apps/documenteditor/main/resources/less/rightmenu.less @@ -47,45 +47,6 @@ margin-right: 62px !important; } -.item-gradient-separator { - margin-right: 62px !important; -} - -.gradient-left-top { - background: linear-gradient(to bottom right, #000, #fff); -} - -.gradient-top { - background: linear-gradient(to bottom, #000, #fff); -} - -.gradient-right-top { - background: linear-gradient(to bottom left, #000, #fff); -} - -.gradient-left { - background: linear-gradient(to right, #000, #fff); -} - -.gradient-right { - background: linear-gradient(to left, #000, #fff); -} - -.gradient-left-bottom { - background: linear-gradient(to top right, #000, #fff); -} - -.gradient-bottom { - background: linear-gradient(to top, #000, #fff); -} - -.gradient-right-bottom { - background: linear-gradient(to top left, #000, #fff); -} - -.gradient-radial-center { - background: radial-gradient( #000 , #fff 70%); -} #signature-requested-sign, #signature-valid-sign, diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index e378c4f91..8192a55bc 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -1286,18 +1286,18 @@ define([ this.fillControls.push(this.cmbGradType); this._viewDataLinear = [ - { offsetx: 0, offsety: 0, type:45, subtype:-1, iconcls:'gradient-left-top' }, - { offsetx: 50, offsety: 0, type:90, subtype:4, iconcls:'gradient-top'}, - { offsetx: 100, offsety: 0, type:135, subtype:5, iconcls:'gradient-right-top'}, - { offsetx: 0, offsety: 50, type:0, subtype:6, iconcls:'gradient-left', cls: 'item-gradient-separator', selected: true}, - { offsetx: 100, offsety: 50, type:180, subtype:1, iconcls:'gradient-right'}, - { offsetx: 0, offsety: 100, type:315, subtype:2, iconcls:'gradient-left-bottom'}, - { offsetx: 50, offsety: 100, type:270, subtype:3, iconcls:'gradient-bottom'}, - { offsetx: 100, offsety: 100, type:225, subtype:7, iconcls:'gradient-right-bottom'} + { type:45, subtype:-1}, + { type:90, subtype:4}, + { type:135, subtype:5}, + { type:0, subtype:6, cls: 'item-gradient-separator', selected: true}, + { type:180, subtype:1}, + { type:315, subtype:2}, + { type:270, subtype:3}, + { type:225, subtype:7} ]; this._viewDataRadial = [ - { offsetx: 100, offsety: 150, type:2, subtype:5, iconcls:'gradient-radial-center'} + { type:2, subtype:5} ]; this.btnDirection = new Common.UI.Button({ diff --git a/apps/presentationeditor/main/app/view/SlideSettings.js b/apps/presentationeditor/main/app/view/SlideSettings.js index ac73297c6..f7a7e23da 100644 --- a/apps/presentationeditor/main/app/view/SlideSettings.js +++ b/apps/presentationeditor/main/app/view/SlideSettings.js @@ -788,18 +788,18 @@ define([ this.FillItems.push(this.cmbGradType); this._viewDataLinear = [ - { offsetx: 0, offsety: 0, type:45, subtype:-1, iconcls:'gradient-left-top' }, - { offsetx: 50, offsety: 0, type:90, subtype:4, iconcls:'gradient-top'}, - { offsetx: 100, offsety: 0, type:135, subtype:5, iconcls:'gradient-right-top'}, - { offsetx: 0, offsety: 50, type:0, subtype:6, iconcls:'gradient-left', cls: 'item-gradient-separator', selected: true}, - { offsetx: 100, offsety: 50, type:180, subtype:1, iconcls:'gradient-right'}, - { offsetx: 0, offsety: 100, type:315, subtype:2, iconcls:'gradient-left-bottom'}, - { offsetx: 50, offsety: 100, type:270, subtype:3, iconcls:'gradient-bottom'}, - { offsetx: 100, offsety: 100, type:225, subtype:7, iconcls:'gradient-right-bottom'} + { type:45, subtype:-1}, + { type:90, subtype:4}, + { type:135, subtype:5}, + { type:0, subtype:6, cls: 'item-gradient-separator', selected: true}, + { type:180, subtype:1}, + { type:315, subtype:2}, + { type:270, subtype:3}, + { type:225, subtype:7} ]; this._viewDataRadial = [ - { offsetx: 100, offsety: 150, type:2, subtype:5, iconcls:'gradient-radial-center'} + { type:2, subtype:5} ]; this.btnDirection = new Common.UI.Button({ diff --git a/apps/presentationeditor/main/resources/less/rightmenu.less b/apps/presentationeditor/main/resources/less/rightmenu.less index a580a64ed..c4aa9546f 100644 --- a/apps/presentationeditor/main/resources/less/rightmenu.less +++ b/apps/presentationeditor/main/resources/less/rightmenu.less @@ -41,46 +41,6 @@ margin-right: 62px !important; } -.item-gradient-separator { - margin-right: 62px !important; -} - -.gradient-left-top { - background: linear-gradient(to bottom right, #000, #fff); -} - -.gradient-top { - background: linear-gradient(to bottom, #000, #fff); -} - -.gradient-right-top { - background: linear-gradient(to bottom left, #000, #fff); -} - -.gradient-left { - background: linear-gradient(to right, #000, #fff); -} - -.gradient-right { - background: linear-gradient(to left, #000, #fff); -} - -.gradient-left-bottom { - background: linear-gradient(to top right, #000, #fff); -} - -.gradient-bottom { - background: linear-gradient(to top, #000, #fff); -} - -.gradient-right-bottom { - background: linear-gradient(to top left, #000, #fff); -} - -.gradient-radial-center { - background: radial-gradient( #000 , #fff 70%); -} - #signature-requested-sign, #signature-valid-sign, #signature-invalid-sign { diff --git a/apps/spreadsheeteditor/main/app/view/CellSettings.js b/apps/spreadsheeteditor/main/app/view/CellSettings.js index a342ffa11..043785507 100644 --- a/apps/spreadsheeteditor/main/app/view/CellSettings.js +++ b/apps/spreadsheeteditor/main/app/view/CellSettings.js @@ -232,14 +232,14 @@ define([ this.cmbGradType.on('selected', _.bind(this.onGradTypeSelect, this));*/ this._viewDataLinear = [ - { offsetx: 0, offsety: 0, type:45, subtype:-1, iconcls:'gradient-left-top' }, - { offsetx: 50, offsety: 0, type:90, subtype:4, iconcls:'gradient-top'}, - { offsetx: 100, offsety: 0, type:135, subtype:5, iconcls:'gradient-right-top'}, - { offsetx: 0, offsety: 50, type:0, subtype:6, iconcls:'gradient-left', cls: 'item-gradient-separator', selected: true}, - { offsetx: 100, offsety: 50, type:180, subtype:1, iconcls:'gradient-right'}, - { offsetx: 0, offsety: 100, type:315, subtype:2, iconcls:'gradient-left-bottom'}, - { offsetx: 50, offsety: 100, type:270, subtype:3, iconcls:'gradient-bottom'}, - { offsetx: 100, offsety: 100, type:225, subtype:7, iconcls:'gradient-right-bottom'} + { offsetx: 0, offsety: 0, type:45, subtype:-1}, + { offsetx: 50, offsety: 0, type:90, subtype:4}, + { offsetx: 100, offsety: 0, type:135, subtype:5}, + { offsetx: 0, offsety: 50, type:0, subtype:6, cls: 'item-gradient-separator', selected: true}, + { offsetx: 100, offsety: 50, type:180, subtype:1}, + { offsetx: 0, offsety: 100, type:315, subtype:2}, + { offsetx: 50, offsety: 100, type:270, subtype:3}, + { offsetx: 100, offsety: 100, type:225, subtype:7} ]; this.btnDirection = new Common.UI.Button({ @@ -262,7 +262,7 @@ define([ parentMenu: btn.menu, restoreHeight: 174, store: new Common.UI.DataViewStore(me._viewDataLinear), - itemTemplate: _.template('
') + itemTemplate: _.template('
') }); }); this.btnDirection.render($('#cell-button-direction')); diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js index ecf7f9d93..172febc67 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js @@ -1303,18 +1303,18 @@ define([ this.fillControls.push(this.cmbGradType); this._viewDataLinear = [ - { offsetx: 0, offsety: 0, type:45, subtype:-1, iconcls:'gradient-left-top' }, - { offsetx: 50, offsety: 0, type:90, subtype:4, iconcls:'gradient-top'}, - { offsetx: 100, offsety: 0, type:135, subtype:5, iconcls:'gradient-right-top'}, - { offsetx: 0, offsety: 50, type:0, subtype:6, iconcls:'gradient-left', cls: 'item-gradient-separator', selected: true}, - { offsetx: 100, offsety: 50, type:180, subtype:1, iconcls:'gradient-right'}, - { offsetx: 0, offsety: 100, type:315, subtype:2, iconcls:'gradient-left-bottom'}, - { offsetx: 50, offsety: 100, type:270, subtype:3, iconcls:'gradient-bottom'}, - { offsetx: 100, offsety: 100, type:225, subtype:7, iconcls:'gradient-right-bottom'} + { type:45, subtype:-1}, + { type:90, subtype:4}, + { type:135, subtype:5}, + { type:0, subtype:6, cls: 'item-gradient-separator', selected: true}, + { type:180, subtype:1}, + { type:315, subtype:2}, + { type:270, subtype:3}, + { type:225, subtype:7} ]; this._viewDataRadial = [ - { offsetx: 100, offsety: 150, type:2, subtype:5, iconcls:'gradient-radial-center'} + { type:2, subtype:5} ]; this.btnDirection = new Common.UI.Button({ diff --git a/apps/spreadsheeteditor/main/resources/less/rightmenu.less b/apps/spreadsheeteditor/main/resources/less/rightmenu.less index 98c95f832..2301d2d97 100644 --- a/apps/spreadsheeteditor/main/resources/less/rightmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/rightmenu.less @@ -35,46 +35,6 @@ margin-right: 62px !important; } -.item-gradient-separator { - margin-right: 62px !important; -} - -.gradient-left-top { - background: linear-gradient(to bottom right, #000, #fff); -} - -.gradient-top { - background: linear-gradient(to bottom, #000, #fff); -} - -.gradient-right-top { - background: linear-gradient(to bottom left, #000, #fff); -} - -.gradient-left { - background: linear-gradient(to right, #000, #fff); -} - -.gradient-right { - background: linear-gradient(to left, #000, #fff); -} - -.gradient-left-bottom { - background: linear-gradient(to top right, #000, #fff); -} - -.gradient-bottom { - background: linear-gradient(to top, #000, #fff); -} - -.gradient-right-bottom { - background: linear-gradient(to top left, #000, #fff); -} - -.gradient-radial-center { - background: radial-gradient( #000 , #fff 70%); -} - .item-wrap { width:50px; height:50px;