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.

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

Markdown improvements #233

Merged
merged 19 commits into from
Apr 5, 2019
Merged

Markdown improvements #233

merged 19 commits into from
Apr 5, 2019

Conversation

sebina
Copy link
Contributor

@sebina sebina commented Mar 30, 2019

Checklist

  • I run yarn run webpack:build:main: the project builds without errors.
  • I run yarn lint: the project builds without code style warnings.
  • I updated the documentation and models.
  • I tested the changes and all related features on the test server https://artemistest.ase.in.tum.de.
  • I added (end-to-end) test cases for the new functionality.

Motivation and Context

Create a color picker as a domain command to be able to change the color of the text.

Description

  • Added a color picker to the markdown editor. By selecting the text and clicking on the designated color the text style is changing.
  • Due to the issues that markdown does not support color changes - color changes need to be injected with html into the code. Therefore I created a css class markdown-preview which contains all the default colors.
  • When choosing the color black, the plain text is displayed again

Steps for Testing

  1. Open an existing question and select text. DnD, MC + Modeling Exercises
  2. Select the text to change and click on the color button
  3. Select the coloured text and revert the color to black
  4. Preview for each of the question types

Screenshots

Screenshot 2019-04-01 at 15 36 57

Screenshot 2019-04-01 at 15 37 02

Screenshot 2019-04-02 at 11 46 06

Screenshot 2019-04-02 at 11 44 40

@sebina sebina changed the title Feature/markdown improvements [WIP] Markdown improvements Mar 30, 2019
# Conflicts:
#	src/main/webapp/app/markdown-editor/markdown-editor.component.html
#	src/main/webapp/app/markdown-editor/markdown-editor.component.ts
#	src/main/webapp/app/markdown-editor/markdown-editor.scss
@sebina sebina requested a review from fde312 April 1, 2019 14:09
@sebina sebina removed the help wanted label Apr 2, 2019
@sebina sebina changed the title [WIP] Markdown improvements Markdown improvements Apr 3, 2019
@sebina sebina added this to the v2.8.0 milestone Apr 4, 2019
@sebina sebina removed the enhancement label Apr 4, 2019
Copy link
Member

@jpbernius jpbernius left a comment

Choose a reason for hiding this comment

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

I did not test this myself, but I do not have objections on the code.

# Conflicts:
#	src/main/java/de/tum/in/www1/artemis/service/compass/CompassCalculationEngine.java
#	src/main/java/de/tum/in/www1/artemis/service/compass/CompassService.java
#	src/main/webapp/app/modeling-editor/modeling-editor.component.html
# Conflicts:
#	src/main/webapp/app/markdown-editor/markdown-editor.component.html
#	src/main/webapp/app/quiz/participate/drag-and-drop-question/drag-and-drop-question.component.html
@krusche krusche merged commit d6fb3d1 into develop Apr 5, 2019
@krusche krusche deleted the feature/markdown-improvements branch April 5, 2019 16:23
@jpbernius jpbernius modified the milestones: v2.8.0, v2.7.0 Apr 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants