Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added style to col subtract button to fix issue #756 #758

Merged
merged 9 commits into from
Dec 7, 2021
Merged

Added style to col subtract button to fix issue #756 #758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
895574e
fixed row and column subtract buttons
NARUDESIGNS Nov 11, 2021
d3f03fb
Revert "fixed row and column subtract buttons"
NARUDESIGNS Nov 12, 2021
45aeea1
fixed rows and cols subtract buttons and reverted formtter (prettier)…
NARUDESIGNS Nov 12, 2021
cb4033c
used variable in decCols to avoid repetition
NARUDESIGNS Nov 13, 2021
d7e2a0a
added style to col subtract button for issue #756
NARUDESIGNS Nov 13, 2021
653d6bc
undo changes after running grunt build
NARUDESIGNS Nov 17, 2021
f01c028
reversed changes and fixed ONLY col button style
NARUDESIGNS Dec 4, 2021
1b2184b
Ran grunt command to update dist/Puliclab.Editor.js file
NARUDESIGNS Dec 6, 2021
820db33
Merge branch 'main' into add-style-to-col-subtract-button
jywarren Dec 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/PublicLab.Editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23347,7 +23347,7 @@ module.exports = function initTables(_module, wysiwyg) {
var builder = '<div class="form-inline form-group ple-table-popover" style="width:400px;">';
builder += '<a id="decRows" class="btn btn-sm btn-outline-secondary"><i class="fa fa-minus"></i></a> <span id="tableRows">4</span> <a id="incRows" class="btn btn-sm btn-outline-secondary"><i class="fa fa-plus"></i></a>';
builder += ' x ';
builder += '<a id="decCols" class="btn btn-sm btn-outline-secondaryt"><i class="fa fa-minus"></i></a> <span id="tableCols">3</span> <a id="incCols" class="btn btn-sm btn-outline-secondary"><i class="fa fa-plus"></i></a>';
builder += '<a id="decCols" class="btn btn-sm btn-outline-secondary"><i class="fa fa-minus"></i></a> <span id="tableCols">3</span> <a id="incCols" class="btn btn-sm btn-outline-secondary"><i class="fa fa-plus"></i></a>';
builder += '&nbsp;<a class="ple-table-size btn btn-outline-secondary">Add</a>';
builder += '</div>';

Expand Down
2 changes: 1 addition & 1 deletion src/modules/PublicLab.RichTextModule.Table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ module.exports = function initTables(_module, wysiwyg) {
var builder = '<div class="form-inline form-group ple-table-popover" style="width:400px;">';
builder += '<a id="decRows" class="btn btn-sm btn-outline-secondary"><i class="fa fa-minus"></i></a> <span id="tableRows">4</span> <a id="incRows" class="btn btn-sm btn-outline-secondary"><i class="fa fa-plus"></i></a>';
builder += ' x ';
builder += '<a id="decCols" class="btn btn-sm btn-outline-secondaryt"><i class="fa fa-minus"></i></a> <span id="tableCols">3</span> <a id="incCols" class="btn btn-sm btn-outline-secondary"><i class="fa fa-plus"></i></a>';
builder += '<a id="decCols" class="btn btn-sm btn-outline-secondary"><i class="fa fa-minus"></i></a> <span id="tableCols">3</span> <a id="incCols" class="btn btn-sm btn-outline-secondary"><i class="fa fa-plus"></i></a>';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great working on spotting this!

builder += '&nbsp;<a class="ple-table-size btn btn-outline-secondary">Add</a>';
builder += '</div>';

Expand Down