diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-02-02 19:26:14 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-02-02 19:26:14 +0000 |
commit | 974bb446bf834bcf3ead9b69b0809e62b28a1bc9 (patch) | |
tree | 898d1fa54e02cc870464f79c94e70a43a1714784 /spec/fixtures | |
parent | ee600a84d29d1ecbfdb3e9cb1a55c610ed65ab10 (diff) | |
parent | 57f8b24fe2d54df4dfcc3ddcb5796e41093f0fd7 (diff) | |
download | gitlab-ce-974bb446bf834bcf3ead9b69b0809e62b28a1bc9.tar.gz |
Merge branch '24167__color_label' into 'master'
Add Colors to GitLab Flavored Markdown
Closes #24167
See merge request gitlab-org/gitlab-ce!16095
Diffstat (limited to 'spec/fixtures')
-rw-r--r-- | spec/fixtures/markdown.md.erb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/spec/fixtures/markdown.md.erb b/spec/fixtures/markdown.md.erb index 71abb6da607..da32a46675f 100644 --- a/spec/fixtures/markdown.md.erb +++ b/spec/fixtures/markdown.md.erb @@ -280,6 +280,18 @@ However the wrapping tags cannot be mixed as such: ![My Video](/assets/videos/gitlab-demo.mp4) +### Colors + +`#F00` +`#F00A` +`#FF0000` +`#FF0000AA` +`RGB(0,255,0)` +`RGB(0%,100%,0%)` +`RGBA(0,255,0,0.7)` +`HSL(540,70%,50%)` +`HSLA(540,70%,50%,0.7)` + ### Mermaid > If this is not rendered correctly, see |