Skip to content

Commit

Permalink
Merge branch 'develop' into feature/ADF-1417/upgrade-to-node18
Browse files Browse the repository at this point in the history
 Conflicts:
	views/css/qti-runner.css
	views/css/qti-runner.css.map
	views/js/loader/taoQtiItem.min.js
	views/js/loader/taoQtiItem.min.js.map
	views/js/loader/taoQtiItemRunner.es5.min.js
	views/js/loader/taoQtiItemRunner.es5.min.js.map
	views/js/loader/taoQtiItemRunner.min.js
	views/js/loader/taoQtiItemRunner.min.js.map
	views/package-lock.json
	views/package.json
	views/scss/qti/_associate.scss
  • Loading branch information
jsconan committed May 11, 2023
2 parents 13fda39 + bee583f commit 3d9b985
Show file tree
Hide file tree
Showing 13 changed files with 2,120 additions and 25 deletions.
2,007 changes: 2,007 additions & 0 deletions locales/pt-BR/messages.po

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions locales/pt-BR/messages_po.js

Large diffs are not rendered by default.

34 changes: 34 additions & 0 deletions locales/pt-BR/qtiItemRunner.rdf.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
msgid ""
msgstr ""
"Project-Id-Version: tao-3x\n"
"PO-Revision-Date: 2023-04-21 15:46\n"
"Last-Translator: TAO Translation Team <translation@tao.lu>\n"
"MIME-Version: 1.0\n"
"Language: pt\n"
"sourceLanguage: en-US\n"
"targetLanguage: en-US\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Crowdin-Project: tao-3x\n"
"X-Crowdin-Project-ID: 582145\n"
"X-Crowdin-Language: pt-BR\n"
"X-Crowdin-File: /taoQtiItem/locales/en-US/qtiItemRunner.rdf.po\n"
"X-Crowdin-File-ID: 1635\n"
"Language-Team: Portuguese, Brazilian\n"

# http://www.tao.lu/Ontologies/TAOItem.rdf#ServiceQtiItemRunner
msgctxt "http://www.w3.org/2000/01/rdf-schema#label"
msgid "QTI Item Runner"
msgstr "Item Runner QTI"

# http://www.tao.lu/Ontologies/TAOItem.rdf#ServiceQtiItemRunner
msgctxt "http://www.w3.org/2000/01/rdf-schema#comment"
msgid "Embed a run an item into a Delivery. This service initialize the TAO Apis and contexts"
msgstr "Incorpore um item em uma entrega. Este serviço inicializa a API de DOIS e contextos"

# http://www.tao.lu/Ontologies/TAOItem.rdf#ServiceQtiItemRunner
msgctxt "http://www.w3.org/2000/01/rdf-schema#comment"
msgid "QTI Item Runner"
msgstr "Item Runner QTI"

49 changes: 49 additions & 0 deletions locales/pt-BR/taoQti.rdf.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
msgid ""
msgstr ""
"Project-Id-Version: tao-3x\n"
"PO-Revision-Date: 2023-04-21 15:46\n"
"Last-Translator: TAO Translation Team <translation@tao.lu>\n"
"MIME-Version: 1.0\n"
"Language: pt\n"
"sourceLanguage: en-US\n"
"targetLanguage: en-US\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Crowdin-Project: tao-3x\n"
"X-Crowdin-Project-ID: 582145\n"
"X-Crowdin-Language: pt-BR\n"
"X-Crowdin-File: /taoQtiItem/locales/en-US/taoQti.rdf.po\n"
"X-Crowdin-File-ID: 1633\n"
"Language-Team: Portuguese, Brazilian\n"

# http://www.tao.lu/Ontologies/TAOItem.rdf#QTI
msgctxt "http://www.w3.org/2000/01/rdf-schema#label"
msgid "QTI"
msgstr "QTI"

# http://www.tao.lu/Ontologies/TAOItem.rdf#QTI
msgctxt "http://www.w3.org/2000/01/rdf-schema#comment"
msgid "IMS Question and Test Interoperability"
msgstr "Interoperabilidade de Teste e Pergunta IMS"

# http://www.tao.lu/Ontologies/TAOItem.rdf#QTIManagerRole
msgctxt "http://www.w3.org/2000/01/rdf-schema#label"
msgid "QTI Manager"
msgstr "Gerenciador QTI"

# http://www.tao.lu/Ontologies/TAOItem.rdf#QTIManagerRole
msgctxt "http://www.w3.org/2000/01/rdf-schema#comment"
msgid "QTI Manager Role"
msgstr "Função de Gerente QTI"

# http://www.tao.lu/Ontologies/TAOItem.rdf#QTI
msgctxt "http://www.w3.org/2000/01/rdf-schema#comment"
msgid "QTI"
msgstr "QTI"

# http://www.tao.lu/Ontologies/TAOItem.rdf#QTIManagerRole
msgctxt "http://www.w3.org/2000/01/rdf-schema#comment"
msgid "QTI Manager"
msgstr "Gerenciador QTI"

2 changes: 1 addition & 1 deletion views/css/qti-runner.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion views/css/qti-runner.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion views/js/loader/taoQtiItem.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion views/js/loader/taoQtiItem.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion views/js/loader/taoQtiItemRunner.es5.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion views/js/loader/taoQtiItemRunner.es5.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion views/js/loader/taoQtiItemRunner.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion views/js/loader/taoQtiItemRunner.min.js.map

Large diffs are not rendered by default.

38 changes: 21 additions & 17 deletions views/scss/qti/_associate.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
@import "inc/bootstrap";
@import 'inc/bootstrap';

.qti-associateInteraction {

.empty {
cursor: pointer;
min-height: 0;
&:hover{
&:hover {
@extend %selectableHover;
}
}
Expand All @@ -26,7 +25,8 @@
}
}
}
& > .qti-choice:has(.MathJax) {

& > .qti-choice.flexible-choice-width {
max-width: none;
}
}
Expand All @@ -41,14 +41,14 @@
@extend .clearfix;
&:before {
@extend %clearfix-before;
border-top: 1px solid whiten($info, .5);
border-top: 1px solid whiten($info, 0.5);
display: block;
width: 80%;
left: 10%;
height: 1px;
position: absolute;
z-index: 1;
top: 50%
top: 50%;
}
&:after {
@extend %clearfix-after;
Expand All @@ -63,7 +63,7 @@
min-width: 180px;
min-height: 30px;
max-width: 325px;
outline: 5px whiten($uiClickableDefaultBg, .2) solid;
outline: 5px whiten($uiClickableDefaultBg, 0.2) solid;
@include simple-border(#eee);
overflow: hidden;
.qti-block {
Expand All @@ -72,31 +72,35 @@
}
}
&.active {
border-color: whiten($info, .2);
&:hover{
border-color: whiten($info, 0.2);
&:hover {
@extend %activeHover;
}
}
&:first-child {
float: left
float: left;
}
&.dragged, &.dragged:hover { // :hover is to override .active:hover
&.dragged,
&.dragged:hover {
// :hover is to override .active:hover
@extend %dragged;
outline: 0;
}
&.droppable, &.droppable:hover { // :hover is to override .active:hover
&.droppable,
&.droppable:hover {
// :hover is to override .active:hover
@extend %droppable;
}
&.dropzone {
@extend %dropzone;
}
}
&.removing > div{
background-color:#eee;
&.removing > div {
background-color: #eee;
}
&.incomplete-pair {
& > div {
border:1px dashed #ccc;
border: 1px dashed #ccc;
}
}
}
Expand All @@ -113,7 +117,7 @@
}
}
.filled {
&:hover{
&:hover {
@extend %selectableHover;
}
}
Expand All @@ -125,5 +129,5 @@
}

.result-area > li > div.filled ~ div.filled:before {
border-top: 1px solid whiten($success, .5) !important;
border-top: 1px solid whiten($success, 0.5) !important;
}

0 comments on commit 3d9b985

Please sign in to comment.