diff --git a/frappe/public/js/frappe/views/workspace/blocks/block.js b/frappe/public/js/frappe/views/workspace/blocks/block.js index fd8ad9f45f..aed3c2f727 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/block.js +++ b/frappe/public/js/frappe/views/workspace/blocks/block.js @@ -31,10 +31,6 @@ export default class Block { rendered() { var e = this.wrapper.closest('.ce-block'); e.classList.add("col-" + this.get_col()); - e.classList.add("pt-" + this.pt); - e.classList.add("pr-" + this.pr); - e.classList.add("pb-" + this.pb); - e.classList.add("pl-" + this.pl); } new(block, widget_type = block) { @@ -116,36 +112,4 @@ export default class Block { } return col; } - - get_padding() { - let direction = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; - let padding = 0; - let pad_name = "p" + direction + "-0"; - let wrapper = this.wrapper.closest('.ce-block'); - let pad_left = new RegExp(/\pl-.+?\b/, "g"); - let pad_right = new RegExp(/\pr-.+?\b/, "g"); - let pad_top = new RegExp(/\pt-.+?\b/, "g"); - let pad_bottom = new RegExp(/\pb-.+?\b/, "g"); - - const get_padding = (pad_direction) => { - if (wrapper.className.match(pad_direction)) { - wrapper.classList.forEach(function (cn) { - cn.match(pad_direction) && (pad_name = cn); - }); - let parts = pad_name.split("-"); - padding = parseInt(parts[1]); - } - }; - - if ("l" == direction) { - get_padding(pad_left); - } else if ("r" == direction) { - get_padding(pad_right); - } else if ("t" == direction) { - get_padding(pad_top); - } else if ("b" == direction) { - get_padding(pad_bottom); - } - return padding; - } } \ No newline at end of file diff --git a/frappe/public/js/frappe/views/workspace/blocks/card.js b/frappe/public/js/frappe/views/workspace/blocks/card.js index 269952b504..975b32eea7 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/card.js +++ b/frappe/public/js/frappe/views/workspace/blocks/card.js @@ -15,10 +15,6 @@ export default class Card extends Block { super({ data, api, config, readOnly, block }); this.sections = {}; this.col = this.data.col ? this.data.col : "12"; - this.pt = this.data.pt ? this.data.pt : "0"; - this.pr = this.data.pr ? this.data.pr : "0"; - this.pb = this.data.pb ? this.data.pb : "0"; - this.pl = this.data.pl ? this.data.pl : "0"; this.allow_customization = !this.readOnly; this.options = { allow_sorting: this.allow_customization, @@ -57,10 +53,6 @@ export default class Card extends Block { return { card_name: blockContent.getAttribute('card_name'), col: this.get_col(), - pt: this.get_padding("t"), - pr: this.get_padding("r"), - pb: this.get_padding("b"), - pl: this.get_padding("l"), new: this.new_block_widget }; } diff --git a/frappe/public/js/frappe/views/workspace/blocks/chart.js b/frappe/public/js/frappe/views/workspace/blocks/chart.js index 30a576d0a9..e41063e6fc 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/chart.js +++ b/frappe/public/js/frappe/views/workspace/blocks/chart.js @@ -14,10 +14,6 @@ export default class Chart extends Block { constructor({ data, api, config, readOnly, block }) { super({ data, api, config, readOnly, block }); this.col = this.data.col ? this.data.col : "12"; - this.pt = this.data.pt ? this.data.pt : "0"; - this.pr = this.data.pr ? this.data.pr : "0"; - this.pb = this.data.pb ? this.data.pb : "0"; - this.pl = this.data.pl ? this.data.pl : "0"; this.allow_customization = !this.readOnly; this.options = { allow_sorting: this.allow_customization, @@ -57,10 +53,6 @@ export default class Chart extends Block { return { chart_name: blockContent.getAttribute('chart_name'), col: this.get_col(), - pt: this.get_padding("t"), - pr: this.get_padding("r"), - pb: this.get_padding("b"), - pl: this.get_padding("l"), new: this.new_block_widget }; } diff --git a/frappe/public/js/frappe/views/workspace/blocks/header.js b/frappe/public/js/frappe/views/workspace/blocks/header.js index 0f03437298..356f9c3244 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/header.js +++ b/frappe/public/js/frappe/views/workspace/blocks/header.js @@ -18,10 +18,6 @@ export default class Header extends Block { this.data = data; this.col = this.data.col ? this.data.col : "12"; - this.pt = this.data.pt ? this.data.pt : "0"; - this.pr = this.data.pr ? this.data.pr : "0"; - this.pb = this.data.pb ? this.data.pb : "0"; - this.pl = this.data.pl ? this.data.pl : "0"; } normalizeData(data) { @@ -34,10 +30,6 @@ export default class Header extends Block { newData.text = data.text || ''; newData.level = parseInt(data.level) || this.defaultLevel.number; newData.col = parseInt(data.col) || 12; - newData.pt = parseInt(data.pt) || 0; - newData.pr = parseInt(data.pr) || 0; - newData.pb = parseInt(data.pb) || 0; - newData.pl = parseInt(data.pl) || 0; return newData; } @@ -159,21 +151,13 @@ export default class Header extends Block { return { text: toolsContent.innerText, level: this.currentLevel.number, - col: this.get_col(), - pt: this.get_padding("t"), - pr: this.get_padding("r"), - pb: this.get_padding("b"), - pl: this.get_padding("l") + col: this.get_col() }; } rendered() { var e = this._element.closest('.ce-block'); e.classList.add("col-" + this.get_col()); - e.classList.add("pt-" + this.pt); - e.classList.add("pr-" + this.pr); - e.classList.add("pb-" + this.pb); - e.classList.add("pl-" + this.pl); } static get conversionConfig() { diff --git a/frappe/public/js/frappe/views/workspace/blocks/onboarding.js b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js index a73f4f6b0e..7176b7726d 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/onboarding.js +++ b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js @@ -15,10 +15,6 @@ export default class Onboarding extends Block { constructor({ data, api, config, readOnly, block }) { super({ data, api, config, readOnly, block }); this.col = this.data.col ? this.data.col : "12"; - this.pt = this.data.pt ? this.data.pt : "0"; - this.pr = this.data.pr ? this.data.pr : "0"; - this.pb = this.data.pb ? this.data.pb : "0"; - this.pl = this.data.pl ? this.data.pl : "0"; this.allow_customization = !this.readOnly; this.options = { allow_sorting: this.allow_customization, @@ -35,10 +31,6 @@ export default class Onboarding extends Block { $(e).hide(); } e.classList.add("col-" + this.get_col()); - e.classList.add("pt-" + this.pt); - e.classList.add("pr-" + this.pr); - e.classList.add("pb-" + this.pb); - e.classList.add("pl-" + this.pl); } new(block, widget_type = block) { @@ -131,10 +123,6 @@ export default class Onboarding extends Block { return { onboarding_name: blockContent.getAttribute('onboarding_name'), col: this.get_col(), - pt: this.get_padding("t"), - pr: this.get_padding("r"), - pb: this.get_padding("b"), - pl: this.get_padding("l"), new: this.new_block_widget }; } diff --git a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js index 9ee6d4bd03..b594f3459a 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js +++ b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js @@ -24,10 +24,6 @@ export default class Paragraph extends Block { this.data = data; this.col = this.data.col ? this.data.col : "12"; - this.pt = this.data.pt ? this.data.pt : "0"; - this.pr = this.data.pr ? this.data.pr : "0"; - this.pb = this.data.pb ? this.data.pb : "0"; - this.pl = this.data.pl ? this.data.pl : "0"; } onKeyUp(e) { @@ -132,20 +128,12 @@ export default class Paragraph extends Block { return { text: toolsContent.innerText, col: this.get_col(), - pt: this.get_padding("t"), - pr: this.get_padding("r"), - pb: this.get_padding("b"), - pl: this.get_padding("l") }; } rendered() { var e = this._element.closest('.ce-block'); e.classList.add("col-" + this.get_col()); - e.classList.add("pt-" + this.pt); - e.classList.add("pr-" + this.pr); - e.classList.add("pb-" + this.pb); - e.classList.add("pl-" + this.pl); } onPaste(event) { diff --git a/frappe/public/js/frappe/views/workspace/blocks/shortcut.js b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js index 1701431899..0943de202d 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/shortcut.js +++ b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js @@ -14,10 +14,6 @@ export default class Shortcut extends Block { constructor({ data, api, config, readOnly, block }) { super({ data, api, config, readOnly, block }); this.col = this.data.col ? this.data.col : "12"; - this.pt = this.data.pt ? this.data.pt : "0"; - this.pr = this.data.pr ? this.data.pr : "0"; - this.pb = this.data.pb ? this.data.pb : "0"; - this.pl = this.data.pl ? this.data.pl : "0"; this.allow_customization = !this.readOnly; this.options = { allow_sorting: this.allow_customization, @@ -55,10 +51,6 @@ export default class Shortcut extends Block { return { shortcut_name: blockContent.getAttribute('shortcut_name'), col: this.get_col(), - pt: this.get_padding("t"), - pr: this.get_padding("r"), - pb: this.get_padding("b"), - pl: this.get_padding("l"), new: this.new_block_widget }; } diff --git a/frappe/public/js/frappe/views/workspace/blocks/spacer.js b/frappe/public/js/frappe/views/workspace/blocks/spacer.js index 5994d49057..3309cad4a4 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/spacer.js +++ b/frappe/public/js/frappe/views/workspace/blocks/spacer.js @@ -14,10 +14,6 @@ export default class Spacer extends Block { constructor({ data, api, config, readOnly }) { super({ data, api, config, readOnly }); this.col = this.data.col ? this.data.col : "12"; - this.pt = this.data.pt ? this.data.pt : "0"; - this.pr = this.data.pr ? this.data.pr : "0"; - this.pb = this.data.pb ? this.data.pb : "0"; - this.pl = this.data.pl ? this.data.pl : "0"; } render() { @@ -80,11 +76,7 @@ export default class Spacer extends Block { save() { return { - col: this.get_col(), - pt: this.get_padding("t"), - pr: this.get_padding("r"), - pb: this.get_padding("b"), - pl: this.get_padding("l") + col: this.get_col() }; } } \ No newline at end of file diff --git a/frappe/public/js/frappe/views/workspace/blocks/spacing_tune.js b/frappe/public/js/frappe/views/workspace/blocks/spacing_tune.js index d69f39c875..8c4839d484 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/spacing_tune.js +++ b/frappe/public/js/frappe/views/workspace/blocks/spacing_tune.js @@ -12,7 +12,7 @@ export default class SpacingTune { sidebar: 'cdx-settings-sidebar', animation: 'wobble', }; - this.data = { colWidth: 12, pl: 0, pr: 0, pt: 0, pb: 0 }; + this.data = { colWidth: 12 }; this.wrapper = undefined; this.sidebar = undefined; } @@ -25,27 +25,10 @@ export default class SpacingTune { decreaseWidthButton.classList.add(this.CSS.button); let increaseWidthButton = document.createElement('div'); increaseWidthButton.classList.add(this.CSS.button); - let paddingButton = document.createElement('div'); - paddingButton.classList.add(this.CSS.button); - layoutWrapper.appendChild(paddingButton); layoutWrapper.appendChild(decreaseWidthButton); layoutWrapper.appendChild(increaseWidthButton); - // paddingButton.appendChild($.svg('padding', 15, 15)); - paddingButton.innerHTML = ``; - this.api.tooltip.onHover(paddingButton, 'Padding', { - placement: 'top', - hidingDelay: 500, - }); - this.api.listeners.on( - paddingButton, - 'click', - () => me.showPadding(paddingButton), - false - ); - - // decreaseWidthButton.appendChild($.svg('decrease-width', 15, 15)); decreaseWidthButton.innerHTML = ``; this.api.tooltip.onHover(decreaseWidthButton, 'Shrink', { placement: 'top', @@ -58,7 +41,6 @@ export default class SpacingTune { false ); - // increaseWidthButton.appendChild(); increaseWidthButton.innerHTML = ``; this.api.tooltip.onHover(increaseWidthButton, 'Expand', { placement: 'top', @@ -89,7 +71,6 @@ export default class SpacingTune { let currentBlockElement = currentBlock.holder; - // let block = this.api.blocks.getBlock(currentBlockElement); let className = 'col-12'; let colClass = new RegExp(/\bcol-.+?\b/, 'g'); if (currentBlockElement.className.match(colClass)) { @@ -122,7 +103,6 @@ export default class SpacingTune { const currentBlockElement = currentBlock.holder; - // let block = this.api.blocks.getBlock(currentBlockElement); let className = 'col-12'; const colClass = new RegExp(/\bcol-.+?\b/, 'g'); if (currentBlockElement.className.match(colClass)) { @@ -140,427 +120,4 @@ export default class SpacingTune { } } } - - showPadding(button) { - let me = this; - if (button.classList.contains('cdx-settings-button--active')) { - this.sidebar.remove(); - button.classList.remove('cdx-settings-button--active'); - } else { - button.classList.add('cdx-settings-button--active'); - - let sidebarWrapper = document.createElement('div'); - sidebarWrapper.classList.add(this.CSS.sidebar); - - let paddingLeftCaption = document.createElement('button'); - paddingLeftCaption.classList.add(this.CSS.button, 'disabled'); - // paddingLeftCaption.appendChild($.svg('arrow-left', 10, 10)); - paddingLeftCaption.innerHTML = ``; - - let paddingRightCaption = document.createElement('button'); - paddingRightCaption.classList.add(this.CSS.button, 'disabled'); - // paddingRightCaption.appendChild($.svg('arrow-right', 10, 10)); - paddingRightCaption.innerHTML = ``; - - let paddingTopCaption = document.createElement('button'); - paddingTopCaption.classList.add(this.CSS.button, 'disabled'); - // paddingTopCaption.appendChild($.svg('arrow-up', 10, 10)); - paddingTopCaption.innerHTML = ``; - - let paddingBottomCaption = document.createElement('button'); - paddingBottomCaption.classList.add(this.CSS.button, 'disabled'); - // paddingBottomCaption.appendChild($.svg('arrow-down', 10, 10)); - paddingBottomCaption.innerHTML = ``; - - let increasePaddingLeft = document.createElement('button'); - increasePaddingLeft.classList.add(this.CSS.button); - - let decreasePaddingLeft = document.createElement('button'); - decreasePaddingLeft.classList.add(this.CSS.button); - - let increasePaddingRight = document.createElement('button'); - increasePaddingRight.classList.add(this.CSS.button); - - let decreasePaddingRight = document.createElement('button'); - decreasePaddingRight.classList.add(this.CSS.button); - - let increasePaddingTop = document.createElement('button'); - increasePaddingTop.classList.add(this.CSS.button); - - let decreasePaddingTop = document.createElement('button'); - decreasePaddingTop.classList.add(this.CSS.button); - - let increasePaddingBottom = document.createElement('button'); - increasePaddingBottom.classList.add(this.CSS.button); - - let decreasePaddingBottom = document.createElement('button'); - decreasePaddingBottom.classList.add(this.CSS.button); - - this.sidebar = sidebarWrapper; - - // Left Padding - sidebarWrapper.appendChild(paddingLeftCaption); - - // increasePaddingLeft.appendChild($.svg('plus', 15, 15)); - increasePaddingLeft.innerHTML = ``; - - this.api.listeners.on( - increasePaddingLeft, - 'click', - () => me.increasePaddingLeft(), - false - ); - sidebarWrapper.appendChild(increasePaddingLeft); - - // decreasePaddingLeft.appendChild($.svg('minus', 15, 15)); - decreasePaddingLeft.innerHTML = ``; - - this.api.listeners.on( - decreasePaddingLeft, - 'click', - () => me.decreasePaddingLeft(), - false - ); - sidebarWrapper.appendChild(decreasePaddingLeft); - - // Right Padding - sidebarWrapper.appendChild(paddingRightCaption); - // increasePaddingRight.appendChild($.svg('plus', 15, 15)); - increasePaddingRight.innerHTML = ``; - - this.api.listeners.on( - increasePaddingRight, - 'click', - () => me.increasePaddingRight(), - false - ); - sidebarWrapper.appendChild(increasePaddingRight); - - // decreasePaddingRight.appendChild($.svg('minus', 15, 15)); - decreasePaddingRight.innerHTML = ``; - - this.api.listeners.on( - decreasePaddingRight, - 'click', - () => me.decreasePaddingRight(), - false - ); - sidebarWrapper.appendChild(decreasePaddingRight); - - // Top Padding - sidebarWrapper.appendChild(paddingTopCaption); - // increasePaddingTop.appendChild($.svg('plus', 15, 15)); - increasePaddingTop.innerHTML = ``; - - this.api.listeners.on( - increasePaddingTop, - 'click', - () => me.increasePaddingTop(), - false - ); - sidebarWrapper.appendChild(increasePaddingTop); - - // decreasePaddingTop.appendChild($.svg('minus', 15, 15)); - decreasePaddingTop.innerHTML = ``; - - this.api.listeners.on( - decreasePaddingTop, - 'click', - () => me.decreasePaddingTop(), - false - ); - sidebarWrapper.appendChild(decreasePaddingTop); - - // Bottom Padding - sidebarWrapper.appendChild(paddingBottomCaption); - // increasePaddingBottom.appendChild($.svg('plus', 15, 15)); - increasePaddingBottom.innerHTML = ``; - - this.api.listeners.on( - increasePaddingBottom, - 'click', - () => me.increasePaddingBottom(), - false - ); - sidebarWrapper.appendChild(increasePaddingBottom); - - // decreasePaddingBottom.appendChild($.svg('minus', 15, 15)); - decreasePaddingBottom.innerHTML = ``; - - this.api.listeners.on( - decreasePaddingBottom, - 'click', - () => me.decreasePaddingBottom(), - false - ); - sidebarWrapper.appendChild(decreasePaddingBottom); - - this.wrapper.appendChild(sidebarWrapper); - } - } - - increasePaddingLeft() { - const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - - if (currentBlockIndex < 0) { - return; - } - - const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock) { - return; - } - - const currentBlockElement = currentBlock.holder; - - // let block = this.api.blocks.getBlock(currentBlockElement); - let className = 'pl-0'; - const paddingClass = new RegExp(/\pl-.+?\b/, 'g'); - if (currentBlockElement.className.match(paddingClass)) { - currentBlockElement.classList.forEach( cn => { - if (cn.match(paddingClass)) { - className = cn; - } - }); - let parts = className.split('-'); - let padding = parseInt(parts[1]); - if (padding <= 4) { - currentBlockElement.classList.remove('pl-'+padding); - padding = padding + 1; - currentBlockElement.classList.add('pl-'+padding); - } - } - - } - - decreasePaddingLeft() { - const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - - if (currentBlockIndex < 0) { - return; - } - - const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock) { - return; - } - - const currentBlockElement = currentBlock.holder; - - // let block = this.api.blocks.getBlock(currentBlockElement); - let className = 'pl-0'; - const paddingClass = new RegExp(/\pl-.+?\b/, 'g'); - if (currentBlockElement.className.match(paddingClass)) { - currentBlockElement.classList.forEach( cn => { - if (cn.match(paddingClass)) { - className = cn; - } - }); - let parts = className.split('-'); - let padding = parseInt(parts[1]); - if (padding >= 1) { - currentBlockElement.classList.remove('pl-'+padding); - padding = padding - 1; - currentBlockElement.classList.add('pl-'+padding); - } - } - } - - increasePaddingRight() { - const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - - if (currentBlockIndex < 0) { - return; - } - - const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock) { - return; - } - - const currentBlockElement = currentBlock.holder; - - // let block = this.api.blocks.getBlock(currentBlockElement); - let className = 'pr-0'; - const paddingClass = new RegExp(/\pr-.+?\b/, 'g'); - if (currentBlockElement.className.match(paddingClass)) { - currentBlockElement.classList.forEach( cn => { - if (cn.match(paddingClass)) { - className = cn; - } - }); - let parts = className.split('-'); - let padding = parseInt(parts[1]); - if (padding <= 4) { - currentBlockElement.classList.remove('pr-'+padding); - padding = padding + 1; - currentBlockElement.classList.add('pr-'+padding); - } - } - } - - decreasePaddingRight() { - const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - - if (currentBlockIndex < 0) { - return; - } - - const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock) { - return; - } - - const currentBlockElement = currentBlock.holder; - - // let block = this.api.blocks.getBlock(currentBlockElement); - let className = 'pr-0'; - const paddingClass = new RegExp(/\pr-.+?\b/, 'g'); - if (currentBlockElement.className.match(paddingClass)) { - currentBlockElement.classList.forEach( cn => { - if (cn.match(paddingClass)) { - className = cn; - } - }); - let parts = className.split('-'); - let padding = parseInt(parts[1]); - if (padding >= 1) { - currentBlockElement.classList.remove('pr-'+padding); - padding = padding - 1; - currentBlockElement.classList.add('pr-'+padding); - } - } - } - - increasePaddingTop() { - const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - - if (currentBlockIndex < 0) { - return; - } - - const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock) { - return; - } - - const currentBlockElement = currentBlock.holder; - - // let block = this.api.blocks.getBlock(currentBlockElement); - let className = 'pt-0'; - const paddingClass = new RegExp(/\pt-.+?\b/, 'g'); - if (currentBlockElement.className.match(paddingClass)) { - currentBlockElement.classList.forEach( cn => { - if (cn.match(paddingClass)) { - className = cn; - } - }); - let parts = className.split('-'); - let padding = parseInt(parts[1]); - if (padding <= 4) { - currentBlockElement.classList.remove('pt-'+padding); - padding = padding + 1; - currentBlockElement.classList.add('pt-'+padding); - } - } - } - - decreasePaddingTop() { - const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - - if (currentBlockIndex < 0) { - return; - } - - const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock) { - return; - } - - const currentBlockElement = currentBlock.holder; - - // let block = this.api.blocks.getBlock(currentBlockElement); - let className = 'pt-0'; - const paddingClass = new RegExp(/\pt-.+?\b/, 'g'); - if (currentBlockElement.className.match(paddingClass)) { - currentBlockElement.classList.forEach( cn => { - if (cn.match(paddingClass)) { - className = cn; - } - }); - let parts = className.split('-'); - let padding = parseInt(parts[1]); - if (padding >= 1) { - currentBlockElement.classList.remove('pt-'+padding); - padding = padding - 1; - currentBlockElement.classList.add('pt-'+padding); - } - } - } - - increasePaddingBottom() { - const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - - if (currentBlockIndex < 0) { - return; - } - - const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock) { - return; - } - - const currentBlockElement = currentBlock.holder; - - // let block = this.api.blocks.getBlock(currentBlockElement); - let className = 'pb-0'; - const paddingClass = new RegExp(/\pb-.+?\b/, 'g'); - if (currentBlockElement.className.match(paddingClass)) { - currentBlockElement.classList.forEach( cn => { - if (cn.match(paddingClass)) { - className = cn; - } - }); - let parts = className.split('-'); - let padding = parseInt(parts[1]); - if (padding <= 4) { - currentBlockElement.classList.remove('pb-'+padding); - padding = padding + 1; - currentBlockElement.classList.add('pb-'+padding); - } - } - } - - decreasePaddingBottom() { - const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - - if (currentBlockIndex < 0) { - return; - } - - const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock) { - return; - } - - const currentBlockElement = currentBlock.holder; - - // let block = this.api.blocks.getBlock(currentBlockElement); - let className = 'pb-0'; - const paddingClass = new RegExp(/\pb-.+?\b/, 'g'); - if (currentBlockElement.className.match(paddingClass)) { - currentBlockElement.classList.forEach( cn => { - if (cn.match(paddingClass)) { - className = cn; - } - }); - let parts = className.split('-'); - let padding = parseInt(parts[1]); - if (padding >= 1) { - currentBlockElement.classList.remove('pb-'+padding); - padding = padding - 1; - currentBlockElement.classList.add('pb-'+padding); - } - } - } } \ No newline at end of file diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index e315704e3d..43639c2f4a 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -418,7 +418,7 @@ frappe.views.Workspace = class Workspace { me.editor.blocks.insert(key, {}, {}, index, true); me.editor.caret.setToLastBlock('start', 0); $('.ce-block:last-child')[0].scrollIntoView(); - }, `${frappe.utils.icon('small-add', 'xs')} ${__('Add Block')}`); + }, __('Add Block')); }); } diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss index 88dd7e14c2..0db526978f 100644 --- a/frappe/public/scss/desk/desktop.scss +++ b/frappe/public/scss/desk/desktop.scss @@ -983,7 +983,15 @@ body { .ce-settings { width: fit-content; - + + .ce-settings__button, .cdx-settings-button { + color: #707684; + } + + .cdx-settings-button--active { + color: #388ae5; + } + .cdx-settings-button.disabled{ pointer-events: none; opacity: .5