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.
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
'basic link' button and inline with number in Coach #8720
'basic link' button and inline with number in Coach #8720
Conversation
You have based your work here off the develop branch, which includes commits not in the release-v0.15.x branch. To fix this, I'd recommend making sure your local copy of release-v0.15.x is up to date, and then do the following:
The second command here will open a text editor and prompt you with a list of commits. You should mark all the commits as 'drop' except your Once that is done, you should force push to the remote |
6f392b3
to
b7d2aa8
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you!
A couple small changes requested
package.json
Outdated
] | ||
], | ||
"dependencies": { | ||
"caniuse-lite": "^1.0.30001280" | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please revert the changes to package.json and yarn.lock as they are not directly related to this fix.
I've opened a follow-up issue related to the warnings you were seeing here: #8728
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not able to revert changes to package.json and yarn.lock by git commands. should i delete this branch and create a new one with applied changes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi – I force-pushed an update to your branch which keeps only the relevant files.
For future reference, it's possible to break a previous commit in pieces and choose only portions of that commit using an interactive rebase.
See for example: https://stackoverflow.com/questions/6217156/break-a-previous-commit-into-multiple-commits
kolibri/plugins/coach/assets/src/views/home/HomePage/OverviewBlock.vue
Outdated
Show resolved
Hide resolved
54593a8
to
53b469a
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks good!
Summary
Fixes #8629
view learners' button in Coach has incorrect styling
Button is a 'basic link' and inline with number, not on next line
References
#8629
Reviewer guidance
is it okay? Do I need modify more?
Testing checklist
PR process
Reviewer checklist
yarn
andpip
)