diff --git a/apps/documenteditor/main/resources/img/controls/dimension-picker/dimension-highlighted.png b/apps/common/main/resources/img/dimension-picker/dimension-highlighted.png similarity index 100% rename from apps/documenteditor/main/resources/img/controls/dimension-picker/dimension-highlighted.png rename to apps/common/main/resources/img/dimension-picker/dimension-highlighted.png diff --git a/apps/documenteditor/main/resources/img/controls/dimension-picker/dimension-highlighted@2x.png b/apps/common/main/resources/img/dimension-picker/dimension-highlighted@2x.png similarity index 100% rename from apps/documenteditor/main/resources/img/controls/dimension-picker/dimension-highlighted@2x.png rename to apps/common/main/resources/img/dimension-picker/dimension-highlighted@2x.png diff --git a/apps/documenteditor/main/resources/img/controls/dimension-picker/dimension-unhighlighted.png b/apps/common/main/resources/img/dimension-picker/dimension-unhighlighted.png similarity index 100% rename from apps/documenteditor/main/resources/img/controls/dimension-picker/dimension-unhighlighted.png rename to apps/common/main/resources/img/dimension-picker/dimension-unhighlighted.png diff --git a/apps/documenteditor/main/resources/img/controls/dimension-picker/dimension-unhighlighted@2x.png b/apps/common/main/resources/img/dimension-picker/dimension-unhighlighted@2x.png similarity index 100% rename from apps/documenteditor/main/resources/img/controls/dimension-picker/dimension-unhighlighted@2x.png rename to apps/common/main/resources/img/dimension-picker/dimension-unhighlighted@2x.png diff --git a/apps/documenteditor/main/resources/img/right-panels/Begin-EndStyle.png b/apps/common/main/resources/img/right-panels/Begin-EndStyle.png similarity index 100% rename from apps/documenteditor/main/resources/img/right-panels/Begin-EndStyle.png rename to apps/common/main/resources/img/right-panels/Begin-EndStyle.png diff --git a/apps/documenteditor/main/resources/img/right-panels/Begin-EndStyle@2x.png b/apps/common/main/resources/img/right-panels/Begin-EndStyle@2x.png similarity index 100% rename from apps/documenteditor/main/resources/img/right-panels/Begin-EndStyle@2x.png rename to apps/common/main/resources/img/right-panels/Begin-EndStyle@2x.png diff --git a/apps/documenteditor/main/resources/img/right-panels/SmallBorders.png b/apps/common/main/resources/img/right-panels/SmallBorders.png similarity index 100% rename from apps/documenteditor/main/resources/img/right-panels/SmallBorders.png rename to apps/common/main/resources/img/right-panels/SmallBorders.png diff --git a/apps/documenteditor/main/resources/img/right-panels/SmallBorders@2x.png b/apps/common/main/resources/img/right-panels/SmallBorders@2x.png similarity index 100% rename from apps/documenteditor/main/resources/img/right-panels/SmallBorders@2x.png rename to apps/common/main/resources/img/right-panels/SmallBorders@2x.png diff --git a/apps/documenteditor/main/resources/img/right-panels/gradients.png b/apps/common/main/resources/img/right-panels/gradients.png similarity index 100% rename from apps/documenteditor/main/resources/img/right-panels/gradients.png rename to apps/common/main/resources/img/right-panels/gradients.png diff --git a/apps/documenteditor/main/resources/img/right-panels/gradients@2x.png b/apps/common/main/resources/img/right-panels/gradients@2x.png similarity index 100% rename from apps/documenteditor/main/resources/img/right-panels/gradients@2x.png rename to apps/common/main/resources/img/right-panels/gradients@2x.png diff --git a/apps/documenteditor/main/resources/img/right-panels/patterns.png b/apps/common/main/resources/img/right-panels/patterns.png similarity index 100% rename from apps/documenteditor/main/resources/img/right-panels/patterns.png rename to apps/common/main/resources/img/right-panels/patterns.png diff --git a/apps/documenteditor/main/resources/img/right-panels/patterns@2x.png b/apps/common/main/resources/img/right-panels/patterns@2x.png similarity index 100% rename from apps/documenteditor/main/resources/img/right-panels/patterns@2x.png rename to apps/common/main/resources/img/right-panels/patterns@2x.png diff --git a/apps/documenteditor/main/resources/img/right-panels/rowscols_icon.png b/apps/common/main/resources/img/right-panels/rowscols_icon.png similarity index 100% rename from apps/documenteditor/main/resources/img/right-panels/rowscols_icon.png rename to apps/common/main/resources/img/right-panels/rowscols_icon.png diff --git a/apps/documenteditor/main/resources/img/right-panels/rowscols_icon@2x.png b/apps/common/main/resources/img/right-panels/rowscols_icon@2x.png similarity index 100% rename from apps/documenteditor/main/resources/img/right-panels/rowscols_icon@2x.png rename to apps/common/main/resources/img/right-panels/rowscols_icon@2x.png diff --git a/apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering.png b/apps/common/main/resources/img/toolbar/bullets-and-numbering.png similarity index 100% rename from apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering.png rename to apps/common/main/resources/img/toolbar/bullets-and-numbering.png diff --git a/apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering@2x.png b/apps/common/main/resources/img/toolbar/bullets-and-numbering@2x.png similarity index 100% rename from apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering@2x.png rename to apps/common/main/resources/img/toolbar/bullets-and-numbering@2x.png diff --git a/apps/documenteditor/main/resources/img/toolbar/charttypes.png b/apps/common/main/resources/img/toolbar/charttypes.png similarity index 100% rename from apps/documenteditor/main/resources/img/toolbar/charttypes.png rename to apps/common/main/resources/img/toolbar/charttypes.png diff --git a/apps/documenteditor/main/resources/img/toolbar/charttypes@2x.png b/apps/common/main/resources/img/toolbar/charttypes@2x.png similarity index 100% rename from apps/documenteditor/main/resources/img/toolbar/charttypes@2x.png rename to apps/common/main/resources/img/toolbar/charttypes@2x.png diff --git a/apps/documenteditor/main/resources/img/toolbar/math.png b/apps/common/main/resources/img/toolbar/math.png similarity index 100% rename from apps/documenteditor/main/resources/img/toolbar/math.png rename to apps/common/main/resources/img/toolbar/math.png diff --git a/apps/documenteditor/main/resources/img/toolbar/math@2x.png b/apps/common/main/resources/img/toolbar/math@2x.png similarity index 100% rename from apps/documenteditor/main/resources/img/toolbar/math@2x.png rename to apps/common/main/resources/img/toolbar/math@2x.png diff --git a/apps/common/main/resources/less/dimension-picker.less b/apps/common/main/resources/less/dimension-picker.less index feb87653c..6738d6a17 100644 --- a/apps/common/main/resources/less/dimension-picker.less +++ b/apps/common/main/resources/less/dimension-picker.less @@ -21,12 +21,12 @@ .dimension-picker-unhighlighted { //background: transparent repeat scroll 0 0; - .background-ximage('@{app-image-path}/controls/dimension-picker/dimension-unhighlighted.png', '@{app-image-path}/controls/dimension-picker/dimension-unhighlighted@2x.png', 18px, auto, repeat); + .background-ximage('@{common-image-path}/dimension-picker/dimension-unhighlighted.png', '@{common-image-path}/dimension-picker/dimension-unhighlighted@2x.png', 18px, auto, repeat); } .dimension-picker div.dimension-picker-highlighted { //background: transparent repeat scroll 0 0; - .background-ximage('@{app-image-path}/controls/dimension-picker/dimension-highlighted.png', '@{app-image-path}/controls/dimension-picker/dimension-highlighted@2x.png', 18px, auto, repeat); + .background-ximage('@{common-image-path}/dimension-picker/dimension-highlighted.png', '@{common-image-path}/dimension-picker/dimension-highlighted@2x.png', 18px, auto, repeat); } .dimension-picker-status { diff --git a/apps/documenteditor/main/resources/img/right-panels/BorderSize.png b/apps/documenteditor/main/resources/img/right-panels/BorderSize.png deleted file mode 100644 index 82fc38c2f..000000000 Binary files a/apps/documenteditor/main/resources/img/right-panels/BorderSize.png and /dev/null differ diff --git a/apps/documenteditor/main/resources/less/advanced-settings.less b/apps/documenteditor/main/resources/less/advanced-settings.less index 374a3293f..d2a0168ae 100644 --- a/apps/documenteditor/main/resources/less/advanced-settings.less +++ b/apps/documenteditor/main/resources/less/advanced-settings.less @@ -67,7 +67,7 @@ } .img-arrows { - .background-ximage('@{app-image-path}/right-panels/Begin-EndStyle.png', '@{app-image-path}/right-panels/Begin-EndStyle@2x.png', 480px); + .background-ximage('@{common-image-path}/right-panels/Begin-EndStyle.png', '@{common-image-path}/right-panels/Begin-EndStyle@2x.png', 480px); } .item-arrow { diff --git a/apps/documenteditor/main/resources/less/rightmenu.less b/apps/documenteditor/main/resources/less/rightmenu.less index 90b026654..fd5ae8334 100644 --- a/apps/documenteditor/main/resources/less/rightmenu.less +++ b/apps/documenteditor/main/resources/less/rightmenu.less @@ -173,7 +173,7 @@ } .btn-toolbar:not(.x-huge) .icon:not(svg).btn-borders-small { - .background-ximage('@{app-image-path}/right-panels/SmallBorders.png', '@{app-image-path}/right-panels/SmallBorders@2x.png', 84px); + .background-ximage('@{common-image-path}/right-panels/SmallBorders.png', '@{common-image-path}/right-panels/SmallBorders@2x.png', 84px); } .button-normal-icon(btn-position-all, 0, 21px); @@ -191,7 +191,7 @@ .btn-edit-table, .btn-change-shape { - .background-ximage('@{app-image-path}/right-panels/rowscols_icon.png', '@{app-image-path}/right-panels/rowscols_icon@2x.png', 84px); + .background-ximage('@{common-image-path}/right-panels/rowscols_icon.png', '@{common-image-path}/right-panels/rowscols_icon@2x.png', 84px); margin-right: 2px !important; margin-bottom: 1px !important; } @@ -209,7 +209,7 @@ button.active:not(.disabled) .btn-change-shape, button:active:not(.disabled) .btn-change-shape {background-position: -56px -16px;} .combo-pattern-item { - .background-ximage('@{app-image-path}/right-panels/patterns.png', '@{app-image-path}/right-panels/patterns@2x.png', 112px); + .background-ximage('@{common-image-path}/right-panels/patterns.png', '@{common-image-path}/right-panels/patterns@2x.png', 112px); } .combo-dataview-menu { @@ -225,7 +225,7 @@ button:active:not(.disabled) .btn-change-shape {background-position: -56px - } .item-gradient { - .background-ximage('@{app-image-path}/right-panels/gradients.png', '@{app-image-path}/right-panels/gradients@2x.png', 150px); + .background-ximage('@{common-image-path}/right-panels/gradients.png', '@{common-image-path}/right-panels/gradients@2x.png', 150px); width:50px; height:50px; } diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index b27e7141f..6e08bd8a0 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -49,7 +49,7 @@ } .item-markerlist { - .background-ximage('@{app-image-path}/toolbar/bullets-and-numbering.png', '@{app-image-path}/toolbar/bullets-and-numbering@2x.png', 38px); + .background-ximage('@{common-image-path}/toolbar/bullets-and-numbering.png', '@{common-image-path}/toolbar/bullets-and-numbering@2x.png', 38px); width: 38px; height: 38px; } @@ -163,7 +163,7 @@ a.item-contents { } .item-chartlist { - .background-ximage('@{app-image-path}/toolbar/charttypes.png', '@{app-image-path}/toolbar/charttypes@2x.png', 250px); + .background-ximage('@{common-image-path}/toolbar/charttypes.png', '@{common-image-path}/toolbar/charttypes@2x.png', 250px); width: 50px; height: 50px; } @@ -418,7 +418,7 @@ a.item-contents { .item-equation { border: 1px solid @gray; - .background-ximage('@{app-image-path}/toolbar/math.png', '@{app-image-path}/toolbar/math@2x.png', 1500px); + .background-ximage('@{common-image-path}/toolbar/math.png', '@{common-image-path}/toolbar/math@2x.png', 1500px); } .save-style-container { diff --git a/apps/presentationeditor/main/resources/img/controls/dimension-picker/dimension-highlighted.png b/apps/presentationeditor/main/resources/img/controls/dimension-picker/dimension-highlighted.png deleted file mode 100644 index 918b26985..000000000 Binary files a/apps/presentationeditor/main/resources/img/controls/dimension-picker/dimension-highlighted.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/controls/dimension-picker/dimension-highlighted@2x.png b/apps/presentationeditor/main/resources/img/controls/dimension-picker/dimension-highlighted@2x.png deleted file mode 100644 index 8ce44ee7e..000000000 Binary files a/apps/presentationeditor/main/resources/img/controls/dimension-picker/dimension-highlighted@2x.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/controls/dimension-picker/dimension-unhighlighted.png b/apps/presentationeditor/main/resources/img/controls/dimension-picker/dimension-unhighlighted.png deleted file mode 100644 index 725da0220..000000000 Binary files a/apps/presentationeditor/main/resources/img/controls/dimension-picker/dimension-unhighlighted.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/controls/dimension-picker/dimension-unhighlighted@2x.png b/apps/presentationeditor/main/resources/img/controls/dimension-picker/dimension-unhighlighted@2x.png deleted file mode 100644 index 6fd80e2f2..000000000 Binary files a/apps/presentationeditor/main/resources/img/controls/dimension-picker/dimension-unhighlighted@2x.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/right-panels/Begin-EndStyle.png b/apps/presentationeditor/main/resources/img/right-panels/Begin-EndStyle.png deleted file mode 100644 index 762415a03..000000000 Binary files a/apps/presentationeditor/main/resources/img/right-panels/Begin-EndStyle.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/right-panels/Begin-EndStyle@2x.png b/apps/presentationeditor/main/resources/img/right-panels/Begin-EndStyle@2x.png deleted file mode 100644 index 0b05852d7..000000000 Binary files a/apps/presentationeditor/main/resources/img/right-panels/Begin-EndStyle@2x.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/right-panels/BorderSize.png b/apps/presentationeditor/main/resources/img/right-panels/BorderSize.png deleted file mode 100644 index 82fc38c2f..000000000 Binary files a/apps/presentationeditor/main/resources/img/right-panels/BorderSize.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/right-panels/SmallBorders.png b/apps/presentationeditor/main/resources/img/right-panels/SmallBorders.png deleted file mode 100644 index e2a9c02cf..000000000 Binary files a/apps/presentationeditor/main/resources/img/right-panels/SmallBorders.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/right-panels/SmallBorders@2x.png b/apps/presentationeditor/main/resources/img/right-panels/SmallBorders@2x.png deleted file mode 100644 index 58af0dba6..000000000 Binary files a/apps/presentationeditor/main/resources/img/right-panels/SmallBorders@2x.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/right-panels/gradients.png b/apps/presentationeditor/main/resources/img/right-panels/gradients.png deleted file mode 100644 index e3da621f9..000000000 Binary files a/apps/presentationeditor/main/resources/img/right-panels/gradients.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/right-panels/gradients@2x.png b/apps/presentationeditor/main/resources/img/right-panels/gradients@2x.png deleted file mode 100644 index e8ef9320d..000000000 Binary files a/apps/presentationeditor/main/resources/img/right-panels/gradients@2x.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/right-panels/patterns.png b/apps/presentationeditor/main/resources/img/right-panels/patterns.png deleted file mode 100644 index 4a5ba1ef5..000000000 Binary files a/apps/presentationeditor/main/resources/img/right-panels/patterns.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/right-panels/patterns@2x.png b/apps/presentationeditor/main/resources/img/right-panels/patterns@2x.png deleted file mode 100644 index 76c030e47..000000000 Binary files a/apps/presentationeditor/main/resources/img/right-panels/patterns@2x.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/right-panels/rowscols_icon.png b/apps/presentationeditor/main/resources/img/right-panels/rowscols_icon.png deleted file mode 100644 index 4936930c4..000000000 Binary files a/apps/presentationeditor/main/resources/img/right-panels/rowscols_icon.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/right-panels/rowscols_icon@2x.png b/apps/presentationeditor/main/resources/img/right-panels/rowscols_icon@2x.png deleted file mode 100644 index 113f8835b..000000000 Binary files a/apps/presentationeditor/main/resources/img/right-panels/rowscols_icon@2x.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/bullets-and-numbering.png b/apps/presentationeditor/main/resources/img/toolbar/bullets-and-numbering.png deleted file mode 100644 index 4a3eac619..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/bullets-and-numbering.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/bullets-and-numbering@2x.png b/apps/presentationeditor/main/resources/img/toolbar/bullets-and-numbering@2x.png deleted file mode 100644 index c73c54966..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/bullets-and-numbering@2x.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/charttypes.png b/apps/presentationeditor/main/resources/img/toolbar/charttypes.png deleted file mode 100644 index e13818e76..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/charttypes.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/charttypes@2x.png b/apps/presentationeditor/main/resources/img/toolbar/charttypes@2x.png deleted file mode 100644 index aac960d29..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/charttypes@2x.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/math.png b/apps/presentationeditor/main/resources/img/toolbar/math.png deleted file mode 100644 index 173efd6f9..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/math.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/math@2x.png b/apps/presentationeditor/main/resources/img/toolbar/math@2x.png deleted file mode 100644 index c3ca01890..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/math@2x.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/less/advanced-settings.less b/apps/presentationeditor/main/resources/less/advanced-settings.less index f638e4c86..b10a39d39 100644 --- a/apps/presentationeditor/main/resources/less/advanced-settings.less +++ b/apps/presentationeditor/main/resources/less/advanced-settings.less @@ -6,7 +6,7 @@ background-color: white; &.image { - .background-ximage('@{app-image-path}/right-panels/Begin-EndStyle.png', '@{app-image-path}/right-panels/Begin-EndStyle@2x.png', 480px); + .background-ximage('@{common-image-path}/right-panels/Begin-EndStyle.png', '@{common-image-path}/right-panels/Begin-EndStyle@2x.png', 480px); background-repeat: no-repeat; background-position: 10px 0; background-attachment: scroll; @@ -25,7 +25,7 @@ } .item-arrow { - .background-ximage('@{app-image-path}/right-panels/Begin-EndStyle.png', '@{app-image-path}/right-panels/Begin-EndStyle@2x.png', 480px); + .background-ximage('@{common-image-path}/right-panels/Begin-EndStyle.png', '@{common-image-path}/right-panels/Begin-EndStyle@2x.png', 480px); width:44px; height:20px; } diff --git a/apps/presentationeditor/main/resources/less/rightmenu.less b/apps/presentationeditor/main/resources/less/rightmenu.less index e80606dc1..3a09c2032 100644 --- a/apps/presentationeditor/main/resources/less/rightmenu.less +++ b/apps/presentationeditor/main/resources/less/rightmenu.less @@ -109,7 +109,7 @@ } .btn-toolbar:not(.x-huge) .icon:not(svg).btn-borders-small { - .background-ximage('@{app-image-path}/right-panels/SmallBorders.png', '@{app-image-path}/right-panels/SmallBorders@2x.png', 84px); + .background-ximage('@{common-image-path}/right-panels/SmallBorders.png', '@{common-image-path}/right-panels/SmallBorders@2x.png', 84px); } .button-normal-icon(btn-position-all, 0, 21px); @@ -127,7 +127,7 @@ .btn-edit-table, .btn-change-shape { - .background-ximage('@{app-image-path}/right-panels/rowscols_icon.png', '@{app-image-path}/right-panels/rowscols_icon@2x.png', 84px); + .background-ximage('@{common-image-path}/right-panels/rowscols_icon.png', '@{common-image-path}/right-panels/rowscols_icon@2x.png', 84px); margin-right: 2px !important; margin-bottom: 1px !important; } @@ -145,7 +145,7 @@ button.active:not(.disabled) .btn-change-shape, button:active:not(.disabled) .btn-change-shape {background-position: -56px -16px;} .combo-pattern-item { - .background-ximage('@{app-image-path}/right-panels/patterns.png', '@{app-image-path}/right-panels/patterns@2x.png', 112px); + .background-ximage('@{common-image-path}/right-panels/patterns.png', '@{common-image-path}/right-panels/patterns@2x.png', 112px); } .combo-dataview-menu { @@ -161,7 +161,7 @@ button:active:not(.disabled) .btn-change-shape {background-position: -56px - } .item-gradient { - .background-ximage('@{app-image-path}/right-panels/gradients.png', '@{app-image-path}/right-panels/gradients@2x.png', 150px); + .background-ximage('@{common-image-path}/right-panels/gradients.png', '@{common-image-path}/right-panels/gradients@2x.png', 150px); width:50px; height:50px; } diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less index d0fdeb364..f49b5a87a 100644 --- a/apps/presentationeditor/main/resources/less/toolbar.less +++ b/apps/presentationeditor/main/resources/less/toolbar.less @@ -61,7 +61,7 @@ } .item-markerlist { - .background-ximage('@{app-image-path}/toolbar/bullets-and-numbering.png', '@{app-image-path}/toolbar/bullets-and-numbering@2x.png', 38px); + .background-ximage('@{common-image-path}/toolbar/bullets-and-numbering.png', '@{common-image-path}/toolbar/bullets-and-numbering@2x.png', 38px); width: 38px; height: 38px; } @@ -119,7 +119,7 @@ } .item-chartlist { - .background-ximage('@{app-image-path}/toolbar/charttypes.png', '@{app-image-path}/toolbar/charttypes@2x.png', 250px); + .background-ximage('@{common-image-path}/toolbar/charttypes.png', '@{common-image-path}/toolbar/charttypes@2x.png', 250px); width: 50px; height: 50px; } @@ -345,7 +345,7 @@ .item-equation { border: 1px solid @gray; - .background-ximage('@{app-image-path}/toolbar/math.png', '@{app-image-path}/toolbar/math@2x.png', 1500px); + .background-ximage('@{common-image-path}/toolbar/math.png', '@{common-image-path}/toolbar/math@2x.png', 1500px); } #plugins-panel { diff --git a/apps/presentationeditor/main/resources/less/variables.less b/apps/presentationeditor/main/resources/less/variables.less index 9dc30a2bd..70bb29691 100644 --- a/apps/presentationeditor/main/resources/less/variables.less +++ b/apps/presentationeditor/main/resources/less/variables.less @@ -1,9 +1,6 @@ // Paths // ------------------------- -@app-image-path: "resources/img"; -@common-image-path: "../../common/main/resources/img"; - // Grays // ------------------------- diff --git a/apps/spreadsheeteditor/main/resources/img/charttypes.png b/apps/spreadsheeteditor/main/resources/img/charttypes.png deleted file mode 100644 index e13818e76..000000000 Binary files a/apps/spreadsheeteditor/main/resources/img/charttypes.png and /dev/null differ diff --git a/apps/spreadsheeteditor/main/resources/img/charttypes@2x.png b/apps/spreadsheeteditor/main/resources/img/charttypes@2x.png deleted file mode 100644 index aac960d29..000000000 Binary files a/apps/spreadsheeteditor/main/resources/img/charttypes@2x.png and /dev/null differ diff --git a/apps/spreadsheeteditor/main/resources/img/right-panels/Begin-EndStyle.png b/apps/spreadsheeteditor/main/resources/img/right-panels/Begin-EndStyle.png deleted file mode 100644 index 762415a03..000000000 Binary files a/apps/spreadsheeteditor/main/resources/img/right-panels/Begin-EndStyle.png and /dev/null differ diff --git a/apps/spreadsheeteditor/main/resources/img/right-panels/Begin-EndStyle@2x.png b/apps/spreadsheeteditor/main/resources/img/right-panels/Begin-EndStyle@2x.png deleted file mode 100644 index 525f43866..000000000 Binary files a/apps/spreadsheeteditor/main/resources/img/right-panels/Begin-EndStyle@2x.png and /dev/null differ diff --git a/apps/spreadsheeteditor/main/resources/img/right-panels/BorderSize.png b/apps/spreadsheeteditor/main/resources/img/right-panels/BorderSize.png deleted file mode 100644 index 82fc38c2f..000000000 Binary files a/apps/spreadsheeteditor/main/resources/img/right-panels/BorderSize.png and /dev/null differ diff --git a/apps/spreadsheeteditor/main/resources/img/right-panels/gradients.png b/apps/spreadsheeteditor/main/resources/img/right-panels/gradients.png deleted file mode 100644 index e3da621f9..000000000 Binary files a/apps/spreadsheeteditor/main/resources/img/right-panels/gradients.png and /dev/null differ diff --git a/apps/spreadsheeteditor/main/resources/img/right-panels/gradients@2x.png b/apps/spreadsheeteditor/main/resources/img/right-panels/gradients@2x.png deleted file mode 100644 index e8ef9320d..000000000 Binary files a/apps/spreadsheeteditor/main/resources/img/right-panels/gradients@2x.png and /dev/null differ diff --git a/apps/spreadsheeteditor/main/resources/img/right-panels/patterns.png b/apps/spreadsheeteditor/main/resources/img/right-panels/patterns.png deleted file mode 100644 index 3bb336203..000000000 Binary files a/apps/spreadsheeteditor/main/resources/img/right-panels/patterns.png and /dev/null differ diff --git a/apps/spreadsheeteditor/main/resources/img/right-panels/patterns@2x.png b/apps/spreadsheeteditor/main/resources/img/right-panels/patterns@2x.png deleted file mode 100644 index 76c030e47..000000000 Binary files a/apps/spreadsheeteditor/main/resources/img/right-panels/patterns@2x.png and /dev/null differ diff --git a/apps/spreadsheeteditor/main/resources/img/right-panels/rowscols_icon.png b/apps/spreadsheeteditor/main/resources/img/right-panels/rowscols_icon.png deleted file mode 100644 index 4936930c4..000000000 Binary files a/apps/spreadsheeteditor/main/resources/img/right-panels/rowscols_icon.png and /dev/null differ diff --git a/apps/spreadsheeteditor/main/resources/img/right-panels/rowscols_icon@2x.png b/apps/spreadsheeteditor/main/resources/img/right-panels/rowscols_icon@2x.png deleted file mode 100644 index 113f8835b..000000000 Binary files a/apps/spreadsheeteditor/main/resources/img/right-panels/rowscols_icon@2x.png and /dev/null differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/bullets-and-numbering.png b/apps/spreadsheeteditor/main/resources/img/toolbar/bullets-and-numbering.png deleted file mode 100644 index 4a3eac619..000000000 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/bullets-and-numbering.png and /dev/null differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/bullets-and-numbering@2x.png b/apps/spreadsheeteditor/main/resources/img/toolbar/bullets-and-numbering@2x.png deleted file mode 100644 index c73c54966..000000000 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/bullets-and-numbering@2x.png and /dev/null differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/math.png b/apps/spreadsheeteditor/main/resources/img/toolbar/math.png deleted file mode 100644 index 173efd6f9..000000000 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/math.png and /dev/null differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/math@2x.png b/apps/spreadsheeteditor/main/resources/img/toolbar/math@2x.png deleted file mode 100644 index c3ca01890..000000000 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/math@2x.png and /dev/null differ diff --git a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less index fdb80b807..bf14a990a 100644 --- a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less +++ b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less @@ -6,7 +6,7 @@ background-color: white; &.image { - .background-ximage('@{app-image-path}/right-panels/Begin-EndStyle.png', '@{app-image-path}/right-panels/Begin-EndStyle@2x.png', 480px); + .background-ximage('@{common-image-path}/right-panels/Begin-EndStyle.png', '@{common-image-path}/right-panels/Begin-EndStyle@2x.png', 480px); background-repeat: no-repeat; background-position: 10px 0; background-attachment: scroll; @@ -25,7 +25,7 @@ } .item-arrow { - .background-ximage('@{app-image-path}/right-panels/Begin-EndStyle.png', '@{app-image-path}/right-panels/Begin-EndStyle@2x.png', 480px); + .background-ximage('@{common-image-path}/right-panels/Begin-EndStyle.png', '@{common-image-path}/right-panels/Begin-EndStyle@2x.png', 480px); width:44px; height:20px; } diff --git a/apps/spreadsheeteditor/main/resources/less/rightmenu.less b/apps/spreadsheeteditor/main/resources/less/rightmenu.less index 67a9db4d5..60b531ca1 100644 --- a/apps/spreadsheeteditor/main/resources/less/rightmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/rightmenu.less @@ -104,7 +104,7 @@ .btn-edit-table, .btn-change-shape { - .background-ximage('@{app-image-path}/right-panels/rowscols_icon.png', '@{app-image-path}/right-panels/rowscols_icon@2x.png', 84px); + .background-ximage('@{common-image-path}/right-panels/rowscols_icon.png', '@{common-image-path}/right-panels/rowscols_icon@2x.png', 84px); margin-right: 2px !important; margin-bottom: 1px !important; } @@ -122,7 +122,7 @@ button.active:not(.disabled) .btn-change-shape, button:active:not(.disabled) .btn-change-shape {background-position: -56px -16px;} .combo-pattern-item { - .background-ximage('@{app-image-path}/right-panels/patterns.png', '@{app-image-path}/right-panels/patterns@2x.png', 112px); + .background-ximage('@{common-image-path}/right-panels/patterns.png', '@{common-image-path}/right-panels/patterns@2x.png', 112px); } .combo-dataview-menu { @@ -138,7 +138,7 @@ button:active:not(.disabled) .btn-change-shape {background-position: -56px - } .item-gradient { - .background-ximage('@{app-image-path}/right-panels/gradients.png', '@{app-image-path}/right-panels/gradients@2x.png', 150px); + .background-ximage('@{common-image-path}/right-panels/gradients.png', '@{common-image-path}/right-panels/gradients@2x.png', 150px); width:50px; height:50px; } @@ -202,7 +202,7 @@ button:active:not(.disabled) .btn-change-shape {background-position: -56px - } .item-chartlist { - .background-ximage('@{app-image-path}/charttypes.png', '@{app-image-path}/charttypes@2x.png', 250px); + .background-ximage('@{common-image-path}/toolbar/charttypes.png', '@{common-image-path}/toolbar/charttypes@2x.png', 250px); width: 50px; height: 50px; } diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less index 471457c7c..934805ee3 100644 --- a/apps/spreadsheeteditor/main/resources/less/toolbar.less +++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less @@ -241,7 +241,7 @@ .item-equation { border: 1px solid @gray; - .background-ximage('@{app-image-path}/toolbar/math.png', '@{app-image-path}/toolbar/math@2x.png', 1500px); + .background-ximage('@{common-image-path}/toolbar/math.png', '@{common-image-path}/toolbar/math@2x.png', 1500px); } #special-paste-container, @@ -261,7 +261,7 @@ } .item-markerlist { - .background-ximage('@{app-image-path}/toolbar/bullets-and-numbering.png', '@{app-image-path}/toolbar/bullets-and-numbering@2x.png', 38px); + .background-ximage('@{common-image-path}/toolbar/bullets-and-numbering.png', '@{common-image-path}/toolbar/bullets-and-numbering@2x.png', 38px); width: 38px; height: 38px; }