tinymce - toolbar tidyup#7593
tinymce - toolbar tidyup#7593brianteeman wants to merge 6 commits intojoomla:stagingfrom brianteeman:tinymce
Conversation
plugins/editors/tinymce/tinymce.php
Outdated
There was a problem hiding this comment.
May I suggest:
$toolbar1 = implode(' ', $toolbar1_add) . ' | ' . implode(' ', $toolbar2_add) . ' | ' . implode(' ', $toolbar3_add) . ' | ' . implode(' ', $toolbar4_add);
This will add a small space in-between those toolbars, I think is easier for navigation
|
@DGT41 your last recommendation made Travis sad. I dont know the best way to make Travis happy again |
|
Arrrg, the last edit exceeds the allowed characters per line. But don’t try to do anything I will make a PR here shortly to sort this out |
|
I am not trying to do anything. |
|
@brianteeman Brian check brianteeman#13 |
|
@DGT41 merged |
|
I have tested this item ✅ successfully on 032f4f4 This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/7593. |
|
I have tested this item ✅ successfully on 032f4f4 This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/7593. |
|
Thanks for testing - setting RTC This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/7593. |
|
where is the conflict - github isnt showing it to me Unless @DGT41 changed his PR then it should be fine as it was tested with it |
|
@brianteeman The conflict is not shown here because the PR is against staging and I am going to merge it into the 3.5-dev branch. In the 3.5-dev branch another Tiny PR by @DGT41 has already been merged. The conflict is here: Other PR: same lines have been changed. |
|
@brianteeman a rebase is not needed, if @DGT41 can do a PR against your branch we should be good to go. Thanks. |
|
I meant have used the wrong terminology ;) On 24 October 2015 at 12:09, RolandD notifications@github.com wrote:
Brian Teeman |
|
@brianteeman this pr is against staging the conflict comes with #7170 which is merged in 3.5-dev. I think if you rebadge this against 3.5-Dev then the conflict will be revealed |
|
@DGT41 Brian doesn't know how to rebase against 3.5-dev. My question is, can you provide a PR against this branch that solves the conflicts? |
|
Looks like the PR @DGT41 did on ym repo just broke it even more |
|
Closing as we have a new PR here #8159 |
Redo of #7593 for 3.5-dev. Again
Hopefully the screenshots show the proposed changes of this PR
Advanced Mode - Default
Before
After
Extended Mode (enable in the plugin)
Before
After
[Note this cant be tested with #7170 as it needs a small update to match the changes there]