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

Jump to bottom

fix: Contain matching exercise within comprehension exercise #476

Merged
merged 1 commit into from
Feb 27, 2024
Merged

fix: Contain matching exercise within comprehension exercise #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
applicationId "org.nodepa.seedlingo"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 50
versionName "1.3.0"
versionCode 51
versionName "1.3.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
Expand Down
4 changes: 2 additions & 2 deletions app/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "seedlingo",
"version": "1.3.0",
"version": "1.3.1",
"description": "Modern mobile multi-language literacy - A first-language digital learning tool for adults",
"homepage": "https://seedlingo.com/get-started",
"bugs": "https://github.com/nodepa/seedlingo/issues",
Expand Down Expand Up @@ -107,4 +107,4 @@
"node": "18.19.0",
"npm": "10.4.0"
}
}
}
6 changes: 3 additions & 3 deletions app/src/Matching/components/MatchingExercise.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,13 +208,13 @@ function getSpacing(itemCount: number, index: number): string {
</script>

<template>
<ion-grid fixed>
<ion-row class="ion-justify-content-center">
<ion-grid fixed style="max-height: 100%">
<ion-row class="ion-justify-content-center" style="height: 100%">
<ion-col
v-for="(option, index) in exerciseItems"
:key="index"
size="6"
:style="`width: 100%; height: calc((100vh - 6.625rem - 0.75rem) / ${exerciseItems.length / 2}); padding: 0.5rem;`"
:style="`width: 100%; height: calc(100% / ${exerciseItems.length / 2}); padding: 0.5rem;`"
>
<ExerciseButton
v-model:buzzing="option.buzzing"
Expand Down
2 changes: 1 addition & 1 deletion app/src/views/ReviewSession.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ onMounted(() => {
margin: 0rem;
"
>
<ion-card-header v-if="word.picture && word.picture.length > 0" >
<ion-card-header v-if="word.picture && word.picture.length > 0">
<img
data-test="review-picture"
:src="Content.getPicPath(word.picture)"
Expand Down
Loading