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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
f76e8c65
Commit
f76e8c65
authored
Aug 10, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Top navigation updates
parent
b5a06c60
Changes
15
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
288 additions
and
137 deletions
+288
-137
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+6
-7
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+2
-1
app/assets/stylesheets/new_nav.scss
app/assets/stylesheets/new_nav.scss
+201
-69
app/assets/stylesheets/new_sidebar.scss
app/assets/stylesheets/new_sidebar.scss
+5
-5
app/helpers/nav_helper.rb
app/helpers/nav_helper.rb
+9
-1
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+4
-4
app/views/layouts/header/_new.html.haml
app/views/layouts/header/_new.html.haml
+17
-22
app/views/layouts/header/_new_dropdown.haml
app/views/layouts/header/_new_dropdown.haml
+3
-3
app/views/layouts/nav/_new_dashboard.html.haml
app/views/layouts/nav/_new_dashboard.html.haml
+31
-10
app/views/layouts/nav/_new_explore.html.haml
app/views/layouts/nav/_new_explore.html.haml
+5
-12
app/views/shared/_logo.svg
app/views/shared/_logo.svg
+1
-1
app/views/shared/icons/_caret_down.svg
app/views/shared/icons/_caret_down.svg
+1
-0
app/views/shared/icons/_mr_bold.svg
app/views/shared/icons/_mr_bold.svg
+1
-2
app/views/shared/icons/_plus_square.svg
app/views/shared/icons/_plus_square.svg
+1
-0
app/views/shared/icons/_todo_done.svg
app/views/shared/icons/_todo_done.svg
+1
-0
No files found.
app/assets/stylesheets/framework/header.scss
View file @
f76e8c65
...
...
@@ -105,12 +105,11 @@ header {
top
:
-3px
;
font-size
:
10px
;
}
}
.user-counter
{
svg
{
position
:
relative
;
top
:
2px
;
height
:
17px
;
// hack to get SVG to line up with FA icons
height
:
16px
;
width
:
23px
;
fill
:
currentColor
;
}
...
...
@@ -325,12 +324,12 @@ header {
li
{
.badge
{
position
:
inherit
;
top
:
-8px
;
font-weight
:
$gl-font-weight-normal
;
margin-left
:
-
11
px
;
margin-left
:
-
6
px
;
font-size
:
11px
;
color
:
$white-light
;
padding
:
1px
5px
2px
;
padding
:
0
5px
;
line-height
:
12px
;
border-radius
:
7px
;
box-shadow
:
0
1px
0
rgba
(
$gl-header-color
,
.2
);
...
...
app/assets/stylesheets/framework/variables.scss
View file @
f76e8c65
...
...
@@ -177,13 +177,14 @@ $row-hover: $blue-25;
$row-hover-border
:
$blue-100
;
$progress-color
:
#c0392b
;
$header-height
:
50px
;
$new-navbar-height
:
40px
;
$fixed-layout-width
:
1280px
;
$limited-layout-width
:
990px
;
$limited-layout-width-sm
:
790px
;
$container-text-max-width
:
540px
;
$gl-avatar-size
:
40px
;
$error-exclamation-point
:
$red-500
;
$border-radius-default
:
3
px
;
$border-radius-default
:
4
px
;
$settings-icon-size
:
18px
;
$provider-btn-not-active-color
:
$blue-500
;
$link-underline-blue
:
$blue-500
;
...
...
app/assets/stylesheets/new_nav.scss
View file @
f76e8c65
...
...
@@ -2,15 +2,21 @@
@import
'framework/tw_bootstrap_variables'
;
@import
"bootstrap/variables"
;
.content-wrapper.page-with-new-nav
{
margin-top
:
$new-navbar-height
;
}
header
.navbar-gitlab-new
{
color
:
$white-light
;
background
:
linear-gradient
(
to
right
,
$indigo-900
,
$indigo-800
);
border-bottom
:
0
;
min-height
:
$new-navbar-height
;
.header-content
{
display
:
-
webkit-flex
;
display
:
flex
;
padding-left
:
0
;
min-height
:
$new-navbar-height
;
.title-container
{
display
:
-
webkit-flex
;
...
...
@@ -38,20 +44,13 @@ header.navbar-gitlab-new {
display
:
-
webkit-flex
;
display
:
flex
;
align-items
:
center
;
padding-right
:
$gl-padding
;
padding-left
:
$gl-padding
;
margin-left
:
-
$gl-padding
;
@media
(
min-width
:
$screen-sm-min
)
{
padding-right
:
$gl-padding
;
padding-left
:
$gl-padding
;
}
padding
:
2px
8px
;
margin
:
5px
2px
5px
-8px
;
border-radius
:
$border-radius-default
;
svg
{
margin-top
:
-3px
;
@media
(
min-width
:
$screen-sm-min
)
{
margin-right
:
10
px
;
margin-right
:
8
px
;
}
}
...
...
@@ -60,7 +59,7 @@ header.navbar-gitlab-new {
svg
{
width
:
55px
;
height
:
1
5
px
;
height
:
1
4
px
;
margin
:
0
;
fill
:
$white-light
;
}
...
...
@@ -68,9 +67,7 @@ header.navbar-gitlab-new {
&
:hover
,
&
:focus
{
.logo-text
svg
{
fill
:
$tanuki-yellow
;
}
background-color
:
rgba
(
$indigo-200
,
.2
);
}
}
}
...
...
@@ -90,6 +87,20 @@ header.navbar-gitlab-new {
right
:
0
;
}
}
&
.menu-expanded
{
@media
(
max-width
:
$screen-xs-max
)
{
.title-container
,
.header-logo
,
{
display
:
none
;
}
}
}
}
.dropdown-bold-header
{
color
:
$gl-text-color-secondary
;
font-size
:
12px
;
}
.navbar-collapse
{
...
...
@@ -98,14 +109,10 @@ header.navbar-gitlab-new {
box-shadow
:
0
;
@media
(
max-width
:
$screen-xs-max
)
{
margin-left
:
-
$gl-padding
;
margin-left
:
-
8px
;
margin-right
:
-10px
;
}
.dropdown-bold-header
{
color
:
initial
;
}
.nav
{
>
li
:not
(
.hidden-xs
)
a
{
@media
(
max-width
:
$screen-xs-max
)
{
...
...
@@ -119,7 +126,7 @@ header.navbar-gitlab-new {
.container-fluid
{
.navbar-toggle
{
min-width
:
45px
;
padding
:
6
px
$gl-padding
;
padding
:
4
px
$gl-padding
;
margin-right
:
-7px
;
font-size
:
14px
;
text-align
:
center
;
...
...
@@ -156,22 +163,47 @@ header.navbar-gitlab-new {
}
>
a
{
background
:
none
;
will-change
:
color
;
margin
:
4px
2px
;
padding
:
6px
8px
;
color
:
$indigo-200
;
height
:
32px
;
@media
(
max-width
:
$screen-xs-max
)
{
padding
:
0
;
}
svg
{
fill
:
$indigo-200
;
}
&
.header-user-dropdown-toggle
{
margin-left
:
2px
;
.header-user-avatar
{
border-color
:
$indigo-200
;
margin-right
:
0
;
}
}
}
&
:hover
,
&
:focus
{
color
:
$white-light
;
.header-new-dropdown-toggle
{
margin-right
:
0
;
}
>
a
:hover
,
>
a
:focus
{
text-decoration
:
none
;
outline
:
0
;
opacity
:
1
;
color
:
$white-light
;
>
svg
{
fill
:
$white-light
;
@media
(
min-width
:
$screen-sm-min
)
{
background-color
:
rgba
(
$indigo-200
,
.2
);
}
svg
{
fill
:
currentColor
;
}
&
.header-user-dropdown-toggle
{
...
...
@@ -180,6 +212,40 @@ header.navbar-gitlab-new {
}
}
}
.impersonated-user
,
.impersonated-user
:hover
{
margin-right
:
1px
;
background-color
:
$white-light
;
border-top-right-radius
:
0
;
border-bottom-right-radius
:
0
;
svg
{
fill
:
$indigo-900
;
}
}
.impersonation-btn
,
.impersonation-btn
:hover
{
background-color
:
$white-light
;
margin-left
:
0
;
border-top-left-radius
:
0
;
border-bottom-left-radius
:
0
;
i
{
color
:
$orange-500
;
font-size
:
20px
;
}
}
&
.active
>
a
,
&
.dropdown.open
>
a
{
color
:
$indigo-900
;
background-color
:
$white-light
;
svg
{
fill
:
currentColor
;
}
}
}
}
...
...
@@ -188,45 +254,76 @@ header.navbar-gitlab-new {
.navbar-sub-nav
{
display
:
-
webkit-flex
;
display
:
flex
;
margin
-bottom
:
0
;
margin
:
0
0
0
6px
;
color
:
$indigo-200
;
.dropdown-chevron
{
position
:
relative
;
top
:
-1px
;
font-size
:
10px
;
}
}
.navbar-gitlab-new
{
.navbar-sub-nav
,
.navbar-nav
{
>
li
{
>
a
:hover
,
>
a
:focus
{
box-shadow
:
inset
0
-3px
0
rgba
(
$indigo-200
,
.4
);
text-decoration
:
none
;
outline
:
0
;
color
:
$white-light
;
background-color
:
rgba
(
$indigo-200
,
.2
);
svg
{
fill
:
currentColor
;
}
}
&
.active
>
a
{
box-shadow
:
inset
0
-3px
0
$indigo-500
;
color
:
$white-light
;
font-weight
:
$gl-font-weight-bold
;
&
.active
>
a
,
&
.dropdown.open
>
a
{
color
:
$indigo-900
;
background-color
:
$white-light
;
svg
{
fill
:
currentColor
;
}
}
>
a
{
display
:
block
;
padding
:
16px
10px
;
font-size
:
13px
;
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
padding
:
6px
8px
;
margin
:
4px
2px
;
font-size
:
12px
;
color
:
currentColor
;
box-shadow
:
inset
0
0
0
transparen
t
;
will-change
:
box-shadow
;
transition
:
box-shadow
0
.15s
;
border-radius
:
$border-radius-defaul
t
;
height
:
32px
;
font-weight
:
$gl-font-weight-bold
;
@media
(
min-width
:
$screen-sm-min
)
{
padding
:
15px
$gl-padding
;
font-size
:
14px
;
}
svg
{
fill
:
currentColor
;
}
}
.dropdown-chevron
{
position
:
relative
;
top
:
-1px
;
font-size
:
10px
;
&
.line-separator
{
border-left
:
1px
solid
rgba
(
$indigo-200
,
.2
);
margin
:
8px
;
}
}
}
}
.admin-icon
i
{
font-size
:
18px
;
}
.caret-down
{
height
:
11px
;
width
:
11px
;
margin-left
:
4px
;
fill
:
currentColor
;
}
.header-user
.dropdown-menu-nav
,
...
...
@@ -235,10 +332,14 @@ header.navbar-gitlab-new {
}
.search
{
margin
:
4px
8px
0
;
form
{
height
:
32px
;
border
:
0
;
border-radius
:
$border-radius-default
;
background-color
:
rgba
(
$indigo-200
,
.2
);
transition
:
border-color
ease-in-out
0
.15s
,
b
ox-shadow
ease-in-out
0
.15s
,
b
ackground-color
ease-in-out
0
.15s
;
transition
:
border-color
ease-in-out
0
.15s
,
background-color
ease-in-out
0
.15s
;
&
:hover
{
background-color
:
rgba
(
$indigo-200
,
.3
);
...
...
@@ -247,31 +348,50 @@ header.navbar-gitlab-new {
}
&
.search-active
form
{
background-color
:
rgba
(
$indigo-200
,
.3
)
;
background-color
:
$white-light
;
box-shadow
:
none
;
.search-input
{
color
:
$gl-text-color
;
transition
:
color
ease-in-out
0
.15s
;
}
.
search-input
:
:
placeholder
{
color
:
$gl-text-color-tertiary
;
}
.search-input-wrap
{
.search-icon
,
.clear-icon
{
color
:
$gl-text-color-tertiary
;
transition
:
color
ease-in-out
0
.15s
;
}
}
}
.search-input
{
color
:
$white-light
;
background
:
none
;
transition
:
color
ease-in-out
0
.15s
;
}
.
search-input
:
:
placeholder
{
color
:
rgba
(
$indigo-200
,
.8
);
transition
:
color
ease-in-out
0
.15s
;
}
.location-badge
{
font-size
:
12px
;
color
:
$indigo-100
;
background-color
:
rgba
(
$indigo-200
,
.1
);
transition
:
color
0
.15s
;
will-change
:
color
;
margin
:
-4px
4px
-4px
-4px
;
line-height
:
25px
;
padding
:
4px
8px
;
border-radius
:
2px
0
0
2px
;
border-right
:
1px
solid
$indigo-800
;
height
:
34px
;
height
:
32px
;
transition
:
border-color
ease-in-out
0
.15s
;
}
.search-input-wrap
{
...
...
@@ -283,8 +403,9 @@ header.navbar-gitlab-new {
&
.search-active
{
.location-badge
{
color
:
$white-light
;
background-color
:
rgba
(
$indigo-200
,
.2
);
color
:
$gl-text-color
;
background-color
:
$nav-badge-bg
;
border-color
:
$border-color
;
}
.search-input-wrap
{
...
...
@@ -458,3 +579,14 @@ header.navbar-gitlab-new {
}
}
}
.btn-sign-in
{
margin-top
:
3px
;
background-color
:
$indigo-100
;
color
:
$indigo-900
;
font-weight
:
$gl-font-weight-bold
;
&
:hover
{
background-color
:
$white-light
;
}
}
app/assets/stylesheets/new_sidebar.scss
View file @
f76e8c65
...
...
@@ -26,7 +26,7 @@ $new-sidebar-collapsed-width: 50px;
// Override position: absolute
.right-sidebar
{
position
:
fixed
;
height
:
calc
(
100%
-
#{
$
heade
r-height
}
);
height
:
calc
(
100%
-
#{
$
new-navba
r-height
}
);
}
.issues-bulk-update.right-sidebar.right-sidebar-expanded
.issuable-sidebar-header
{
...
...
@@ -93,7 +93,7 @@ $new-sidebar-collapsed-width: 50px;
z-index
:
400
;
width
:
$new-sidebar-width
;
transition
:
left
$sidebar-transition-duration
;
top
:
$
heade
r-height
;
top
:
$
new-navba
r-height
;
bottom
:
0
;
left
:
0
;
background-color
:
$gray-normal
;
...
...
@@ -189,7 +189,7 @@ $new-sidebar-collapsed-width: 50px;
}
.with-performance-bar
.nav-sidebar
{
top
:
$
heade
r-height
+
$performance-bar-height
;
top
:
$
new-navba
r-height
+
$performance-bar-height
;
}
.sidebar-sub-level-items
{
...
...
@@ -453,7 +453,7 @@ $new-sidebar-collapsed-width: 50px;
// Make issue boards full-height now that sub-nav is gone
.boards-list
{
height
:
calc
(
100vh
-
#{
$
heade
r-height
}
);
height
:
calc
(
100vh
-
#{
$
new-navba
r-height
}
);
@media
(
min-width
:
$screen-sm-min
)
{
height
:
475px
;
// Needed for PhantomJS
...
...
@@ -464,7 +464,7 @@ $new-sidebar-collapsed-width: 50px;
}
.with-performance-bar
.boards-list
{
height
:
calc
(
100vh
-
#{
$
heade
r-height
}
-
#{
$performance-bar-height
}
);
height
:
calc
(
100vh
-
#{
$
new-navba
r-height
}
-
#{
$performance-bar-height
}
);
}
...
...
app/helpers/nav_helper.rb
View file @
f76e8c65
...
...
@@ -38,7 +38,7 @@ module NavHelper
end
def
layout_nav_class
return
[]
if
show_new_nav?
return
'page-with-new-nav'
if
show_new_nav?
class_names
=
[]
class_names
<<
'page-with-layout-nav'
if
defined?
(
nav
)
&&
nav
...
...
@@ -50,4 +50,12 @@ module NavHelper
def
nav_control_class
"nav-control"
if
current_user
end
def
user_dropdown_class
class_names
=
[]
class_names
<<
'header-user-dropdown-toggle'
class_names
<<
'impersonated-user'
if
session
[
:impersonator_id
]
class_names
end
end
app/views/layouts/header/_default.html.haml
View file @
f76e8c65
...
...
@@ -42,21 +42,21 @@
=
link_to
sherlock_transactions_path
,
title:
'Sherlock Transactions'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'tachometer fw'
)
%li
%li
.user-counter
=
link_to
assigned_issues_dashboard_path
,
title:
'Issues'
,
aria:
{
label:
"Issues"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
custom_icon
(
'issues'
)
-
issues_count
=
assigned_issuables_count
(
:issues
)
%span
.badge.issues-count
{
class:
(
'hidden'
if
issues_count
.
zero?
)
}
=
number_with_delimiter
(
issues_count
)
%li
%li
.user-counter
=
link_to
assigned_mrs_dashboard_path
,
title:
'Merge requests'
,
aria:
{
label:
"Merge requests"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
custom_icon
(
'mr_bold'
)
-
merge_requests_count
=
assigned_issuables_count
(
:merge_requests
)
%span
.badge.merge-requests-count
{
class:
(
'hidden'
if
merge_requests_count
.
zero?
)
}
=
number_with_delimiter
(
merge_requests_count
)
%li
%li
.user-counter
=
link_to
dashboard_todos_path
,
title:
'Todos'
,
aria:
{
label:
"Todos"
},
class:
'shortcuts-todos'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'check-circle fw
'
)
=
custom_icon
(
'todo_done
'
)
%span
.badge.todos-count
{
class:
(
'hidden'
if
todos_pending_count
.
zero?
)
}
=
todos_count_format
(
todos_pending_count
)
%li
.header-user.dropdown
...
...
app/views/layouts/header/_new.html.haml
View file @
f76e8c65
...
...
@@ -16,47 +16,35 @@
.navbar-collapse.collapse
%ul
.nav.navbar-nav
-
if
current_user
=
render
'layouts/header/new_dropdown'
%li
.hidden-sm.hidden-xs
=
render
'layouts/search'
unless
current_controller?
(
:search
)
%li
.visible-sm-inline-block.visible-xs-inline-block
=
link_to
search_path
,
title:
'Search'
,
aria:
{
label:
"Search"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'search'
)
-
if
current_user
-
if
session
[
:impersonator_id
]
%li
.impersonation
=
link_to
admin_impersonation_path
,
method: :delete
,
title:
"Stop impersonation"
,
aria:
{
label:
'Stop impersonation'
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'user-secret fw'
)
-
if
current_user
.
admin?
%li
=
link_to
admin_root_path
,
title:
'Admin area'
,
aria:
{
label:
"Admin area"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'wrench fw'
)
=
render
'layouts/header/new_dropdown'
-
if
Gitlab
::
Sherlock
.
enabled?
%li
=
link_to
sherlock_transactions_path
,
title:
'Sherlock Transactions'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'tachometer fw'
)
%li
%li
.user-counter
=
link_to
assigned_issues_dashboard_path
,
title:
'Issues'
,
class:
'dashboard-shortcuts-issues'
,
aria:
{
label:
"Issues"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
custom_icon
(
'issues'
)
-
issues_count
=
assigned_issuables_count
(
:issues
)
%span
.badge.issues-count
{
class:
(
'hidden'
if
issues_count
.
zero?
)
}
=
number_with_delimiter
(
issues_count
)
%li
%li
.user-counter
=
link_to
assigned_mrs_dashboard_path
,
title:
'Merge requests'
,
class:
'dashboard-shortcuts-merge_requests'
,
aria:
{
label:
"Merge requests"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
custom_icon
(
'mr_bold'
)
-
merge_requests_count
=
assigned_issuables_count
(
:merge_requests
)
%span
.badge.merge-requests-count
{
class:
(
'hidden'
if
merge_requests_count
.
zero?
)
}
=
number_with_delimiter
(
merge_requests_count
)
%li
%li
.user-counter
=
link_to
dashboard_todos_path
,
title:
'Todos'
,
aria:
{
label:
"Todos"
},
class:
'shortcuts-todos'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'check-circle fw
'
)
=
custom_icon
(
'todo_done
'
)
%span
.badge.todos-count
{
class:
(
'hidden'
if
todos_pending_count
.
zero?
)
}
=
todos_count_format
(
todos_pending_count
)
%li
.header-user.dropdown
=
link_to
current_user
,
class:
"header-user-dropdown-toggle"
,
data:
{
toggle:
"dropdown"
}
do
=
image_tag
avatar_icon
(
current_user
,
2
6
),
width:
26
,
height:
26
,
class:
"header-user-avatar"
=
icon
(
'chevron-
down'
)
=
link_to
current_user
,
class:
user_dropdown_class
,
data:
{
toggle:
"dropdown"
}
do
=
image_tag
avatar_icon
(
current_user
,
2
3
),
width:
23
,
height:
23
,
class:
"header-user-avatar"
=
custom_icon
(
'caret_
down'
)
.dropdown-menu-nav.dropdown-menu-align-right
%ul
%li
.current-user
...
...
@@ -68,13 +56,20 @@
=
link_to
"Profile"
,
current_user
,
class:
'profile-link'
,
data:
{
user:
current_user
.
username
}
%li
=
link_to
"Settings"
,
profile_path
-
if
current_user
%li
=
link_to
"Help"
,
help_path
%li
.divider
%li
=
link_to
"Sign out"
,
destroy_user_session_path
,
method: :delete
,
class:
"sign-out-link"
-
if
session
[
:impersonator_id
]
%li
.impersonation
=
link_to
admin_impersonation_path
,
class:
'impersonation-btn'
,
method: :delete
,
title:
"Stop impersonation"
,
aria:
{
label:
'Stop impersonation'
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'user-secret'
)
-
else
%li
%div
=
link_to
"Sign in
"
,
new_session_path
(
:user
,
redirect_to_referer:
'yes'
),
class:
'btn btn-sign-in btn-success
'
=
link_to
"Sign in
/ Register"
,
new_session_path
(
:user
,
redirect_to_referer:
'yes'
),
class:
'btn btn-sign-in
'
%button
.navbar-toggle.hidden-sm.hidden-md.hidden-lg
{
type:
'button'
}
%span
.sr-only
Toggle navigation
...
...
app/views/layouts/header/_new_dropdown.haml
View file @
f76e8c65
%li
.header-new.dropdown
=
link_to
new_project_path
,
class:
"header-new-dropdown-toggle has-tooltip"
,
title:
"New..."
,
ref:
'tooltip'
,
aria:
{
label:
"New..."
},
data:
{
toggle:
'dropdown'
,
placement:
'bottom'
,
container:
'body'
}
do
-
if
show_new_nav?
=
icon
(
'plus
'
)
=
icon
(
'chevron-
down'
)
=
custom_icon
(
'plus_square
'
)
=
custom_icon
(
'caret_
down'
)
-
else
=
icon
(
'plus fw'
)
=
icon
(
'caret-
down'
)
=
custom_icon
(
'caret_
down'
)
.dropdown-menu-nav.dropdown-menu-align-right
%ul
-
if
@group
&
.
persisted?
...
...
app/views/layouts/nav/_new_dashboard.html.haml
View file @
f76e8c65
%ul
.list-unstyled.navbar-sub-nav
=
nav_link
(
path:
[
'root#index'
,
'projects#trending'
,
'projects#starred'
,
'dashboard/projects#index'
],
html_options:
{
id:
'nav-projects-dropdown'
,
class:
"home dropdown"
})
do
%a
{
href:
'#'
,
title:
'Projects'
,
data:
{
toggle:
'dropdown'
}
}
%a
{
href:
"#"
,
data:
{
toggle:
"dropdown"
}
}
Projects
=
icon
(
"chevron-down"
,
class:
"dropdown-chevron"
)
=
custom_icon
(
'caret_down'
)
.dropdown-menu.projects-dropdown-menu
=
render
"layouts/nav/projects_dropdown/show"
=
nav_link
(
controller:
[
'dashboard/groups'
,
'explore/groups'
])
do
=
nav_link
(
controller:
[
'dashboard/groups'
,
'explore/groups'
]
,
html_options:
{
class:
"hidden-xs"
}
)
do
=
link_to
dashboard_groups_path
,
class:
'dashboard-shortcuts-groups'
,
title:
'Groups'
do
Groups
=
nav_link
(
path:
'dashboard#activity'
,
html_options:
{
class:
"
hidden-xs hidden-sm hidden-md
"
})
do
=
nav_link
(
path:
'dashboard#activity'
,
html_options:
{
class:
"
visible-lg
"
})
do
=
link_to
activity_dashboard_path
,
class:
'dashboard-shortcuts-activity'
,
title:
'Activity'
do
Activity
%li
.dropdown
=
nav_link
(
controller:
'dashboard/milestones'
,
html_options:
{
class:
"visible-lg"
})
do
=
link_to
dashboard_milestones_path
,
class:
'dashboard-shortcuts-milestones'
,
title:
'Milestones'
do
Milestones
=
nav_link
(
controller:
'dashboard/snippets'
,
html_options:
{
class:
"visible-lg"
})
do
=
link_to
dashboard_snippets_path
,
class:
'dashboard-shortcuts-snippets'
,
title:
'Snippets'
do
Snippets
%li
.dropdown.hidden-lg
%a
{
href:
"#"
,
data:
{
toggle:
"dropdown"
}
}
More
=
icon
(
"chevron-down"
,
class:
"dropdown-chevron"
)
=
custom_icon
(
'caret_down'
)
.dropdown-menu
%ul
=
nav_link
(
path:
'dashboard#activity'
,
html_options:
{
class:
"visible-xs visible-sm visible-md"
})
do
=
nav_link
(
controller:
[
'dashboard/groups'
,
'explore/groups'
],
html_options:
{
class:
"visible-xs"
})
do
=
link_to
dashboard_groups_path
,
class:
'dashboard-shortcuts-groups'
,
title:
'Groups'
do
Groups
=
nav_link
(
path:
'dashboard#activity'
)
do
=
link_to
activity_dashboard_path
,
title:
'Activity'
do
Activity
...
...
@@ -31,11 +43,20 @@
=
nav_link
(
controller:
'dashboard/snippets'
)
do
=
link_to
dashboard_snippets_path
,
class:
'dashboard-shortcuts-snippets'
,
title:
'Snippets'
do
Snippets
%li
.divider
%li
=
link_to
"Help"
,
help_path
,
title:
'About GitLab CE'
-# Shortcut to Dashboard > Projects
%li
.hidden
=
link_to
dashboard_projects_path
,
title:
'Projects'
,
class:
'dashboard-shortcuts-projects'
do
Projects
-
if
current_user
.
admin?
||
Gitlab
::
Sherlock
.
enabled?
%li
.line-separator.hidden-xs
-
if
current_user
.
admin?
=
nav_link
(
controller:
'admin/dashboard'
)
do
=
link_to
admin_root_path
,
class:
'admin-icon'
,
title:
'Admin area'
,
aria:
{
label:
"Admin area"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'wrench fw'
)
-
if
Gitlab
::
Sherlock
.
enabled?
%li
=
link_to
sherlock_transactions_path
,
class:
'admin-icon'
,
title:
'Sherlock Transactions'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'tachometer fw'
)
app/views/layouts/nav/_new_explore.html.haml
View file @
f76e8c65
...
...
@@ -5,15 +5,8 @@
=
nav_link
(
controller:
[
:groups
,
'groups/milestones'
,
'groups/group_members'
])
do
=
link_to
explore_groups_path
,
title:
'Groups'
,
class:
'dashboard-shortcuts-groups'
do
Groups
%li
.dropdown
%a
{
href:
"#"
,
data:
{
toggle:
"dropdown"
}
}
More
=
icon
(
"chevron-down"
,
class:
"dropdown-chevron"
)
.dropdown-menu
%ul
=
nav_link
(
controller: :snippets
)
do
=
link_to
explore_snippets_path
,
title:
'Snippets'
,
class:
'dashboard-shortcuts-snippets'
do
Snippets
%li
.divider
%li
=
link_to
"Help"
,
help_path
,
title:
'About GitLab CE'
app/views/shared/_logo.svg
View file @
f76e8c65
<svg
width=
"2
8"
height=
"28
"
class=
"tanuki-logo"
viewBox=
"0 0 36 36"
>
<svg
width=
"2
4"
height=
"24
"
class=
"tanuki-logo"
viewBox=
"0 0 36 36"
>
<path
class=
"tanuki-shape tanuki-left-ear"
fill=
"#e24329"
d=
"M2 14l9.38 9v-9l-4-12.28c-.205-.632-1.176-.632-1.38 0z"
/>
<path
class=
"tanuki-shape tanuki-right-ear"
fill=
"#e24329"
d=
"M34 14l-9.38 9v-9l4-12.28c.205-.632 1.176-.632 1.38 0z"
/>
<path
class=
"tanuki-shape tanuki-nose"
fill=
"#e24329"
d=
"M18,34.38 3,14 33,14 Z"
/>
...
...
app/views/shared/icons/_caret_down.svg
0 → 100644
View file @
f76e8c65
<svg
xmlns=
"http://www.w3.org/2000/svg"
width=
"16"
height=
"16"
class=
"caret-down"
viewBox=
"0 0 16 16"
><path
fill-rule=
"evenodd"
d=
"M8 10.243l-4.95-4.95a1 1 0 0 0-1.414 1.414l5.657 5.657a.997.997 0 0 0 1.414 0l5.657-5.657a1 1 0 0 0-1.414-1.414L8 10.243z"
/></svg>
app/views/shared/icons/_mr_bold.svg
View file @
f76e8c65
<svg
xmlns=
"http://www.w3.org/2000/svg"
viewBox=
"0 0 16 16"
><path
d=
"m5 5.563v4.875c1.024.4 1.75 1.397 1.75 2.563 0 1.519-1.231 2.75-2.75 2.75-1.519 0-2.75-1.231-2.75-2.75 0-1.166.726-2.162 1.75-2.563v-4.875c-1.024-.4-1.75-1.397-1.75-2.563 0-1.519 1.231-2.75 2.75-2.75 1.519 0 2.75 1.231 2.75 2.75 0 1.166-.726 2.162-1.75 2.563m-1 8.687c.69 0 1.25-.56 1.25-1.25 0-.69-.56-1.25-1.25-1.25-.69 0-1.25.56-1.25 1.25 0 .69.56 1.25 1.25 1.25m0-10c.69 0 1.25-.56 1.25-1.25 0-.69-.56-1.25-1.25-1.25-.69 0-1.25.56-1.25 1.25 0 .69.56 1.25 1.25 1.25"
/><path
d=
"m10.501 2c1.381.001 2.499 1.125 2.499 2.506v5.931c1.024.4 1.75 1.397 1.75 2.563 0 1.519-1.231 2.75-2.75 2.75-1.519 0-2.75-1.231-2.75-2.75 0-1.166.726-2.162 1.75-2.563v-5.931c0-.279-.225-.506-.499-.506v.926c0 .346-.244.474-.569.271l-2.952-1.844c-.314-.196-.325-.507 0-.71l2.952-1.844c.314-.196.569-.081.569.271v.93m1.499 12.25c.69 0 1.25-.56 1.25-1.25 0-.69-.56-1.25-1.25-1.25-.69 0-1.25.56-1.25 1.25 0 .69.56 1.25 1.25 1.25"
/></svg>
<svg
xmlns=
"http://www.w3.org/2000/svg"
height=
"16"
width=
"16"
viewBox=
"0 0 16 16"
><path
d=
"m5 5.563v4.875c1.024.4 1.75 1.397 1.75 2.563 0 1.519-1.231 2.75-2.75 2.75-1.519 0-2.75-1.231-2.75-2.75 0-1.166.726-2.162 1.75-2.563v-4.875c-1.024-.4-1.75-1.397-1.75-2.563 0-1.519 1.231-2.75 2.75-2.75 1.519 0 2.75 1.231 2.75 2.75 0 1.166-.726 2.162-1.75 2.563m-1 8.687c.69 0 1.25-.56 1.25-1.25 0-.69-.56-1.25-1.25-1.25-.69 0-1.25.56-1.25 1.25 0 .69.56 1.25 1.25 1.25m0-10c.69 0 1.25-.56 1.25-1.25 0-.69-.56-1.25-1.25-1.25-.69 0-1.25.56-1.25 1.25 0 .69.56 1.25 1.25 1.25"
/><path
d=
"m10.501 2c1.381.001 2.499 1.125 2.499 2.506v5.931c1.024.4 1.75 1.397 1.75 2.563 0 1.519-1.231 2.75-2.75 2.75-1.519 0-2.75-1.231-2.75-2.75 0-1.166.726-2.162 1.75-2.563v-5.931c0-.279-.225-.506-.499-.506v.926c0 .346-.244.474-.569.271l-2.952-1.844c-.314-.196-.325-.507 0-.71l2.952-1.844c.314-.196.569-.081.569.271v.93m1.499 12.25c.69 0 1.25-.56 1.25-1.25 0-.69-.56-1.25-1.25-1.25-.69 0-1.25.56-1.25 1.25 0 .69.56 1.25 1.25 1.25"
/></svg>
app/views/shared/icons/_plus_square.svg
0 → 100644
View file @
f76e8c65
<svg
xmlns=
"http://www.w3.org/2000/svg"
width=
"16"
height=
"16"
viewBox=
"0 0 16 16"
><path
fill-rule=
"evenodd"
d=
"M9 7V4c0-.552-.448-1-1-1s-1 .448-1 1v3H4c-.552 0-1 .448-1 1s.448 1 1 1h3v3c0 .552.448 1 1 1s1-.448 1-1V9h3c.552 0 1-.448 1-1s-.448-1-1-1H9zM3 0h10c1.657 0 3 1.343 3 3v10c0 1.657-1.343 3-3 3H3c-1.657 0-3-1.343-3-3V3c0-1.657 1.343-3 3-3z"
/></svg>
app/views/shared/icons/_todo_done.svg
0 → 100644
View file @
f76e8c65
<svg
xmlns=
"http://www.w3.org/2000/svg"
width=
"16"
height=
"16"
viewBox=
"0 0 16 16"
><path
d=
"M8.243 7.485l4.95-4.95a1 1 0 1 1 1.414 1.415L8.95 9.607a.997.997 0 0 1-1.414 0l-2.83-2.83a1 1 0 0 1 1.415-1.413l2.123 2.12zM12 11a1 1 0 0 1 2 0v2a3 3 0 0 1-3 3H3a3 3 0 0 1-3-3V5a3 3 0 0 1 3-3h2a1 1 0 1 1 0 2H3a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1v-2z"
/></svg>
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