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

Fix #5973: Fixed the changed space when the text is added just below the image #5996

Merged
merged 5 commits into from
Dec 19, 2018
Merged

Fix #5973: Fixed the changed space when the text is added just below the image #5996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
72dce1b
Fixed
mighty-phoenix Dec 17, 2018
eb239a9
Correction
mighty-phoenix Dec 17, 2018
319ef35
Revert changes in oppia.css
mighty-phoenix Dec 17, 2018
678527a
Final changes
mighty-phoenix Dec 18, 2018
f5b76df
Final change
mighty-phoenix Dec 18, 2018
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 core/templates/dev/head/components/CkEditorRteDirective.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ oppia.directive('ckEditorRte', [
} else {
return '<div type="oppia-noninteractive-' + p3 + '"' +
'class="oppia-rte-component-container">' + match +
'<div class="oppia-rte-component-overlay"></div></div>';
Copy link
Member

Choose a reason for hiding this comment

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

@rakshitkumarcse, can you please explain why do we have to remove this?

Copy link
Contributor

Choose a reason for hiding this comment

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

Hey @DubeySandeep, this was a wrapping around the block components. If you use this, then after clicking the save button and entering in the editing mode again there will be empty line between the paragraph just below it and the block component (say image).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@bansalnitish Thanks for answering.

Copy link
Member

Choose a reason for hiding this comment

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

Thanks! :)

'</div>';
}
});
};
Expand Down
4 changes: 0 additions & 4 deletions core/templates/dev/head/css/oppia.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1494,8 +1494,6 @@ pre.oppia-pre-wrapped-text {

.oppia-rte-editor > p {
line-height: 1.846;
margin-bottom: 18px;
margin-top: 18px;
}
.oppia-info-card-content p {
display: block;
Expand All @@ -1507,8 +1505,6 @@ pre.oppia-pre-wrapped-text {
}
.oppia-rte-content > div > p {
line-height: 1.846;
margin-bottom: 18px;
margin-top: 18px;
}

/* Add inter-paragraph spacing to the ng-joyride tutorial contents. */
Expand Down
2 changes: 0 additions & 2 deletions core/templates/dev/head/pages/exploration_player/conversation_skin_directive.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,6 @@
*/
.rte-viewer > p {
line-height: 1.846;
margin-bottom: 18px;
margin-top: 18px;
}
.rte-viewer > p:first-child {
margin-top: 0px;
Expand Down