Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
57497f6f
Commit
57497f6f
authored
Nov 06, 2017
by
Tim Zallmann
Committed by
Phil Hughes
Nov 06, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Editor icons"
parent
db6a125d
Changes
15
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
58 additions
and
37 deletions
+58
-37
app/assets/images/icons.json
app/assets/images/icons.json
+1
-1
app/assets/images/icons.svg
app/assets/images/icons.svg
+1
-1
app/assets/images/illustrations/epics.svg
app/assets/images/illustrations/epics.svg
+1
-0
app/assets/images/illustrations/gitlab_logo.svg
app/assets/images/illustrations/gitlab_logo.svg
+1
-0
app/assets/images/illustrations/pipelines_pending.svg
app/assets/images/illustrations/pipelines_pending.svg
+1
-0
app/assets/images/illustrations/slack_logo.svg
app/assets/images/illustrations/slack_logo.svg
+1
-0
app/assets/images/illustrations/wiki-fro-logged-out-users.svg
...assets/images/illustrations/wiki-fro-logged-out-users.svg
+1
-0
app/assets/javascripts/vue_shared/components/markdown/field.vue
...sets/javascripts/vue_shared/components/markdown/field.vue
+6
-4
app/assets/javascripts/vue_shared/components/markdown/header.vue
...ets/javascripts/vue_shared/components/markdown/header.vue
+9
-8
app/assets/javascripts/vue_shared/components/markdown/toolbar_button.vue
...scripts/vue_shared/components/markdown/toolbar_button.vue
+7
-10
app/assets/stylesheets/framework/markdown_area.scss
app/assets/stylesheets/framework/markdown_area.scss
+11
-3
app/assets/stylesheets/framework/zen.scss
app/assets/stylesheets/framework/zen.scss
+8
-0
app/helpers/markup_helper.rb
app/helpers/markup_helper.rb
+1
-1
app/views/projects/_md_preview.html.haml
app/views/projects/_md_preview.html.haml
+8
-8
yarn.lock
yarn.lock
+1
-1
No files found.
app/assets/images/icons.json
View file @
57497f6f
{
"iconCount"
:
164
,
"spriteSize"
:
72823
,
"icons"
:[
"abuse"
,
"account"
,
"admin"
,
"angle-double-left"
,
"angle-double-right"
,
"angle-down"
,
"angle-left"
,
"angle-right"
,
"angle-up"
,
"appearance"
,
"applications"
,
"approval"
,
"arrow-right"
,
"assignee"
,
"bold"
,
"book"
,
"branch"
,
"calendar"
,
"cancel"
,
"chevron-down"
,
"chevron-left"
,
"chevron-right"
,
"chevron-up"
,
"clock"
,
"close"
,
"code"
,
"collapse"
,
"comment-dots"
,
"comment-next"
,
"comment"
,
"comments"
,
"commit"
,
"credit-card"
,
"dashboard"
,
"disk"
,
"doc_code"
,
"doc_image"
,
"doc_text"
,
"download"
,
"duplicate"
,
"earth"
,
"eye-slash"
,
"eye"
,
"file-additions"
,
"file-deletion"
,
"file-modified"
,
"filter"
,
"folder"
,
"fork"
,
"geo-nodes"
,
"git-merge"
,
"group"
,
"history"
,
"home"
,
"hook"
,
"image-comment-dark"
,
"import"
,
"issue-block"
,
"issue-child"
,
"issue-close"
,
"issue-duplicate"
,
"issue-new"
,
"issue-open-m"
,
"issue-open"
,
"issue-parent"
,
"issues"
,
"key-2"
,
"key"
,
"label"
,
"labels"
,
"leave"
,
"level-up"
,
"license"
,
"link"
,
"list-bulleted"
,
"list-numbered"
,
"location-dot"
,
"location"
,
"lock-open"
,
"lock"
,
"log"
,
"mail"
,
"menu"
,
"merge-request-close"
,
"messages"
,
"mobile-issue-close"
,
"monitor"
,
"more"
,
"notifications-off"
,
"notifications"
,
"overview"
,
"pencil"
,
"pipeline"
,
"play"
,
"plus-square-o"
,
"plus-square"
,
"plus"
,
"preferences"
,
"profile"
,
"project"
,
"push-rules"
,
"question-o"
,
"question"
,
"quote"
,
"redo"
,
"remove"
,
"repeat"
,
"retry"
,
"scale"
,
"screen-full"
,
"screen-normal"
,
"scroll_down"
,
"scroll_up"
,
"search"
,
"settings"
,
"shield"
,
"slight-frown"
,
"slight-smile"
,
"smile"
,
"smiley"
,
"snippet"
,
"spam"
,
"star-o"
,
"star"
,
"status_canceled_borderless"
,
"status_canceled"
,
"status_closed"
,
"status_created_borderless"
,
"status_created"
,
"status_failed_borderless"
,
"status_failed"
,
"status_manual_borderless"
,
"status_manual"
,
"status_notfound_borderless"
,
"status_open"
,
"status_pending_borderless"
,
"status_pending"
,
"status_running_borderless"
,
"status_running"
,
"status_skipped_borderless"
,
"status_skipped"
,
"status_success_borderless"
,
"status_success_solid"
,
"status_success"
,
"status_warning_borderless"
,
"status_warning"
,
"stop"
,
"talic"
,
"task-done"
,
"template"
,
"thump-down"
,
"thump-up"
,
"timer"
,
"todo-add"
,
"todo-done"
,
"token"
,
"unapproval"
,
"unassignee"
,
"unlink"
,
"user"
,
"users"
,
"volume-up"
,
"warning"
,
"work"
]}
{
"iconCount"
:
173
,
"spriteSize"
:
75815
,
"icons"
:[
"abuse"
,
"account"
,
"admin"
,
"angle-double-left"
,
"angle-double-right"
,
"angle-down"
,
"angle-left"
,
"angle-right"
,
"angle-up"
,
"appearance"
,
"applications"
,
"approval"
,
"arrow-right"
,
"assignee"
,
"bold"
,
"book"
,
"branch"
,
"bullhorn"
,
"calendar"
,
"cancel"
,
"chart"
,
"chevron-down"
,
"chevron-left"
,
"chevron-right"
,
"chevron-up"
,
"clock"
,
"close"
,
"code"
,
"collapse"
,
"comment-dots"
,
"comment-next"
,
"comment"
,
"comments"
,
"commit"
,
"credit-card"
,
"cut"
,
"dashboard"
,
"disk"
,
"doc_code"
,
"doc_image"
,
"doc_text"
,
"double-headed-arrow"
,
"download"
,
"duplicate"
,
"earth"
,
"external-link"
,
"eye-slash"
,
"eye"
,
"file-addition"
,
"file-deletion"
,
"file-modified"
,
"filter"
,
"folder"
,
"fork"
,
"geo-nodes"
,
"git-merge"
,
"group"
,
"history"
,
"home"
,
"hook"
,
"hourglass"
,
"image-comment-dark"
,
"import"
,
"issue-block"
,
"issue-child"
,
"issue-close"
,
"issue-duplicate"
,
"issue-new"
,
"issue-open-m"
,
"issue-open"
,
"issue-parent"
,
"issues"
,
"italic"
,
"key-2"
,
"key"
,
"label"
,
"labels"
,
"leave"
,
"level-up"
,
"license"
,
"link"
,
"list-bulleted"
,
"list-numbered"
,
"location-dot"
,
"location"
,
"lock-open"
,
"lock"
,
"log"
,
"mail"
,
"menu"
,
"merge-request-close"
,
"messages"
,
"mobile-issue-close"
,
"monitor"
,
"more"
,
"notifications-off"
,
"notifications"
,
"overview"
,
"pencil"
,
"pipeline"
,
"play"
,
"plus-square-o"
,
"plus-square"
,
"plus"
,
"preferences"
,
"profile"
,
"project"
,
"push-rules"
,
"question-o"
,
"question"
,
"quote"
,
"redo"
,
"remove"
,
"repeat"
,
"retry"
,
"scale"
,
"screen-full"
,
"screen-normal"
,
"scroll_down"
,
"scroll_up"
,
"search"
,
"settings"
,
"shield"
,
"slight-frown"
,
"slight-smile"
,
"smile"
,
"smiley"
,
"snippet"
,
"spam"
,
"spinner"
,
"star-o"
,
"star"
,
"status_canceled_borderless"
,
"status_canceled"
,
"status_closed"
,
"status_created_borderless"
,
"status_created"
,
"status_failed_borderless"
,
"status_failed"
,
"status_manual_borderless"
,
"status_manual"
,
"status_notfound_borderless"
,
"status_open"
,
"status_pending_borderless"
,
"status_pending"
,
"status_running_borderless"
,
"status_running"
,
"status_skipped_borderless"
,
"status_skipped"
,
"status_success_borderless"
,
"status_success_solid"
,
"status_success"
,
"status_warning_borderless"
,
"status_warning"
,
"stop"
,
"task-done"
,
"template"
,
"terminal"
,
"thumb-down"
,
"thumb-up"
,
"thumbtack"
,
"timer"
,
"todo-add"
,
"todo-done"
,
"token"
,
"unapproval"
,
"unassignee"
,
"unlink"
,
"user"
,
"users"
,
"volume-up"
,
"warning"
,
"work"
]}
\ No newline at end of file
\ No newline at end of file
app/assets/images/icons.svg
View file @
57497f6f
This source diff could not be displayed because it is too large. You can
view the blob
instead.
app/assets/images/illustrations/epics.svg
0 → 100644
View file @
57497f6f
This diff is collapsed.
Click to expand it.
app/assets/images/illustrations/gitlab_logo.svg
0 → 100644
View file @
57497f6f
<svg
xmlns=
"http://www.w3.org/2000/svg"
width=
"492.509"
height=
"453.68"
viewBox=
"0 0 492.50943 453.67966"
><g
fill=
"none"
fill-rule=
"evenodd"
><path
d=
"M491.589 259.398l-27.559-84.814L409.413 6.486c-2.81-8.648-15.045-8.648-17.856 0l-54.619 168.098H155.572L100.952 6.486c-2.81-8.648-15.046-8.648-17.856 0L28.478 174.584.921 259.398a18.775 18.775 0 0 0 6.82 20.992l238.513 173.29L484.77 280.39a18.777 18.777 0 0 0 6.82-20.992"
fill=
"#fc6d26"
/><path
d=
"M246.255 453.68l90.684-279.096H155.57z"
fill=
"#e24329"
/><path
d=
"M246.255 453.68L155.57 174.583H28.479z"
fill=
"#fc6d26"
/><path
d=
"M28.479 174.584L.92 259.4a18.773 18.773 0 0 0 6.821 20.99l238.514 173.29z"
fill=
"#fca326"
/><path
d=
"M28.479 174.584H155.57L100.952 6.487c-2.81-8.65-15.047-8.65-17.856 0z"
fill=
"#e24329"
/><path
d=
"M246.255 453.68l90.684-279.096H464.03z"
fill=
"#fc6d26"
/><path
d=
"M464.03 174.584l27.56 84.815a18.773 18.773 0 0 1-6.822 20.99L246.255 453.68z"
fill=
"#fca326"
/><path
d=
"M464.03 174.584H336.94L391.557 6.487c2.811-8.65 15.047-8.65 17.856 0z"
fill=
"#e24329"
/></g></svg>
\ No newline at end of file
app/assets/images/illustrations/pipelines_pending.svg
0 → 100644
View file @
57497f6f
<svg
xmlns=
"http://www.w3.org/2000/svg"
width=
"430"
height=
"220"
viewBox=
"0 0 430 220"
><g
fill=
"none"
fill-rule=
"evenodd"
><path
fill=
"#EEE"
fill-rule=
"nonzero"
d=
"M189.8 182l2.4-12H114c-5.523 0-10-4.477-10-10V34c0-5.523 4.477-10 10-10h200c5.523 0 10 4.477 10 10v126c0 5.523-4.477 10-10 10h-78.2l2.4 12h22.52a9.651 9.651 0 0 1 9.28 7 5.491 5.491 0 0 1-5.28 7H164.159a5.787 5.787 0 0 1-5.659-7 8.855 8.855 0 0 1 8.659-7H189.8zM114 28a6 6 0 0 0-6 6v126a6 6 0 0 0 6 6h200a6 6 0 0 0 6-6V34a6 6 0 0 0-6-6H114zm5 6h190a5 5 0 0 1 5 5v116a5 5 0 0 1-5 5H119a5 5 0 0 1-5-5V39a5 5 0 0 1 5-5zm0 4a1 1 0 0 0-1 1v116a1 1 0 0 0 1 1h190a1 1 0 0 0 1-1V39a1 1 0 0 0-1-1H119zm112.72 132h-35.44l-2.4 12h40.24l-2.4-12zm-64.561 16c-2.29 0-4.268 1.6-4.748 3.838A1.787 1.787 0 0 0 164.16 192h100.56a1.491 1.491 0 0 0 1.435-1.901A5.651 5.651 0 0 0 260.72 186h-93.561z"
/><path
fill=
"#FEF0E8"
d=
"M177.965 99H194a2 2 0 1 1 0 4h-16.322c-1.374 6.29-6.976 11-13.678 11-6.702 0-12.304-4.71-13.678-11h-3.365l-7.395 9.249a2 2 0 0 1-3.049.089L128.11 103h-5.844a2 2 0 1 1 0-4H129a2 2 0 0 1 1.487.662l7.423 8.248 6.523-8.159a2 2 0 0 1 1.562-.751h4.04c.513-7.265 6.57-13 13.965-13 7.396 0 13.452 5.735 13.965 13zM164 110c5.523 0 10-4.477 10-10s-4.477-10-10-10-10 4.477-10 10 4.477 10 10 10z"
/><path
fill=
"#EFEDF8"
d=
"M273.847 103c-.962 6.23-6.347 11-12.847 11-6.5 0-11.885-4.77-12.847-11H232a2 2 0 0 1 0-4h16.153c.962-6.23 6.347-11 12.847-11 6.5 0 11.885 4.77 12.847 11h3.998l8.404-9.338a2 2 0 0 1 3.048.09L296.692 99H305a2 2 0 0 1 0 4h-9.27a2 2 0 0 1-1.562-.751l-6.523-8.16-7.423 8.249a2 2 0 0 1-1.487.662h-4.888zM261 110a9 9 0 1 0 0-18 9 9 0 0 0 0 18z"
/><path
fill=
"#FEE1D3"
fill-rule=
"nonzero"
d=
"M213 119c-10.493 0-19-8.507-19-19s8.507-19 19-19 19 8.507 19 19-8.507 19-19 19zm0-4c8.284 0 15-6.716 15-15 0-8.284-6.716-15-15-15-8.284 0-15 6.716-15 15 0 8.284 6.716 15 15 15z"
/><path
fill=
"#FC6D26"
d=
"M211.586 101.828L208.757 99a2 2 0 1 0-2.828 2.828l4.243 4.243c.39.39.902.586 1.414.586.512 0 1.023-.195 1.414-.586L220.071 99a2 2 0 1 0-2.828-2.828l-5.657 5.656z"
/><path
fill=
"#FDC4A8"
d=
"M162.95 101.07l-1.768-1.767a1.5 1.5 0 0 0-2.121 2.121l2.828 2.829c.293.293.677.439 1.06.439.385 0 .769-.146 1.062-.44l4.242-4.242a1.5 1.5 0 1 0-2.121-2.121l-3.182 3.182z"
/><path
fill=
"#6B4FBB"
d=
"M256.39 104.841A6 6 0 1 0 261 95v6l-4.61 3.841z"
/><path
fill=
"#FEF0E8"
fill-rule=
"nonzero"
d=
"M99 99h-5a2 2 0 1 0 0 4h5a2 2 0 1 0 0-4zm-16 0h-5a2 2 0 1 0 0 4h5a2 2 0 1 0 0-4zm-14.384-.078l-3.643-3.425a2 2 0 1 0-2.74 2.914l3.643 3.425a2 2 0 1 0 2.74-2.914zm-11.657-10.96l-3.642-3.425a2 2 0 1 0-2.74 2.914l3.642 3.425a2 2 0 0 0 2.74-2.914zm-11.656-10.96l-3.643-3.425a2 2 0 0 0-2.74 2.914l3.643 3.425a2 2 0 1 0 2.74-2.914zm-14.367-3.885l-3.593 3.477a2 2 0 0 0 2.782 2.875l3.593-3.477a2 2 0 0 0-2.782-2.875zM19.44 84.244l-3.593 3.477a2 2 0 1 0 2.781 2.874l3.593-3.477a2 2 0 0 0-2.781-2.874zM7.94 95.371l-3.593 3.477a2 2 0 1 0 2.782 2.874l3.593-3.477a2 2 0 1 0-2.782-2.874z"
/><path
fill=
"#E1DBF1"
fill-rule=
"nonzero"
d=
"M423.611 99.56l-3.598 3.472a2 2 0 0 0 2.777 2.879l3.599-3.472a2 2 0 0 0-2.778-2.878zm-11.514 11.11l-3.598 3.472a2 2 0 0 0 2.777 2.878l3.598-3.471a2 2 0 0 0-2.777-2.879zm-11.514 11.11l-3.599 3.471a2 2 0 1 0 2.778 2.879l3.598-3.472a2 2 0 1 0-2.777-2.879zm-8.799 4.48l-3.642-3.426a2 2 0 0 0-2.74 2.915l3.642 3.425a2 2 0 0 0 2.74-2.915zm-11.656-10.96l-3.643-3.426a2 2 0 1 0-2.74 2.914l3.643 3.426a2 2 0 1 0 2.74-2.915zm-11.657-10.96l-3.643-3.426a2 2 0 1 0-2.74 2.914l3.643 3.425a2 2 0 1 0 2.74-2.914zM353.001 99h-5a2 2 0 1 0 0 4h5a2 2 0 0 0 0-4zm-16 0h-5a2 2 0 1 0 0 4h5a2 2 0 0 0 0-4z"
/></g></svg>
\ No newline at end of file
app/assets/images/illustrations/slack_logo.svg
0 → 100644
View file @
57497f6f
<svg
xmlns=
"http://www.w3.org/2000/svg"
id=
"Layer_1"
viewBox=
"0 0 121.94154 121.84154"
width=
"121.942"
height=
"121.842"
><style
id=
"style200"
>
.st0{fill:#ecb32d}.st1{fill:#63c1a0}.st2{fill:#e01a59}.st3{fill:#331433}.st4{fill:#d62027}.st5{fill:#89d3df}.st6{fill:#258b74}.st7{fill:#819c3c}
</style><path
class=
"st0"
d=
"M79.03 7.511c-1.9-5.7-8-8.8-13.7-7-5.7 1.9-8.8 8-7 13.7l28.1 86.4c1.9 5.3 7.7 8.3 13.2 6.7 5.8-1.7 9.3-7.8 7.4-13.4 0-.2-28-86.4-28-86.4z"
id=
"path202"
fill=
"#ecb32d"
/><path
class=
"st1"
d=
"M35.53 21.611c-1.9-5.7-8-8.8-13.7-7-5.7 1.9-8.8 8-7 13.7l28.1 86.4c1.9 5.3 7.7 8.3 13.2 6.7 5.8-1.7 9.3-7.8 7.4-13.4 0-.2-28-86.4-28-86.4z"
id=
"path204"
fill=
"#63c1a0"
/><path
class=
"st2"
d=
"M114.43 79.011c5.7-1.9 8.8-8 7-13.7-1.9-5.7-8-8.8-13.7-7l-86.5 28.2c-5.3 1.9-8.3 7.7-6.7 13.2 1.7 5.8 7.8 9.3 13.4 7.4.2 0 86.5-28.1 86.5-28.1z"
id=
"path206"
fill=
"#e01a59"
/><path
class=
"st3"
d=
"M39.23 103.511c5.6-1.8 12.9-4.2 20.7-6.7-1.8-5.6-4.2-12.9-6.7-20.7l-20.7 6.7z"
id=
"path208"
fill=
"#331433"
/><path
class=
"st4"
d=
"M82.83 89.311c7.8-2.5 15.1-4.9 20.7-6.7-1.8-5.6-4.2-12.9-6.7-20.7l-20.7 6.7z"
id=
"path210"
fill=
"#d62027"
/><path
class=
"st5"
d=
"M100.23 35.511c5.7-1.9 8.8-8 7-13.7-1.9-5.7-8-8.8-13.7-7l-86.4 28.1c-5.3 1.9-8.3 7.7-6.7 13.2 1.7 5.8 7.8 9.3 13.4 7.4.2 0 86.4-28 86.4-28z"
id=
"path212"
fill=
"#89d3df"
/><path
class=
"st6"
d=
"M25.13 59.911c5.6-1.8 12.9-4.2 20.7-6.7-2.5-7.8-4.9-15.1-6.7-20.7l-20.7 6.7z"
id=
"path214"
fill=
"#258b74"
/><path
class=
"st7"
d=
"M68.63 45.811c7.8-2.5 15.1-4.9 20.7-6.7-2.5-7.8-4.9-15.1-6.7-20.7l-20.7 6.7z"
id=
"path216"
fill=
"#819c3c"
/></svg>
\ No newline at end of file
app/assets/images/illustrations/wiki-fro-logged-out-users.svg
0 → 100644
View file @
57497f6f
<svg
xmlns=
"http://www.w3.org/2000/svg"
width=
"412"
height=
"260"
viewBox=
"0 0 412 260"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
><defs><path
id=
"a"
d=
"M6.447.894L12 12H0L5.553.894a.5.5 0 0 1 .894 0z"
/></defs><g
fill=
"none"
fill-rule=
"evenodd"
><path
fill=
"#FEF0E8"
fill-rule=
"nonzero"
d=
"M338 50.287C322.695 41.45 303.124 46.694 294.287 62c-8.836 15.305-3.592 34.876 11.713 43.712 15.306 8.837 34.877 3.593 43.713-11.712 8.837-15.306 3.593-34.877-11.713-43.713zm2-3.464C357.22 56.763 363.118 78.78 353.177 96c-9.941 17.218-31.958 23.118-49.177 13.176-17.218-9.94-23.118-31.958-13.177-49.176C300.764 42.78 322.782 36.88 340 46.823z"
/><g
transform=
"rotate(-150 171.003 8.53)"
><path
fill=
"#FC6D26"
fill-rule=
"nonzero"
d=
"M4 16v25a2 2 0 1 0 4 0V16H4zm8-4v29a6 6 0 1 1-12 0V12h12z"
/><use
fill=
"#D8D8D8"
xlink:href=
"#a"
/><path
stroke=
"#FDC4A8"
stroke-width=
"4"
d=
"M6 4.472L3.236 10h5.528L6 4.472z"
/><path
fill=
"#FC6D26"
d=
"M9 6L6.447.894a.5.5 0 0 0-.894 0L3 6c.836.628 1.874 1 3 1a4.978 4.978 0 0 0 3-1z"
/></g><path
fill=
"#F9F9F9"
d=
"M263.116 237.116A10.002 10.002 0 0 1 254 243h-86c-11.046 0-20-8.954-20-20V121c0-4.056 2.414-7.547 5.884-9.116A9.964 9.964 0 0 0 153 116v106c0 8.837 7.163 16 16 16h90c1.467 0 2.86-.316 4.116-.884z"
/><path
fill=
"#EEE"
fill-rule=
"nonzero"
d=
"M214.5 106H163c-5.523 0-10 4.477-10 10v106c0 8.837 7.163 16 16 16h90c5.523 0 10-4.477 10-10v-17.999a10.036 10.036 0 0 1-4 3.167V228a6 6 0 0 1-6 6h-90c-6.627 0-12-5.373-12-12V116a6 6 0 0 1 6-6h7v-4h44.5z"
/><path
fill=
"#EEE"
fill-rule=
"nonzero"
d=
"M260 218.268V214h-90a6 6 0 0 0 0 12h86a4 4 0 0 0 4-4v-.268a1.99 1.99 0 0 1-1 .268h-50a2 2 0 0 1 0-4h50c.364 0 .706.097 1 .268zM170 210h90.5a3.5 3.5 0 0 1 3.5 3.5v8.5a8 8 0 0 1-8 8h-86c-5.523 0-10-4.477-10-10s4.477-10 10-10z"
/><path
fill=
"#EEE"
fill-rule=
"nonzero"
d=
"M174 110v100h87a6 6 0 0 0 6-6v-88a6 6 0 0 0-6-6h-87zm-4-4h91c5.523 0 10 4.477 10 10v88c0 5.523-4.477 10-10 10h-91V106z"
/><path
fill=
"#EFEDF8"
d=
"M230 99h18a6 6 0 0 1 6 6v31.35a3 3 0 0 1-4.68 2.484l-9.277-6.274a1.5 1.5 0 0 0-1.664-.01l-9.731 6.395a3 3 0 0 1-4.648-2.507V105a6 6 0 0 1 6-6z"
/><path
fill=
"#C3B8E3"
fill-rule=
"nonzero"
d=
"M236.182 129.207a5.5 5.5 0 0 1 6.102.04l7.716 5.219V105a2 2 0 0 0-2-2h-18a2 2 0 0 0-2 2v29.584l8.182-5.377zM230 99h18a6 6 0 0 1 6 6v31.35a3 3 0 0 1-4.68 2.484l-9.277-6.274a1.5 1.5 0 0 0-1.664-.01l-9.731 6.395a3 3 0 0 1-4.648-2.507V105a6 6 0 0 1 6-6z"
/><g
fill-rule=
"nonzero"
><path
fill=
"#EFEDF8"
d=
"M156 74c14.912 0 27-12.088 27-27s-12.088-27-27-27-27 12.088-27 27 12.088 27 27 27zm0 4c-17.12 0-31-13.88-31-31s13.88-31 31-31 31 13.88 31 31-13.88 31-31 31z"
/><path
fill=
"#6B4FBB"
d=
"M147.535 44.916l-.116 1.086a8.446 8.446 0 0 0 .093 2.44l.2 1.08-2.262 1.202a.495.495 0 0 0-.213.678l.941 1.77c.128.239.434.332.68.201l2.25-1.196.785.775a8.544 8.544 0 0 0 1.967 1.45l.975.522-.486 2.5a.495.495 0 0 0 .392.59l1.968.383a.504.504 0 0 0 .585-.401l.489-2.515 1.086-.13a8.584 8.584 0 0 0 2.363-.633l1.005-.43 1.68 1.933a.495.495 0 0 0 .708.055l1.513-1.315a.504.504 0 0 0 .044-.708l-1.67-1.922.583-.94c.431-.696.761-1.45.978-2.239l.292-1.063 2.547-.089a.495.495 0 0 0 .488-.515l-.07-2.003a.504.504 0 0 0-.523-.48l-2.56.09-.367-1.037a8.446 8.446 0 0 0-1.139-2.159l-.644-.882 1.509-2.076a.495.495 0 0 0-.106-.702l-1.621-1.178a.504.504 0 0 0-.7.116l-1.494 2.057-1.05-.362a8.459 8.459 0 0 0-2.398-.455l-1.1-.047-.66-2.466a.495.495 0 0 0-.613-.36l-1.936.519a.504.504 0 0 0-.35.617l.661 2.466-.93.59a8.459 8.459 0 0 0-1.848 1.594l-.728.838-2.322-1.034a.495.495 0 0 0-.665.25l-.815 1.83a.504.504 0 0 0 .26.661l2.344 1.044zm-3.565 1.697a3.504 3.504 0 0 1-1.78-4.622l.815-1.83a3.495 3.495 0 0 1 4.626-1.77l.346.154c.259-.245.529-.477.81-.697l-.106-.394a3.504 3.504 0 0 1 2.471-4.292l1.936-.519a3.495 3.495 0 0 1 4.286 2.481l.106.395c.353.05.703.116 1.05.198l.222-.306a3.504 3.504 0 0 1 4.89-.78l1.622 1.178a3.495 3.495 0 0 1 .769 4.892l-.258.355c.184.312.354.633.508.962l.42-.014a3.504 3.504 0 0 1 3.625 3.373l.07 2.003a3.495 3.495 0 0 1-3.382 3.618l-.4.014c-.127.332-.27.659-.426.978l.256.294a3.504 3.504 0 0 1-.34 4.941l-1.512 1.315a3.495 3.495 0 0 1-4.94-.351l-.283-.325a11.669 11.669 0 0 1-1.05.28l-.082.424a3.504 3.504 0 0 1-4.103 2.774l-1.967-.382a3.495 3.495 0 0 1-2.765-4.11l.075-.383a11.547 11.547 0 0 1-.858-.633l-.354.188a3.504 3.504 0 0 1-4.738-1.442l-.94-1.77a3.495 3.495 0 0 1 1.453-4.734l.37-.197a11.436 11.436 0 0 1-.041-1.088l-.4-.178zm13.326 5.608a5.5 5.5 0 1 1-2.847-10.625 5.5 5.5 0 0 1 2.847 10.625zm-.776-2.898a2.5 2.5 0 1 0-1.294-4.83 2.5 2.5 0 0 0 1.294 4.83z"
/></g><g
fill-rule=
"nonzero"
><path
fill=
"#EFEDF8"
d=
"M326.979 222.047c14.403 3.86 29.209-4.688 33.068-19.092 3.86-14.403-4.688-29.209-19.092-33.068-14.403-3.86-29.209 4.688-33.068 19.092-3.86 14.404 4.688 29.209 19.092 33.068zm-1.035 3.864c-16.538-4.431-26.352-21.43-21.92-37.967 4.43-16.538 21.429-26.352 37.966-21.92 16.538 4.43 26.352 21.429 21.92 37.966-4.43 16.538-21.429 26.352-37.966 21.92z"
/><path
fill=
"#6B4FBB"
d=
"M329.376 201.598c-4.668-2.621-7.155-8.157-5.706-13.566 1.715-6.402 8.295-10.201 14.697-8.486 6.402 1.716 10.2 8.296 8.485 14.697-1.45 5.41-6.371 8.96-11.725 8.897a3.03 3.03 0 0 1-.074.365l-1.812 6.761a3 3 0 0 1-5.795-1.552l1.812-6.762a3.03 3.03 0 0 1 .118-.354zm3.815-2.733a8 8 0 1 0 4.14-15.455 8 8 0 0 0-4.14 15.455z"
/></g><path
fill=
"#FEF0E8"
fill-rule=
"nonzero"
d=
"M91.373 193c17.071-4.574 27.202-22.12 22.628-39.191-4.575-17.071-22.121-27.202-39.192-22.628-17.071 4.574-27.202 22.121-22.628 39.192 4.574 17.071 22.121 27.202 39.192 22.627zm1.035 3.864c-19.204 5.146-38.945-6.25-44.09-25.456-5.146-19.204 6.25-38.945 25.455-44.09 19.205-5.146 38.945 6.25 44.091 25.455 5.146 19.205-6.25 38.945-25.456 44.091z"
/><path
fill=
"#FDC4A8"
fill-rule=
"nonzero"
d=
"M70.067 152.122l6.73 25.114 19.318-5.176-6.73-25.114-19.318 5.176zm-1.035-3.864l19.318-5.176a4 4 0 0 1 4.9 2.828l6.729 25.114a4 4 0 0 1-2.829 4.9L77.832 181.1a4 4 0 0 1-4.9-2.829l-6.729-25.114a4 4 0 0 1 2.829-4.899z"
/><path
fill=
"#FC6D26"
d=
"M76.898 154.433l7.727-2.07a2 2 0 0 1 1.036 3.863l-7.728 2.07a2 2 0 1 1-1.035-3.863zm1.812 6.761l5.795-1.553a2 2 0 0 1 1.035 3.864l-5.795 1.553a2 2 0 1 1-1.035-3.864zm1.811 6.762l7.728-2.07a2 2 0 0 1 1.035 3.863l-7.727 2.07a2 2 0 1 1-1.036-3.863z"
/></g></svg>
\ No newline at end of file
app/assets/javascripts/vue_shared/components/markdown/field.vue
View file @
57497f6f
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
import
GLForm
from
'
../../../gl_form
'
;
import
GLForm
from
'
../../../gl_form
'
;
import
markdownHeader
from
'
./header.vue
'
;
import
markdownHeader
from
'
./header.vue
'
;
import
markdownToolbar
from
'
./toolbar.vue
'
;
import
markdownToolbar
from
'
./toolbar.vue
'
;
import
icon
from
'
../icon.vue
'
;
export
default
{
export
default
{
props
:
{
props
:
{
...
@@ -37,6 +38,7 @@
...
@@ -37,6 +38,7 @@
components
:
{
components
:
{
markdownHeader
,
markdownHeader
,
markdownToolbar
,
markdownToolbar
,
icon
,
},
},
computed
:
{
computed
:
{
shouldShowReferencedUsers
()
{
shouldShowReferencedUsers
()
{
...
@@ -114,10 +116,10 @@
...
@@ -114,10 +116,10 @@
class=
"zen-control zen-control-leave js-zen-leave"
class=
"zen-control zen-control-leave js-zen-leave"
href=
"#"
href=
"#"
aria-label=
"Enter zen mode"
>
aria-label=
"Enter zen mode"
>
<i
<i
con
class=
"fa fa-compress
"
name=
"screen-normal
"
aria-hidden=
"true
"
>
:size=
"32
"
>
</i>
</i
con
>
</a>
</a>
<markdown-toolbar
<markdown-toolbar
:markdown-docs-path=
"markdownDocsPath"
:markdown-docs-path=
"markdownDocsPath"
...
...
app/assets/javascripts/vue_shared/components/markdown/header.vue
View file @
57497f6f
<
script
>
<
script
>
import
tooltip
from
'
../../directives/tooltip
'
;
import
tooltip
from
'
../../directives/tooltip
'
;
import
toolbarButton
from
'
./toolbar_button.vue
'
;
import
toolbarButton
from
'
./toolbar_button.vue
'
;
import
icon
from
'
../icon.vue
'
;
export
default
{
export
default
{
props
:
{
props
:
{
...
@@ -14,6 +15,7 @@
...
@@ -14,6 +15,7 @@
},
},
components
:
{
components
:
{
toolbarButton
,
toolbarButton
,
icon
,
},
},
methods
:
{
methods
:
{
toggleMarkdownPreview
(
e
,
form
)
{
toggleMarkdownPreview
(
e
,
form
)
{
...
@@ -70,7 +72,7 @@
...
@@ -70,7 +72,7 @@
tag=
"> "
tag=
"> "
:prepend=
"true"
:prepend=
"true"
button-title=
"Insert a quote"
button-title=
"Insert a quote"
icon=
"quote
-right
"
/>
icon=
"quote"
/>
<toolbar-button
<toolbar-button
tag=
"`"
tag=
"`"
tag-block=
"```"
tag-block=
"```"
...
@@ -80,17 +82,17 @@
...
@@ -80,17 +82,17 @@
tag=
"* "
tag=
"* "
:prepend=
"true"
:prepend=
"true"
button-title=
"Add a bullet list"
button-title=
"Add a bullet list"
icon=
"list-
ul
"
/>
icon=
"list-
bulleted
"
/>
<toolbar-button
<toolbar-button
tag=
"1. "
tag=
"1. "
:prepend=
"true"
:prepend=
"true"
button-title=
"Add a numbered list"
button-title=
"Add a numbered list"
icon=
"list-
ol
"
/>
icon=
"list-
numbered
"
/>
<toolbar-button
<toolbar-button
tag=
"* [ ] "
tag=
"* [ ] "
:prepend=
"true"
:prepend=
"true"
button-title=
"Add a task list"
button-title=
"Add a task list"
icon=
"
check-square-o
"
/>
icon=
"
task-done
"
/>
</div>
</div>
<div
class=
"toolbar-group"
>
<div
class=
"toolbar-group"
>
<button
<button
...
@@ -101,10 +103,9 @@
...
@@ -101,10 +103,9 @@
tabindex=
"-1"
tabindex=
"-1"
title=
"Go full screen"
title=
"Go full screen"
type=
"button"
>
type=
"button"
>
<i
<icon
aria-hidden=
"true"
name=
"screen-full"
>
class=
"fa fa-arrows-alt fa-fw"
>
</icon>
</i>
</button>
</button>
</div>
</div>
</li>
</li>
...
...
app/assets/javascripts/vue_shared/components/markdown/toolbar_button.vue
View file @
57497f6f
<
script
>
<
script
>
import
tooltip
from
'
../../directives/tooltip
'
;
import
tooltip
from
'
../../directives/tooltip
'
;
import
icon
from
'
../icon.vue
'
;
export
default
{
export
default
{
props
:
{
props
:
{
...
@@ -26,14 +27,12 @@
...
@@ -26,14 +27,12 @@
default
:
false
,
default
:
false
,
},
},
},
},
components
:
{
icon
,
},
directives
:
{
directives
:
{
tooltip
,
tooltip
,
},
},
computed
:
{
iconClass
()
{
return
`fa-
${
this
.
icon
}
`
;
},
},
};
};
</
script
>
</
script
>
...
@@ -49,10 +48,8 @@
...
@@ -49,10 +48,8 @@
:data-md-prepend=
"prepend"
:data-md-prepend=
"prepend"
:title=
"buttonTitle"
:title=
"buttonTitle"
:aria-label=
"buttonTitle"
>
:aria-label=
"buttonTitle"
>
<i
<icon
aria-hidden=
"true"
:name=
"icon"
>
class=
"fa fa-fw"
</icon>
:class=
"iconClass"
>
</i>
</button>
</button>
</
template
>
</
template
>
app/assets/stylesheets/framework/markdown_area.scss
View file @
57497f6f
...
@@ -138,15 +138,23 @@
...
@@ -138,15 +138,23 @@
.toolbar-btn
{
.toolbar-btn
{
float
:
left
;
float
:
left
;
padding
:
0
5px
;
padding
:
0
7px
;
color
:
$gl-text-color-secondary
;
background
:
transparent
;
background
:
transparent
;
border
:
0
;
border
:
0
;
outline
:
0
;
outline
:
0
;
svg
{
width
:
14px
;
height
:
14px
;
margin-top
:
3px
;
fill
:
$gl-text-color-secondary
;
}
&
:hover
,
&
:hover
,
&
:focus
{
&
:focus
{
color
:
$gl-link-color
;
svg
{
fill
:
$gl-link-color
;
}
}
}
}
}
...
...
app/assets/stylesheets/framework/zen.scss
View file @
57497f6f
...
@@ -57,7 +57,15 @@
...
@@ -57,7 +57,15 @@
padding
:
5px
;
padding
:
5px
;
font-size
:
36px
;
font-size
:
36px
;
svg
{
fill
:
$gl-text-color
;
}
&
:hover
{
&
:hover
{
color
:
$black
;
color
:
$black
;
svg
{
fill
:
$black
;
}
}
}
}
}
app/helpers/markup_helper.rb
View file @
57497f6f
...
@@ -218,7 +218,7 @@ module MarkupHelper
...
@@ -218,7 +218,7 @@ module MarkupHelper
data:
data
,
data:
data
,
title:
options
[
:title
],
title:
options
[
:title
],
aria:
{
label:
options
[
:title
]
}
do
aria:
{
label:
options
[
:title
]
}
do
icon
(
options
[
:icon
])
sprite_
icon
(
options
[
:icon
])
end
end
end
end
...
...
app/views/projects/_md_preview.html.haml
View file @
57497f6f
...
@@ -19,16 +19,16 @@
...
@@ -19,16 +19,16 @@
%li
.pull-right
%li
.pull-right
.toolbar-group
.toolbar-group
=
markdown_toolbar_button
({
icon:
"bold
fw
"
,
data:
{
"md-tag"
=>
"**"
},
title:
"Add bold text"
})
=
markdown_toolbar_button
({
icon:
"bold"
,
data:
{
"md-tag"
=>
"**"
},
title:
"Add bold text"
})
=
markdown_toolbar_button
({
icon:
"italic
fw
"
,
data:
{
"md-tag"
=>
"*"
},
title:
"Add italic text"
})
=
markdown_toolbar_button
({
icon:
"italic"
,
data:
{
"md-tag"
=>
"*"
},
title:
"Add italic text"
})
=
markdown_toolbar_button
({
icon:
"quote
-right fw
"
,
data:
{
"md-tag"
=>
"> "
,
"md-prepend"
=>
true
},
title:
"Insert a quote"
})
=
markdown_toolbar_button
({
icon:
"quote"
,
data:
{
"md-tag"
=>
"> "
,
"md-prepend"
=>
true
},
title:
"Insert a quote"
})
=
markdown_toolbar_button
({
icon:
"code
fw
"
,
data:
{
"md-tag"
=>
"`"
,
"md-block"
=>
"```"
},
title:
"Insert code"
})
=
markdown_toolbar_button
({
icon:
"code"
,
data:
{
"md-tag"
=>
"`"
,
"md-block"
=>
"```"
},
title:
"Insert code"
})
=
markdown_toolbar_button
({
icon:
"list-
ul fw
"
,
data:
{
"md-tag"
=>
"* "
,
"md-prepend"
=>
true
},
title:
"Add a bullet list"
})
=
markdown_toolbar_button
({
icon:
"list-
bulleted
"
,
data:
{
"md-tag"
=>
"* "
,
"md-prepend"
=>
true
},
title:
"Add a bullet list"
})
=
markdown_toolbar_button
({
icon:
"list-
ol fw
"
,
data:
{
"md-tag"
=>
"1. "
,
"md-prepend"
=>
true
},
title:
"Add a numbered list"
})
=
markdown_toolbar_button
({
icon:
"list-
numbered
"
,
data:
{
"md-tag"
=>
"1. "
,
"md-prepend"
=>
true
},
title:
"Add a numbered list"
})
=
markdown_toolbar_button
({
icon:
"
check-square-o fw
"
,
data:
{
"md-tag"
=>
"* [ ] "
,
"md-prepend"
=>
true
},
title:
"Add a task list"
})
=
markdown_toolbar_button
({
icon:
"
task-done
"
,
data:
{
"md-tag"
=>
"* [ ] "
,
"md-prepend"
=>
true
},
title:
"Add a task list"
})
.toolbar-group
.toolbar-group
%button
.toolbar-btn.js-zen-enter.has-tooltip
{
type:
"button"
,
tabindex:
-
1
,
aria:
{
label:
"Go full screen"
},
title:
"Go full screen"
,
data:
{
container:
"body"
}
}
%button
.toolbar-btn.js-zen-enter.has-tooltip
{
type:
"button"
,
tabindex:
-
1
,
aria:
{
label:
"Go full screen"
},
title:
"Go full screen"
,
data:
{
container:
"body"
}
}
=
icon
(
"arrows-alt fw
"
)
=
sprite_icon
(
"screen-full
"
)
.md-write-holder
.md-write-holder
=
yield
=
yield
...
...
yarn.lock
View file @
57497f6f
...
@@ -2722,7 +2722,7 @@ getpass@^0.1.1:
...
@@ -2722,7 +2722,7 @@ getpass@^0.1.1:
"gitlab-svgs@https://gitlab.com/gitlab-org/gitlab-svgs.git":
"gitlab-svgs@https://gitlab.com/gitlab-org/gitlab-svgs.git":
version "1.0.4"
version "1.0.4"
resolved "https://gitlab.com/gitlab-org/gitlab-svgs.git#
46c0a49cd43639948dfcc77a0f94d59deaad1e85
"
resolved "https://gitlab.com/gitlab-org/gitlab-svgs.git#
0442503549e6d74a4e22e1641e1d2ab0ae09884b
"
glob-base@^0.3.0:
glob-base@^0.3.0:
version "0.3.0"
version "0.3.0"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment