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
a8460f21
Commit
a8460f21
authored
Aug 18, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
style updates
fixed some more breadcrumb titles
parent
4e74eb81
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
33 additions
and
14 deletions
+33
-14
app/assets/stylesheets/new_nav.scss
app/assets/stylesheets/new_nav.scss
+12
-4
app/helpers/groups_helper.rb
app/helpers/groups_helper.rb
+3
-3
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+2
-2
app/views/groups/subgroups.html.haml
app/views/groups/subgroups.html.haml
+1
-0
app/views/layouts/nav/_breadcrumbs.html.haml
app/views/layouts/nav/_breadcrumbs.html.haml
+2
-1
app/views/layouts/nav/breadcrumbs/_collapsed_dropdown.html.haml
...ews/layouts/nav/breadcrumbs/_collapsed_dropdown.html.haml
+1
-1
app/views/projects/boards/_show.html.haml
app/views/projects/boards/_show.html.haml
+1
-1
app/views/projects/compare/index.html.haml
app/views/projects/compare/index.html.haml
+1
-0
app/views/projects/compare/show.html.haml
app/views/projects/compare/show.html.haml
+1
-1
app/views/projects/pipeline_schedules/edit.html.haml
app/views/projects/pipeline_schedules/edit.html.haml
+2
-0
app/views/projects/pipeline_schedules/index.html.haml
app/views/projects/pipeline_schedules/index.html.haml
+1
-1
app/views/projects/releases/edit.html.haml
app/views/projects/releases/edit.html.haml
+2
-0
app/views/projects/snippets/edit.html.haml
app/views/projects/snippets/edit.html.haml
+2
-0
app/views/projects/snippets/new.html.haml
app/views/projects/snippets/new.html.haml
+2
-0
No files found.
app/assets/stylesheets/new_nav.scss
View file @
a8460f21
...
@@ -292,7 +292,7 @@ header.navbar-gitlab-new {
...
@@ -292,7 +292,7 @@ header.navbar-gitlab-new {
.breadcrumbs
{
.breadcrumbs
{
display
:
flex
;
display
:
flex
;
min-height
:
61
px
;
min-height
:
48
px
;
color
:
$gl-text-color
;
color
:
$gl-text-color
;
}
}
...
@@ -300,6 +300,8 @@ header.navbar-gitlab-new {
...
@@ -300,6 +300,8 @@ header.navbar-gitlab-new {
display
:
flex
;
display
:
flex
;
width
:
100%
;
width
:
100%
;
position
:
relative
;
position
:
relative
;
padding-top
:
$gl-padding
;
padding-bottom
:
$gl-padding
;
align-items
:
center
;
align-items
:
center
;
border-bottom
:
1px
solid
$border-color
;
border-bottom
:
1px
solid
$border-color
;
}
}
...
@@ -311,7 +313,7 @@ header.navbar-gitlab-new {
...
@@ -311,7 +313,7 @@ header.navbar-gitlab-new {
color
:
$gl-text-color-secondary
;
color
:
$gl-text-color-secondary
;
.avatar-tile
{
.avatar-tile
{
margin-right
:
5
px
;
margin-right
:
4
px
;
border
:
1px
solid
$border-color
;
border
:
1px
solid
$border-color
;
border-radius
:
50%
;
border-radius
:
50%
;
vertical-align
:
sub
;
vertical-align
:
sub
;
...
@@ -332,6 +334,7 @@ header.navbar-gitlab-new {
...
@@ -332,6 +334,7 @@ header.navbar-gitlab-new {
display
:
flex
;
display
:
flex
;
flex-wrap
:
wrap
;
flex-wrap
:
wrap
;
margin-bottom
:
0
;
margin-bottom
:
0
;
line-height
:
16px
;
>
li
{
>
li
{
display
:
flex
;
display
:
flex
;
...
@@ -343,16 +346,21 @@ header.navbar-gitlab-new {
...
@@ -343,16 +346,21 @@ header.navbar-gitlab-new {
}
}
>
a
{
>
a
{
@include
str-truncated
(
128px
)
;
font-size
:
12px
;
color
:
currentColor
;
color
:
currentColor
;
}
}
}
}
}
}
.breadcrumb-item-project-name
{
@include
str-truncated
(
128px
);
}
.breadcrumbs-list-angle
{
.breadcrumbs-list-angle
{
position
:
absolute
;
position
:
absolute
;
right
:
-12px
;
right
:
-12px
;
top
:
50%
;
top
:
50%
;
color
:
$gl-text-color-tertiary
;
transform
:
translateY
(
-50%
);
transform
:
translateY
(
-50%
);
}
}
...
@@ -364,7 +372,7 @@ header.navbar-gitlab-new {
...
@@ -364,7 +372,7 @@ header.navbar-gitlab-new {
.breadcrumbs-sub-title
{
.breadcrumbs-sub-title
{
margin
:
0
;
margin
:
0
;
font-size
:
$gl-font-size
;
font-size
:
12px
;
font-weight
:
600
;
font-weight
:
600
;
line-height
:
1
;
line-height
:
1
;
...
...
app/helpers/groups_helper.rb
View file @
a8460f21
...
@@ -17,7 +17,7 @@ module GroupsHelper
...
@@ -17,7 +17,7 @@ module GroupsHelper
group
.
ancestors
.
reverse
.
each_with_index
do
|
parent
,
index
|
group
.
ancestors
.
reverse
.
each_with_index
do
|
parent
,
index
|
if
show_new_nav?
&&
index
>
0
if
show_new_nav?
&&
index
>
0
add_to_breadcrumb_dropdown
(
group_title_link
(
parent
,
hidable:
false
),
location: :before
)
add_to_breadcrumb_dropdown
(
group_title_link
(
parent
,
hidable:
false
,
show_avatar:
true
),
location: :before
)
else
else
full_title
+=
if
show_new_nav?
full_title
+=
if
show_new_nav?
breadcrumb_list_item
group_title_link
(
parent
,
hidable:
false
)
breadcrumb_list_item
group_title_link
(
parent
,
hidable:
false
)
...
@@ -83,10 +83,10 @@ module GroupsHelper
...
@@ -83,10 +83,10 @@ module GroupsHelper
private
private
def
group_title_link
(
group
,
hidable:
false
)
def
group_title_link
(
group
,
hidable:
false
,
show_avatar:
false
)
link_to
(
group_path
(
group
),
class:
"group-path
#{
'hidable'
if
hidable
}
"
)
do
link_to
(
group_path
(
group
),
class:
"group-path
#{
'hidable'
if
hidable
}
"
)
do
output
=
output
=
if
show_new_nav?
&&
group
.
try
(
:avatar_url
)
if
show_new_nav?
&&
group
.
try
(
:avatar_url
)
||
(
show_new_nav?
&&
show_avatar
)
image_tag
(
group_icon
(
group
),
class:
"avatar-tile"
,
width:
16
,
height:
16
)
image_tag
(
group_icon
(
group
),
class:
"avatar-tile"
,
width:
16
,
height:
16
)
else
else
""
""
...
...
app/helpers/projects_helper.rb
View file @
a8460f21
...
@@ -52,7 +52,7 @@ module ProjectsHelper
...
@@ -52,7 +52,7 @@ module ProjectsHelper
def
project_title
(
project
)
def
project_title
(
project
)
namespace_link
=
namespace_link
=
if
project
.
group
if
project
.
group
group_title
(
project
.
group
)
group_title
(
project
.
group
,
nil
,
nil
)
else
else
owner
=
project
.
namespace
.
owner
owner
=
project
.
namespace
.
owner
link_to
(
simple_sanitize
(
owner
.
name
),
user_path
(
owner
))
link_to
(
simple_sanitize
(
owner
.
name
),
user_path
(
owner
))
...
@@ -66,7 +66,7 @@ module ProjectsHelper
...
@@ -66,7 +66,7 @@ module ProjectsHelper
""
""
end
end
output
<<
simple_sanitize
(
project
.
name
)
output
<<
content_tag
(
"span"
,
simple_sanitize
(
project
.
name
),
class:
"breadcrumb-item-project-name"
)
output
.
html_safe
output
.
html_safe
end
end
...
...
app/views/groups/subgroups.html.haml
View file @
a8460f21
-
breadcrumb_title
"Details"
-
@no_container
=
true
-
@no_container
=
true
=
render
'head'
=
render
'head'
...
...
app/views/layouts/nav/_breadcrumbs.html.haml
View file @
a8460f21
...
@@ -13,7 +13,8 @@
...
@@ -13,7 +13,8 @@
-
if
@breadcrumbs_extra_links
-
if
@breadcrumbs_extra_links
-
@breadcrumbs_extra_links
.
each
do
|
extra
|
-
@breadcrumbs_extra_links
.
each
do
|
extra
|
=
breadcrumb_list_item
link_to
(
extra
[
:text
],
extra
[
:link
])
=
breadcrumb_list_item
link_to
(
extra
[
:text
],
extra
[
:link
])
=
render
"layouts/nav/breadcrumbs/collapsed_dropdown"
,
location: :after
-
if
defined?
(
@breadcrumb_dropdown_links
)
&&
@breadcrumb_dropdown_links
.
key?
(
:after
)
=
render
"layouts/nav/breadcrumbs/collapsed_dropdown"
,
items:
@breadcrumb_dropdown_links
[
:after
]
%li
%li
%h2
.breadcrumbs-sub-title
=
@breadcrumb_title
%h2
.breadcrumbs-sub-title
=
@breadcrumb_title
-
if
content_for?
(
:breadcrumbs_extra
)
-
if
content_for?
(
:breadcrumbs_extra
)
...
...
app/views/layouts/nav/breadcrumbs/_collapsed_dropdown.html.haml
View file @
a8460f21
...
@@ -8,4 +8,4 @@
...
@@ -8,4 +8,4 @@
.dropdown-menu
.dropdown-menu
%ul
%ul
-
@breadcrumb_dropdown_links
[
dropdown_location
].
each_with_index
do
|
link
,
index
|
-
@breadcrumb_dropdown_links
[
dropdown_location
].
each_with_index
do
|
link
,
index
|
%li
{
style:
"text-indent: #{[index * 1
5
, 60].min}px;"
}=
link
%li
{
style:
"text-indent: #{[index * 1
6
, 60].min}px;"
}=
link
app/views/projects/boards/_show.html.haml
View file @
a8460f21
-
@no_container
=
true
-
@no_container
=
true
-
@content_class
=
"issue-boards-content"
-
@content_class
=
"issue-boards-content"
-
breadcrumb_title
"Issue Board"
-
breadcrumb_title
"Issue
s
Board"
-
page_title
"Boards"
-
page_title
"Boards"
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
...
...
app/views/projects/compare/index.html.haml
View file @
a8460f21
-
@no_container
=
true
-
@no_container
=
true
-
breadcrumb_title
"Compare Revisions"
-
page_title
"Compare"
-
page_title
"Compare"
=
render
"projects/commits/head"
=
render
"projects/commits/head"
...
...
app/views/projects/compare/show.html.haml
View file @
a8460f21
-
@no_container
=
true
-
@no_container
=
true
-
breadcrumb_title
"Compare"
-
add_to_breadcrumbs
"Compare Revisions"
,
project_compare_index_path
(
@project
)
-
page_title
"
#{
params
[
:from
]
}
...
#{
params
[
:to
]
}
"
-
page_title
"
#{
params
[
:from
]
}
...
#{
params
[
:to
]
}
"
=
render
"projects/commits/head"
=
render
"projects/commits/head"
...
...
app/views/projects/pipeline_schedules/edit.html.haml
View file @
a8460f21
-
add_to_breadcrumbs
_
(
"Schedules"
),
pipeline_schedules_path
(
@project
)
-
breadcrumb_title
"#
#{
@schedule
.
id
}
"
-
page_title
_
(
"Edit"
),
@schedule
.
description
,
_
(
"Pipeline Schedule"
)
-
page_title
_
(
"Edit"
),
@schedule
.
description
,
_
(
"Pipeline Schedule"
)
%h3
.page-title
%h3
.page-title
...
...
app/views/projects/pipeline_schedules/index.html.haml
View file @
a8460f21
-
breadcrumb_title
"Schedules"
-
breadcrumb_title
_
(
"Schedules"
)
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
'common_vue'
=
webpack_bundle_tag
'common_vue'
...
...
app/views/projects/releases/edit.html.haml
View file @
a8460f21
-
@no_container
=
true
-
@no_container
=
true
-
add_to_breadcrumbs
"Tags"
,
project_tags_path
(
@project
)
-
breadcrumb_title
@tag
.
name
-
page_title
"Edit"
,
@tag
.
name
,
"Tags"
-
page_title
"Edit"
,
@tag
.
name
,
"Tags"
=
render
"projects/commits/head"
=
render
"projects/commits/head"
...
...
app/views/projects/snippets/edit.html.haml
View file @
a8460f21
-
add_to_breadcrumbs
"Snippets"
,
project_snippets_path
(
@project
)
-
breadcrumb_title
@snippet
.
to_reference
-
page_title
"Edit"
,
"
#{
@snippet
.
title
}
(
#{
@snippet
.
to_reference
}
)"
,
"Snippets"
-
page_title
"Edit"
,
"
#{
@snippet
.
title
}
(
#{
@snippet
.
to_reference
}
)"
,
"Snippets"
%h3
.page-title
%h3
.page-title
...
...
app/views/projects/snippets/new.html.haml
View file @
a8460f21
-
add_to_breadcrumbs
"Snippets"
,
project_snippets_path
(
@project
)
-
breadcrumb_title
"New"
-
page_title
"New Snippets"
-
page_title
"New Snippets"
%h3
.page-title
%h3
.page-title
...
...
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