Skip to content

Commit

Permalink
Fix palette style
Browse files Browse the repository at this point in the history
  • Loading branch information
@JuliaRadzhabova
JuliaRadzhabova committed Dec 20, 2024
1 parent f4a59df commit 96b55db
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 3 deletions.
5 changes: 2 additions & 3 deletions apps/common/main/lib/component/ColorButton.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,8 @@ define([
cls: 'color-menu ' + (options.eyeDropper ? 'shifted-right' : 'shifted-left'),
additionalAlign: options.additionalAlign,
items: (options.additionalItemsBefore ? options.additionalItemsBefore : []).concat(auto).concat([
{ template: _.template('<div id="' + id + '-color-menu" style="width: ' + width + '; height:' + height + '; display: inline-block;"></div>') },
{caption: '--'}
]).concat(eyedropper).concat([
{ template: _.template('<div id="' + id + '-color-menu" style="width: ' + width + '; height:' + height + '; display: inline-block;"></div>') }
]).concat(options.hideColorsSeparator ? [] : {caption: '--'}).concat(eyedropper).concat([
{
id: id + '-color-new',
template: _.template('<a tabindex="-1" type="menuitem" style="">' + this.textNewColor + '</a>')
Expand Down
10 changes: 10 additions & 0 deletions apps/pdfeditor/main/app/view/DocumentHolderExt.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1492,6 +1492,7 @@ define([], function () {
colors: config.colors,
color: '3D8A44',
additionalItemsAfter: [
{caption: '--'},
new Common.UI.MenuItem({
template: _.template('<div class="custom-scale" data-stopPropagation="true"></div>'),
stopPropagation: true
Expand All @@ -1504,6 +1505,7 @@ define([], function () {
paletteCls: config.cls,
paletteWidth: config.paletteWidth,
storageSuffix: '-draw',
hideColorsSeparator: true,
hint: toolbar.textUnderline,
type: AscPDF.ANNOTATIONS_TYPES.Underline
});
Expand All @@ -1521,6 +1523,7 @@ define([], function () {
colors: config.colors,
color: 'D43230',
additionalItemsAfter: [
{caption: '--'},
new Common.UI.MenuItem({
template: _.template('<div class="custom-scale" data-stopPropagation="true"></div>'),
stopPropagation: true
Expand All @@ -1533,6 +1536,7 @@ define([], function () {
paletteCls: config.cls,
paletteWidth: config.paletteWidth,
storageSuffix: '-draw',
hideColorsSeparator: true,
hint: toolbar.textStrikeout,
type: AscPDF.ANNOTATIONS_TYPES.Strikeout
});
Expand All @@ -1547,6 +1551,7 @@ define([], function () {
split: true,
menu: true,
additionalItemsAfter: [
{caption: '--'},
new Common.UI.MenuItem({
template: _.template('<div class="custom-scale" data-stopPropagation="true"></div>'),
stopPropagation: true
Expand All @@ -1564,6 +1569,7 @@ define([], function () {
paletteCls: config.cls,
paletteWidth: config.paletteWidth,
storageSuffix: '-draw',
hideColorsSeparator: true,
hint: toolbar.textHighlight,
type: AscPDF.ANNOTATIONS_TYPES.Highlight
});
Expand Down Expand Up @@ -1622,6 +1628,7 @@ define([], function () {
],
color: 'FFFC54',
additionalItemsAfter: [
{caption: '--'},
new Common.UI.MenuItem({
template: _.template('<div class="custom-scale" data-stopPropagation="true"></div>'),
stopPropagation: true
Expand All @@ -1634,6 +1641,7 @@ define([], function () {
paletteCls: config.cls,
paletteWidth: config.paletteWidth,
storageSuffix: '-draw',
hideColorsSeparator: true,
hint: this.textColor
});
annotSelectBarBtns.push(this.btnStrokeHighlightColor);
Expand All @@ -1650,6 +1658,7 @@ define([], function () {
colors: config.colors,
color: '3D8A44',
additionalItemsAfter: [
{caption: '--'},
new Common.UI.MenuItem({
template: _.template('<div class="custom-scale" data-stopPropagation="true"></div>'),
stopPropagation: true
Expand All @@ -1662,6 +1671,7 @@ define([], function () {
paletteCls: config.cls,
paletteWidth: config.paletteWidth,
storageSuffix: '-draw',
hideColorsSeparator: true,
hint: this.textColor
});
annotSelectBarBtns.push(this.btnStrokeColor);
Expand Down
6 changes: 6 additions & 0 deletions apps/pdfeditor/main/app/view/Toolbar.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -901,6 +901,7 @@ define([
menu: true,
colorLine: false,
additionalItemsAfter: [
{caption: '--'},
new Common.UI.MenuItem({
template: _.template('<div class="custom-scale" data-stopPropagation="true"></div>'),
stopPropagation: true
Expand All @@ -915,6 +916,7 @@ define([
paletteCls: colorsconfig.cls,
paletteWidth: colorsconfig.paletteWidth,
storageSuffix: '-draw',
hideColorsSeparator: true,
dataHint: '1',
dataHintDirection: 'top',
dataHintOffset: '0, -16',
Expand All @@ -933,6 +935,7 @@ define([
menu: true,
colorLine: false,
additionalItemsAfter: [
{caption: '--'},
new Common.UI.MenuItem({
template: _.template('<div class="custom-scale" data-stopPropagation="true"></div>'),
stopPropagation: true
Expand All @@ -947,6 +950,7 @@ define([
paletteCls: colorsconfig.cls,
paletteWidth: colorsconfig.paletteWidth,
storageSuffix: '-draw',
hideColorsSeparator: true,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: '0, -16',
Expand All @@ -964,6 +968,7 @@ define([
split: true,
menu: true,
additionalItemsAfter: [
{caption: '--'},
new Common.UI.MenuItem({
template: _.template('<div class="custom-scale" data-stopPropagation="true"></div>'),
stopPropagation: true
Expand All @@ -981,6 +986,7 @@ define([
paletteCls: colorsconfig.cls,
paletteWidth: colorsconfig.paletteWidth,
storageSuffix: '-draw',
hideColorsSeparator: true,
type: AscPDF.ANNOTATIONS_TYPES.Highlight,
dataHint: '1',
dataHintDirection: 'top',
Expand Down

0 comments on commit 96b55db

Please sign in to comment.