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

Miscellaneous fixes #103

Merged
merged 3 commits into from
Sep 22, 2016
Merged

Miscellaneous fixes #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe49f58
RTL fixes
arbrandes Sep 4, 2016
d795e3c
Merge pull request #12 from arbrandes/OC-1859
pomegranited Sep 15, 2016
e5eca5a
Miscellaneous fixes
arbrandes Sep 4, 2016
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
113 changes: 100 additions & 13 deletions drag_and_drop_v2/public/css/drag_and_drop.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,34 +307,70 @@


/* Font Awesome icons have different width - margin-right tries to compensate it */
.xblock--drag-and-drop .feedback p:before {
.ltr .xblock--drag-and-drop .feedback p:before,
Copy link

Choose a reason for hiding this comment

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

@alisan617 or @bjacobel, is there a better way to handle rtl/ltr? I don't recall seeing this pattern anyplace else.

Copy link

Choose a reason for hiding this comment

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

@cahrens unfortunately this is css not sass. Otherwise, could import bi-app sass.

.rtl .xblock--drag-and-drop .feedback p:after {
content: "\f129";
font-family: FontAwesome;
}

.ltr .xblock--drag-and-drop .feedback p:before {
margin-right: 0.7em;
margin-left: 0.3em;
}

.xblock--drag-and-drop .feedback p.correct:before {
.rtl .xblock--drag-and-drop .feedback p:after {
margin-left: 0.7em;
margin-right: 0.3em;
}

.ltr .xblock--drag-and-drop .feedback p.correct:before,
.rtl .xblock--drag-and-drop .feedback p.correct:after {
content: "\f00c";
font-family: FontAwesome;
}

.ltr .xblock--drag-and-drop .feedback p.correct:before {
margin-right: 0.3em;
margin-left: 0;
}

.xblock--drag-and-drop .feedback p.partial:before {
.rtl .xblock--drag-and-drop .feedback p.correct:after {
margin-left: 0.3em;
margin-right: 0;
}

.ltr .xblock--drag-and-drop .feedback p.partial:before,
.rtl .xblock--drag-and-drop .feedback p.partial:after {
content: "\f069";
font-family: FontAwesome;
}

.ltr .xblock--drag-and-drop .feedback p.partial:before {
margin-right: 0.3em;
margin-left: 0;
}

.xblock--drag-and-drop .feedback p.incorrect:before {
.rtl .xblock--drag-and-drop .feedback p.partial:after {
margin-left: 0.3em;
margin-right: 0;
}

.ltr .xblock--drag-and-drop .feedback p.incorrect:before,
.rtl .xblock--drag-and-drop .feedback p.incorrect:after {
content: "\f00d";
font-family: FontAwesome;
}

.ltr .xblock--drag-and-drop .feedback p.incorrect:before {
margin-right: 0.45em;
margin-left: 0.1em;
}

.rtl .xblock--drag-and-drop .feedback p.incorrect:after {
margin-left: 0.45em;
margin-right: 0.1em;
}

.xblock--drag-and-drop .popup {
position: absolute;
display: none;
Expand All @@ -360,17 +396,30 @@
font-size: 14px;
}

.xblock--drag-and-drop .popup .popup-content img {
max-width: 100%;
}

.xblock--drag-and-drop .popup .close-feedback-popup-button {
cursor: pointer;
float: right;
margin-right: 8px;
margin-top: 8px;
margin-left: 20px;
color: #ffffff;
font-family: "fontawesome";
font-size: 18pt;
}

.ltr .xblock--drag-and-drop .popup .close-feedback-popup-button {
float: right;
margin-right: 8px;
margin-left: 20px;
}

.rtl .xblock--drag-and-drop .popup .close-feedback-popup-button {
float: left;
margin-right: 20px;
margin-left: 8px;
}

.xblock--drag-and-drop .popup .close-feedback-popup-button:focus {
outline: 2px solid white;
}
Expand Down Expand Up @@ -487,41 +536,79 @@
}

.xblock--drag-and-drop .attempts-used {
margin-left: 0.675em;
font-size: 0.875em;
color: #666;
}

.ltr .xblock--drag-and-drop .attempts-used {
margin-left: 0.675em;
}

.rtl .xblock--drag-and-drop .attempts-used {
margin-right: 0.675em;
}

.xblock--drag-and-drop .actions-toolbar .action-toolbar-item.sidebar-buttons {
text-align: left;
display: block;
}

.ltr .xblock--drag-and-drop .actions-toolbar .action-toolbar-item.sidebar-buttons {
text-align: left;
}

.rtl .xblock--drag-and-drop .actions-toolbar .action-toolbar-item.sidebar-buttons {
text-align: right;
}

@media (min-width: 768px) {
.xblock--drag-and-drop .actions-toolbar .action-toolbar-item.sidebar-buttons {
float: right;
margin: 0;
}

.ltr .xblock--drag-and-drop .actions-toolbar .action-toolbar-item.sidebar-buttons {
float: right;
padding-right: -5px;
}

.rtl .xblock--drag-and-drop .actions-toolbar .action-toolbar-item.sidebar-buttons {
float: left;
padding-left: -5px;
}
}

.xblock--drag-and-drop .sidebar-buttons .sidebar-button-wrapper {
border-right: 1px solid #ddd;
border-collapse: collapse;
padding: 0 5px;
display: inline-block;
height: 100%;
}

.xblock--drag-and-drop .sidebar-buttons .sidebar-button-wrapper:first-child {
.ltr .xblock--drag-and-drop .sidebar-buttons .sidebar-button-wrapper {
border-right: 1px solid #ddd;
}

.rtl .xblock--drag-and-drop .sidebar-buttons .sidebar-button-wrapper {
border-left: 1px solid #ddd;
}

.ltr .xblock--drag-and-drop .sidebar-buttons .sidebar-button-wrapper:first-child {
padding-left: 0;
}

.xblock--drag-and-drop .sidebar-buttons .sidebar-button-wrapper:last-child {
.rtl .xblock--drag-and-drop .sidebar-buttons .sidebar-button-wrapper:first-child {
padding-right: 0;
}

.ltr .xblock--drag-and-drop .sidebar-buttons .sidebar-button-wrapper:last-child {
border-right: none;
padding-right: 0;
}

.rtl .xblock--drag-and-drop .sidebar-buttons .sidebar-button-wrapper:last-child {
border-left: none;
padding-left: 0;
}

.xblock--drag-and-drop .sidebar-buttons .btn-brand {
display: inline-block;
padding: 3px 5px;
Expand Down
7 changes: 2 additions & 5 deletions drag_and_drop_v2/templates/html/drag_and_drop_edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@

<section class="drag-builder">
<div class="tab feedback-tab">
<p class="tab-content">
{% trans "Note: do not edit the problem if students have already completed it. Delete the problem and create a new one." %}
</p>

<section class="tab-content">
<form class="feedback-form">
Expand Down Expand Up @@ -71,12 +68,12 @@
</div>

<label class="h4">
<span>{% trans "Introductory Feedback" %}</span>
<span>{% trans "Introductory feedback" %}</span>
<textarea class="intro-feedback">{{ self.data.feedback.start }}</textarea>
</label>

<label class="h4">
<span>{% trans "Final Feedback" %}</span>
<span>{% trans "Final feedback" %}</span>
<textarea class="final-feedback">{{ self.data.feedback.finish }}</textarea>
</label>
</form>
Expand Down
4 changes: 2 additions & 2 deletions drag_and_drop_v2/templates/html/js_templates.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,13 @@
</div>
<div class="row">
<label class="h4">
<span>{{i18n "Success Feedback"}}</span>
<span>{{i18n "Success feedback"}}</span>
<textarea class="success-feedback">{{ feedback.correct }}</textarea>
</label>
</div>
<div class="row">
<label class="h4">
<span>{{i18n "Error Feedback"}}</span>
<span>{{i18n "Error feedback"}}</span>
<textarea class="error-feedback">{{ feedback.incorrect }}</textarea>
</label>
</div>
Expand Down
8 changes: 4 additions & 4 deletions drag_and_drop_v2/translations/en/LC_MESSAGES/text.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,11 +304,11 @@ msgid ""
msgstr ""

#: templates/html/js_templates.html
msgid "Success Feedback"
msgid "Success feedback"
msgstr ""

#: templates/html/js_templates.html
msgid "Error Feedback"
msgid "Error feedback"
msgstr ""

#: templates/html/js_templates.html
Expand Down Expand Up @@ -340,11 +340,11 @@ msgid ""
msgstr ""

#: templates/html/drag_and_drop_edit.html
msgid "Introductory Feedback"
msgid "Introductory feedback"
msgstr ""

#: templates/html/drag_and_drop_edit.html
msgid "Final Feedback"
msgid "Final feedback"
msgstr ""

#: templates/html/drag_and_drop_edit.html
Expand Down
16 changes: 8 additions & 8 deletions drag_and_drop_v2/translations/eo/LC_MESSAGES/text.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,12 +366,12 @@ msgstr ""
"évén ïf thé ïmägé dïd nöt löäd) Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт #"

#: templates/html/js_templates.html
msgid "Success Feedback"
msgstr "Süççéss Féédßäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"
msgid "Success feedback"
msgstr "Süççéss féédßäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"

#: templates/html/js_templates.html
msgid "Error Feedback"
msgstr "Érrör Féédßäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"
msgid "Error feedback"
msgstr "Érrör féédßäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"

#: templates/html/js_templates.html
msgid "Show advanced settings"
Expand Down Expand Up @@ -413,12 +413,12 @@ msgstr ""
"thé prößlém änd çréäté ä néw öné. Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#"

#: templates/html/drag_and_drop_edit.html
msgid "Introductory Feedback"
msgstr "Ìntrödüçtörý Féédßäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #"
msgid "Introductory feedback"
msgstr "Ìntrödüçtörý féédßäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #"

#: templates/html/drag_and_drop_edit.html
msgid "Final Feedback"
msgstr "Fïnäl Féédßäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"
msgid "Final feedback"
msgstr "Fïnäl féédßäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"

#: templates/html/drag_and_drop_edit.html
msgid "Background URL"
Expand Down