Skip to content

Commit

Permalink
Merge pull request #9759 from rtibbles/medusa
Browse files Browse the repository at this point in the history
Upgrade perseus to npm published version.
  • Loading branch information
rtibbles authored Jun 20, 2024
2 parents 9fd15ee + 5937557 commit 0e1ff08
Show file tree
Hide file tree
Showing 51 changed files with 7,307 additions and 118,308 deletions.
1 change: 1 addition & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ updates:
babel:
patterns:
- "@babel/*"
- "@khanacademy/*"

# Maintain dependencies for Github Actions
- package-ecosystem: "github-actions"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ oriented data synchronization.
</div>
</template>
</LessonMasteryBar>
<div>
<div class="content-attempts-wrapper">
<UiAlert v-if="itemError" :dismissible="false" type="error">
{{ $tr('itemError') }}
<KButton
Expand Down Expand Up @@ -546,6 +546,18 @@ oriented data synchronization.
@import '~kolibri-design-system/lib/styles/definitions';
.content-attempts-wrapper {
// Make the wrapper for the content and attempts the full height of the parent
// minus the height of the mastery bar above: 56px.
height: calc(100% - 56px);
}
.content-wrapper {
// Make the content wrapper the full height of the parent content attempts wrapper
// minus the height of the attempts container below: 111px.
height: calc(100% - 111px);
}
.attempts-container {
height: 111px;
text-align: left;
Expand Down
3 changes: 1 addition & 2 deletions kolibri/plugins/perseus_viewer/assets/dist/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ The files in this directory are generated using the buildPerseus.js script insid
They should be regenerated using the same command in the unlikely event that Perseus ever needs
to be updated.
The script is run using the following command: yarn workspace kolibri-perseus-viewer run build-perseus.
This will automatically pull the latest version of Perseus and its submodules from the Learning Equality fork,
This will automatically pull files from Perseus and make appropriate edits,
and then copy and build relevant files from there into the static and assets/dist folders in this plugin.
This is to avoid having to run a build of Perseus every time the wrapper code for the plugin is updated.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Git LFS file not shown
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 0e1ff08

Please sign in to comment.