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
Boxiang Sun
gitlab-ce
Commits
e7d23a28
Commit
e7d23a28
authored
7 years ago
by
Winnie Hellmann
Committed by
Tim Zallmann
7 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add chevron to create dropdown on repository page
parent
7619bdd6
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
36 additions
and
19 deletions
+36
-19
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/clusters_empty.svg
app/assets/images/illustrations/clusters_empty.svg
+1
-1
app/assets/images/illustrations/merge_request_changes_empty.svg
...sets/images/illustrations/merge_request_changes_empty.svg
+1
-0
app/assets/javascripts/repo/components/new_dropdown/index.vue
...assets/javascripts/repo/components/new_dropdown/index.vue
+10
-5
app/assets/stylesheets/pages/tree.scss
app/assets/stylesheets/pages/tree.scss
+11
-2
app/views/projects/tree/_old_tree_header.html.haml
app/views/projects/tree/_old_tree_header.html.haml
+9
-7
yarn.lock
yarn.lock
+2
-2
No files found.
app/assets/images/icons.json
View file @
e7d23a28
{
"iconCount"
:
179
,
"spriteSize"
:
81882
,
"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"
,
"ellipsis_v"
,
"emoji_slightly_smiling_face"
,
"emoji_smile"
,
"emoji_smiley"
,
"epic"
,
"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-square"
,
"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"
]}
{
"iconCount"
:
180
,
"spriteSize"
:
82176
,
"icons"
:[
"abuse"
,
"account"
,
"admin"
,
"angle-double-left"
,
"angle-double-right"
,
"angle-down"
,
"angle-left"
,
"angle-right"
,
"angle-up"
,
"appearance"
,
"applications"
,
"approval"
,
"arrow-down"
,
"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"
,
"ellipsis_v"
,
"emoji_slightly_smiling_face"
,
"emoji_smile"
,
"emoji_smiley"
,
"epic"
,
"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-square"
,
"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
This diff is collapsed.
Click to expand it.
app/assets/images/icons.svg
View file @
e7d23a28
This source diff could not be displayed because it is too large. You can
view the blob
instead.
This diff is collapsed.
Click to expand it.
app/assets/images/illustrations/clusters_empty.svg
View file @
e7d23a28
<svg
height=
"128"
viewBox=
"0 0 142 128"
width=
"142"
xmlns=
"http://www.w3.org/2000/svg"
><g
fill=
"none"
fill-rule=
"evenodd"
><path
d=
"M94 62h20v4H94z"
fill=
"#f0edf8"
/><path
d=
"M84.828 84l17.678 17.678-2.828 2.828L82 86.828z"
fill=
"#fee1d3"
/><path
d=
"M42.828 24l17.678 17.678-2.828 2.828L40 26.828zM40 101.678L57.678 84l2.828 2.828-17.678 17.678z"
fill=
"#f0edf8"
/><g
fill=
"#fee1d3"
><path
d=
"M82 41.678L99.678 24l2.828 2.828-17.678 17.678zM28 62h20v4H28z"
/><rect
height=
"30"
rx=
"5"
width=
"30"
y=
"49"
/></g><rect
height=
"26"
rx=
"5"
stroke=
"#fdc4a8"
stroke-width=
"4"
width=
"26"
x=
"2"
y=
"51"
/><rect
fill=
"#c3b8e3"
height=
"50"
rx=
"10"
width=
"50"
x=
"46"
y=
"39"
/><rect
height=
"46"
rx=
"10"
stroke=
"#6b4fbb"
stroke-width=
"4"
width=
"46"
x=
"48"
y=
"41"
/><rect
fill=
"#fef0e8"
height=
"30"
rx=
"5"
width=
"30"
x=
"84"
/><rect
height=
"26"
rx=
"5"
stroke=
"#fee1d3"
stroke-width=
"4"
width=
"26"
x=
"86"
y=
"2"
/><rect
fill=
"#fee1d3"
height=
"30"
rx=
"5"
width=
"30"
x=
"84"
y=
"98"
/><rect
height=
"26"
rx=
"5"
stroke=
"#fdc4a8"
stroke-width=
"4"
width=
"26"
x=
"86"
y=
"100"
/><rect
fill=
"#f0edf8"
height=
"30"
rx=
"5"
width=
"30"
x=
"112"
y=
"49"
/><rect
height=
"26"
rx=
"5"
stroke=
"#e1dbf1"
stroke-width=
"4"
width=
"26"
x=
"114"
y=
"51"
/><rect
fill=
"#f0edf8"
height=
"30"
rx=
"5"
width=
"30"
x=
"28"
y=
"98"
/><rect
height=
"26"
rx=
"5"
stroke=
"#e1dbf1"
stroke-width=
"4"
width=
"26"
x=
"30"
y=
"100"
/><rect
fill=
"#f0edf8"
height=
"30"
rx=
"5"
width=
"30"
x=
"28"
/><rect
height=
"26"
rx=
"5"
stroke=
"#e1dbf1"
stroke-width=
"4"
width=
"26"
x=
"30"
y=
"2"
/></g></svg>
<svg
height=
"128"
viewBox=
"0 0 142 128"
width=
"142"
xmlns=
"http://www.w3.org/2000/svg"
><g
fill=
"none"
fill-rule=
"evenodd"
><path
d=
"M94 62h20v4H94z"
fill=
"#f0edf8"
/><path
d=
"M84.828 84l17.678 17.678-2.828 2.828L82 86.828z"
fill=
"#fee1d3"
/><path
d=
"M42.828 24l17.678 17.678-2.828 2.828L40 26.828zM40 101.678L57.678 84l2.828 2.828-17.678 17.678z"
fill=
"#f0edf8"
/><path
d=
"M82 41.678L99.678 24l2.828 2.828-17.678 17.678zM28 62h20v4H28zM3 52h24v24H3z"
fill=
"#fee1d3"
/><path
d=
"M31 3h24v24H31z"
fill=
"#f0edf8"
/><path
d=
"M87 3h24v24H87z"
fill=
"#fef0e8"
/><path
d=
"M115 52h24v24h-24z"
fill=
"#f0edf8"
/><path
d=
"M87 101h24v24H87z"
fill=
"#fee1d3"
/><path
d=
"M31 101h24v24H31z"
fill=
"#f0edf8"
/><path
d=
"M49 42h44v44H49z"
fill=
"#c3b8e3"
/><g
fill-rule=
"nonzero"
><path
d=
"M5 53a1 1 0 0 0-1 1v20a1 1 0 0 0 1 1h20a1 1 0 0 0 1-1V54a1 1 0 0 0-1-1zm0-4h20a5 5 0 0 1 5 5v20a5 5 0 0 1-5 5H5a5 5 0 0 1-5-5V54a5 5 0 0 1 5-5z"
fill=
"#fdc4a8"
/><path
d=
"M56 43a6 6 0 0 0-6 6v30a6 6 0 0 0 6 6h30a6 6 0 0 0 6-6V49a6 6 0 0 0-6-6zm0-4h30c5.523 0 10 4.477 10 10v30c0 5.523-4.477 10-10 10H56c-5.523 0-10-4.477-10-10V49c0-5.523 4.477-10 10-10z"
fill=
"#6b4fbb"
/><path
d=
"M89 4a1 1 0 0 0-1 1v20a1 1 0 0 0 1 1h20a1 1 0 0 0 1-1V5a1 1 0 0 0-1-1zm0-4h20a5 5 0 0 1 5 5v20a5 5 0 0 1-5 5H89a5 5 0 0 1-5-5V5a5 5 0 0 1 5-5z"
fill=
"#fee1d3"
/><path
d=
"M89 102a1 1 0 0 0-1 1v20a1 1 0 0 0 1 1h20a1 1 0 0 0 1-1v-20a1 1 0 0 0-1-1zm0-4h20a5 5 0 0 1 5 5v20a5 5 0 0 1-5 5H89a5 5 0 0 1-5-5v-20a5 5 0 0 1 5-5z"
fill=
"#fdc4a8"
/><path
d=
"M117 53a1 1 0 0 0-1 1v20a1 1 0 0 0 1 1h20a1 1 0 0 0 1-1V54a1 1 0 0 0-1-1zm0-4h20a5 5 0 0 1 5 5v20a5 5 0 0 1-5 5h-20a5 5 0 0 1-5-5V54a5 5 0 0 1 5-5zM33 102a1 1 0 0 0-1 1v20a1 1 0 0 0 1 1h20a1 1 0 0 0 1-1v-20a1 1 0 0 0-1-1zm0-4h20a5 5 0 0 1 5 5v20a5 5 0 0 1-5 5H33a5 5 0 0 1-5-5v-20a5 5 0 0 1 5-5zM33 4a1 1 0 0 0-1 1v20a1 1 0 0 0 1 1h20a1 1 0 0 0 1-1V5a1 1 0 0 0-1-1zm0-4h20a5 5 0 0 1 5 5v20a5 5 0 0 1-5 5H33a5 5 0 0 1-5-5V5a5 5 0 0 1 5-5z"
fill=
"#e1dbf1"
/></g></g></svg>
\ No newline at end of file
\ No newline at end of file
This diff is collapsed.
Click to expand it.
app/assets/images/illustrations/merge_request_changes_empty.svg
0 → 100644
View file @
e7d23a28
<svg
xmlns=
"http://www.w3.org/2000/svg"
viewBox=
"0 0 374 268"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
><defs><rect
id=
"d"
width=
"230"
height=
"176"
rx=
"10"
fill=
"#fff"
/><rect
id=
"e"
width=
"14"
rx=
"2"
height=
"4"
/><rect
id=
"f"
width=
"14"
x=
"40"
rx=
"2"
height=
"4"
/><rect
id=
"g"
width=
"14"
x=
"40"
y=
"24"
rx=
"2"
height=
"4"
/><rect
id=
"h"
width=
"7"
x=
"20"
y=
"12"
rx=
"2"
height=
"4"
/><rect
id=
"i"
width=
"7"
y=
"24"
rx=
"2"
height=
"4"
/><rect
id=
"j"
width=
"7"
x=
"33"
y=
"12"
rx=
"2"
height=
"4"
/><circle
id=
"l"
cx=
"31"
cy=
"31"
r=
"31"
/><circle
id=
"c"
cx=
"35"
cy=
"35"
r=
"35"
/><circle
id=
"a"
cx=
"44"
cy=
"44"
r=
"44"
/><circle
id=
"b"
cx=
"31"
cy=
"31"
r=
"31"
/></defs><g
fill=
"none"
fill-rule=
"evenodd"
><g
transform=
"translate(0 94)"
><circle
cx=
"57"
cy=
"57"
r=
"44"
fill=
"#f9f9f9"
/><g
transform=
"rotate(-7.999 120.507 -22.508)"
><use
fill=
"#fff"
xlink:href=
"#a"
/><circle
cx=
"44"
cy=
"44"
r=
"42"
stroke=
"#eee"
stroke-width=
"4"
/><path
fill=
"#fee1d3"
fill-rule=
"nonzero"
d=
"M34.394 55.736A4 4 0 0 1 36.706 55H56a6 6 0 0 0 6-6V35a6 6 0 0 0-6-6H34a6 6 0 0 0-6 6v25.26l6.394-4.529m2.312 3.264l-7.972 5.647A3.001 3.001 0 0 1 24 62.194v-27.2c0-5.523 4.477-10 10-10h22c5.523 0 10 4.477 10 10v14c0 5.523-4.477 10-10 10H36.706"
/><path
fill=
"#fc6d26"
d=
"M38 40a2 2 0 1 1 .001 3.999A2 2 0 0 1 38 40m7 0a2 2 0 1 1 .001 3.999A2 2 0 0 1 45 40m7 0a2 2 0 1 1 .001 3.999A2 2 0 0 1 52 40"
/></g></g><g
transform=
"translate(48)"
><circle
cx=
"41"
cy=
"41"
r=
"31"
fill=
"#f9f9f9"
/><g
transform=
"rotate(-7.999 84.554 -15.551)"
><use
fill=
"#fff"
xlink:href=
"#b"
/><circle
cx=
"31"
cy=
"31"
r=
"29"
stroke=
"#eee"
stroke-width=
"4"
/><rect
width=
"20"
height=
"4"
x=
"21"
y=
"29"
fill=
"#6b4fbb"
rx=
"2"
/></g></g><path
fill=
"#f9f9f9"
d=
"M235.58 229H102c-6.627 0-12-5.373-12-12V65c0-6.627 5.373-12 12-12h206c6.627 0 12 5.373 12 12v18.399A34.834 34.834 0 0 1 337 79c19.33 0 35 15.67 35 35s-15.67 35-35 35a34.831 34.831 0 0 1-17-4.399v72.4c0 6.627-5.373 12-12 12h-11.58c.381 1.941.58 3.947.58 6 0 17.12-13.879 31-31 31-17.12 0-31-13.879-31-31 0-2.053.2-4.059.58-6"
/><g
transform=
"translate(87 50)"
><g
transform=
"rotate(7.999 -44.933 1563.894)"
><use
fill=
"#fff"
xlink:href=
"#c"
/><circle
cx=
"35"
cy=
"35"
r=
"33"
stroke=
"#eee"
stroke-width=
"4"
/><g
transform=
"translate(20 19)"
><circle
cx=
"15"
cy=
"16"
r=
"15"
fill=
"#f4f1fa"
stroke=
"#6b4fbb"
stroke-width=
"3"
/><g
fill=
"#6b4fbb"
><path
d=
"M19.419 6.996h-.007L16.959 4l-2.454 2.997H14.5L12.046 4 9.591 6.998h-.003L7.133 4 4.677 6.999H2.001c2.605-4.204 7.231-7 12.502-7 5.269 0 9.892 2.793 12.498 6.994h-2.676l-2.452-2.994-2.453 2.996"
/><circle
cx=
"9.5"
cy=
"17.5"
r=
"1.5"
/><circle
cx=
"20.5"
cy=
"17.5"
r=
"1.5"
/></g></g></g><use
xlink:href=
"#d"
/><rect
width=
"226"
height=
"172"
x=
"2"
y=
"2"
stroke=
"#eee"
stroke-width=
"4"
rx=
"10"
/><rect
width=
"4"
height=
"122"
x=
"33"
y=
"42"
fill=
"#eee"
rx=
"2"
/><g
transform=
"translate(13 59)"
><rect
width=
"10"
height=
"4"
fill=
"#fee1d3"
rx=
"2"
/><rect
width=
"10"
height=
"4"
y=
"12"
fill=
"#f0edf8"
rx=
"2"
/><rect
width=
"10"
height=
"4"
y=
"24"
fill=
"#fef0e9"
rx=
"2"
/><rect
width=
"10"
height=
"4"
y=
"36"
fill=
"#fee1d3"
rx=
"2"
/><rect
width=
"10"
height=
"4"
y=
"48"
fill=
"#e1dbf1"
rx=
"2"
/><rect
width=
"10"
height=
"4"
y=
"60"
fill=
"#f0edf8"
rx=
"2"
/><rect
width=
"10"
height=
"4"
y=
"72"
fill=
"#fef0e9"
rx=
"2"
/><rect
width=
"10"
height=
"4"
y=
"84"
fill=
"#fee1d3"
rx=
"2"
/></g><g
transform=
"translate(55 59)"
><use
fill=
"#6b4fbb"
xlink:href=
"#e"
/><rect
width=
"14"
height=
"4"
x=
"20"
fill=
"#f0edf8"
rx=
"2"
/><use
fill=
"#fef0e9"
xlink:href=
"#f"
/><rect
width=
"14"
height=
"4"
y=
"12"
fill=
"#f0edf8"
rx=
"2"
/><use
fill=
"#fef0e9"
xlink:href=
"#g"
/><rect
width=
"14"
height=
"4"
y=
"48"
fill=
"#e1dbf1"
rx=
"2"
/><rect
width=
"14"
height=
"4"
x=
"40"
y=
"36"
fill=
"#fef0e9"
rx=
"2"
/><use
fill=
"#fee1d3"
xlink:href=
"#h"
/><rect
width=
"7"
height=
"4"
x=
"27"
y=
"36"
fill=
"#6b4fbb"
rx=
"2"
/><rect
width=
"7"
height=
"4"
x=
"20"
y=
"48"
fill=
"#fee1d3"
rx=
"2"
/><use
fill=
"#fc6d26"
xlink:href=
"#i"
/><rect
width=
"21"
height=
"4"
x=
"13"
y=
"24"
fill=
"#e1dbf1"
rx=
"2"
/><rect
width=
"21"
height=
"4"
y=
"36"
fill=
"#eee"
rx=
"2"
/><use
fill=
"#6b4fbb"
xlink:href=
"#j"
/><g
transform=
"translate(98)"
><use
fill=
"#fee1d3"
xlink:href=
"#e"
/><rect
width=
"14"
height=
"4"
x=
"20"
fill=
"#f0edf8"
rx=
"2"
/><use
fill=
"#fc6d26"
xlink:href=
"#f"
/><rect
width=
"14"
height=
"4"
y=
"12"
fill=
"#fef0e9"
rx=
"2"
id=
"k"
/><use
fill=
"#e1dbf1"
xlink:href=
"#g"
/><rect
width=
"14"
height=
"4"
y=
"48"
fill=
"#f0edf8"
rx=
"2"
/><rect
width=
"14"
height=
"4"
x=
"40"
y=
"36"
fill=
"#fee1d3"
rx=
"2"
/><use
fill=
"#fc6d26"
xlink:href=
"#h"
/><rect
width=
"7"
height=
"4"
x=
"27"
y=
"36"
fill=
"#6b4fbb"
rx=
"2"
/><rect
width=
"7"
height=
"4"
x=
"20"
y=
"48"
fill=
"#fc6d26"
rx=
"2"
/><use
fill=
"#6b4fbb"
xlink:href=
"#i"
/><rect
width=
"21"
height=
"4"
x=
"13"
y=
"24"
fill=
"#fee1d3"
rx=
"2"
/><rect
width=
"21"
height=
"4"
y=
"36"
fill=
"#fef0e9"
rx=
"2"
/><use
fill=
"#6b4fbb"
xlink:href=
"#j"
/></g><g
transform=
"translate(0 60)"
><use
fill=
"#f0edf8"
xlink:href=
"#e"
/><rect
width=
"14"
height=
"4"
x=
"20"
fill=
"#6b4fbb"
rx=
"2"
/><use
fill=
"#e1dbf1"
xlink:href=
"#f"
/><use
xlink:href=
"#k"
/><use
fill=
"#fee1d3"
xlink:href=
"#g"
/><use
fill=
"#eee"
xlink:href=
"#h"
/><use
fill=
"#6b4fbb"
xlink:href=
"#i"
/><rect
width=
"21"
height=
"4"
x=
"13"
y=
"24"
fill=
"#fef0e9"
rx=
"2"
/><use
fill=
"#fc6d26"
xlink:href=
"#j"
/></g><rect
width=
"4"
height=
"63"
x=
"74"
y=
"13"
fill=
"#eee"
rx=
"2"
/></g><rect
width=
"230"
height=
"4"
y=
"27"
fill=
"#eee"
rx=
"2"
/></g><g
transform=
"rotate(7.999 -1289.786 1797.583)"
><use
fill=
"#fff"
xlink:href=
"#l"
/><circle
cx=
"31"
cy=
"31"
r=
"29"
stroke=
"#eee"
stroke-width=
"4"
/><path
fill=
"#fc6d26"
d=
"M29 29h-6a2 2 0 1 0 0 4h6v6a2 2 0 1 0 4 0v-6h6a2 2 0 1 0 0-4h-6v-6a2 2 0 1 0-4 0v6"
/></g></g></svg>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
app/assets/javascripts/repo/components/new_dropdown/index.vue
View file @
e7d23a28
...
@@ -2,9 +2,11 @@
...
@@ -2,9 +2,11 @@
import
{
mapState
}
from
'
vuex
'
;
import
{
mapState
}
from
'
vuex
'
;
import
newModal
from
'
./modal.vue
'
;
import
newModal
from
'
./modal.vue
'
;
import
upload
from
'
./upload.vue
'
;
import
upload
from
'
./upload.vue
'
;
import
icon
from
'
../../../vue_shared/components/icon.vue
'
;
export
default
{
export
default
{
components
:
{
components
:
{
icon
,
newModal
,
newModal
,
upload
,
upload
,
},
},
...
@@ -41,11 +43,14 @@
...
@@ -41,11 +43,14 @@
data-toggle=
"dropdown"
data-toggle=
"dropdown"
aria-label=
"Create new file or directory"
aria-label=
"Create new file or directory"
>
>
<i
<icon
class=
"fa fa-plus"
name=
"plus"
aria-hidden=
"true"
css-classes=
"pull-left"
>
/>
</i>
<icon
name=
"arrow-down"
css-classes=
"pull-left"
/>
</button>
</button>
<ul
class=
"dropdown-menu"
>
<ul
class=
"dropdown-menu"
>
<li>
<li>
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/tree.scss
View file @
e7d23a28
...
@@ -4,6 +4,11 @@
...
@@ -4,6 +4,11 @@
.nav-block
{
.nav-block
{
margin
:
10px
0
;
margin
:
10px
0
;
.btn
.fa
,
.btn
svg
{
color
:
$gl-text-color-secondary
;
}
@media
(
min-width
:
$screen-sm-min
)
{
@media
(
min-width
:
$screen-sm-min
)
{
display
:
flex
;
display
:
flex
;
...
@@ -91,8 +96,12 @@
...
@@ -91,8 +96,12 @@
}
}
.add-to-tree
{
.add-to-tree
{
vertical-align
:
middle
;
vertical-align
:
top
;
padding
:
6px
10px
;
padding
:
8px
;
svg
{
top
:
0
;
}
}
}
.tree-table
{
.tree-table
{
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/tree/_old_tree_header.html.haml
View file @
e7d23a28
-
if
on_top_of_branch?
-
addtotree_toggle_attributes
=
{
href:
'#'
,
'data-toggle'
:
'dropdown'
,
'data-target'
:
'.add-to-tree-dropdown'
}
-
else
-
addtotree_toggle_attributes
=
{
title:
_
(
"You can only add files when you are on a branch"
),
data:
{
container:
'body'
},
class:
'disabled has-tooltip'
}
%ul
.breadcrumb.repo-breadcrumb
%ul
.breadcrumb.repo-breadcrumb
%li
%li
=
link_to
project_tree_path
(
@project
,
@ref
)
do
=
link_to
project_tree_path
(
@project
,
@ref
)
do
...
@@ -8,13 +13,10 @@
...
@@ -8,13 +13,10 @@
-
if
current_user
-
if
current_user
%li
%li
-
if
!
on_top_of_branch?
%a
.btn.add-to-tree
{
addtotree_toggle_attributes
}
%span
.btn.add-to-tree.disabled.has-tooltip
{
title:
_
(
"You can only add files when you are on a branch"
),
data:
{
container:
'body'
}
}
=
sprite_icon
(
'plus'
,
size:
16
,
css_class:
'pull-left'
)
=
icon
(
'plus'
)
=
sprite_icon
(
'arrow-down'
,
size:
16
,
css_class:
'pull-left'
)
-
else
-
if
on_top_of_branch?
%span
.dropdown
%a
.dropdown-toggle.btn.add-to-tree
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
,
"data-target"
=>
".add-to-tree-dropdown"
}
=
icon
(
'plus'
)
.add-to-tree-dropdown
.add-to-tree-dropdown
%ul
.dropdown-menu
%ul
.dropdown-menu
-
if
can_edit_tree?
-
if
can_edit_tree?
...
...
This diff is collapsed.
Click to expand it.
yarn.lock
View file @
e7d23a28
...
@@ -55,8 +55,8 @@
...
@@ -55,8 +55,8 @@
to-fast-properties "^2.0.0"
to-fast-properties "^2.0.0"
"@gitlab-org/gitlab-svgs@^1.1.1":
"@gitlab-org/gitlab-svgs@^1.1.1":
version "1.1.
1
"
version "1.1.
3
"
resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.1.
1.tgz#6e07ea02c3b104fa8b5d860a5e2fa9dab4edab96
"
resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.1.
3.tgz#2beead1bcdd83e7400de29b01014bf17bf76318e
"
"@types/jquery@^2.0.40":
"@types/jquery@^2.0.40":
version "2.0.48"
version "2.0.48"
...
...
This diff is collapsed.
Click to expand it.
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