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
ef1e3d0d
Commit
ef1e3d0d
authored
Jun 17, 2016
by
Annabel Dunstone
Committed by
Alfredo Sumaran
Jun 21, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add tooltip on pin/unpin nav
parent
027b07ca
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
app/assets/javascripts/application.js.coffee
app/assets/javascripts/application.js.coffee
+2
-0
app/views/layouts/_page.html.haml
app/views/layouts/_page.html.haml
+1
-1
No files found.
app/assets/javascripts/application.js.coffee
View file @
ef1e3d0d
...
@@ -278,7 +278,9 @@ $ ->
...
@@ -278,7 +278,9 @@ $ ->
$
(
'.navbar-fixed-top'
)
$
(
'.navbar-fixed-top'
)
.
removeClass
(
'header-pinned-nav'
)
.
removeClass
(
'header-pinned-nav'
)
.
toggleClass
(
'header-collapsed header-expanded'
)
.
toggleClass
(
'header-collapsed header-expanded'
)
$
(
'.pin-nav-btn'
).
attr
(
'data-original-title'
,
'Pin sidebar'
).
tooltip
(
'fixTitle'
).
tooltip
(
'setContent'
)
else
else
$
.
cookie
'pin_nav'
,
'true'
,
{
path
:
'/'
}
$
.
cookie
'pin_nav'
,
'true'
,
{
path
:
'/'
}
$
(
'.page-with-sidebar'
).
addClass
(
'page-sidebar-pinned'
)
$
(
'.page-with-sidebar'
).
addClass
(
'page-sidebar-pinned'
)
$
(
'.navbar-fixed-top'
).
addClass
(
'header-pinned-nav'
)
$
(
'.navbar-fixed-top'
).
addClass
(
'header-pinned-nav'
)
$
(
'.pin-nav-btn'
).
attr
(
'data-original-title'
,
'Unpin sidebar'
).
tooltip
(
'fixTitle'
).
tooltip
(
'setContent'
)
app/views/layouts/_page.html.haml
View file @
ef1e3d0d
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
=
image_tag
avatar_icon
(
current_user
,
60
),
alt:
'Profile'
,
class:
'avatar avatar s36'
=
image_tag
avatar_icon
(
current_user
,
60
),
alt:
'Profile'
,
class:
'avatar avatar s36'
.username
.username
=
current_user
.
username
=
current_user
.
username
=
link_to
'#'
,
class:
"nav-header-btn text-center pin-nav-btn
#{
'is-active'
if
pinned_nav?
}
js-nav-pin"
,
title:
'Pin/Unpin navigation'
do
=
link_to
'#'
,
class:
"nav-header-btn text-center pin-nav-btn
has-tooltip
#{
'is-active'
if
pinned_nav?
}
js-nav-pin"
,
title:
pinned_nav?
?
"Unpin navigation"
:
"Pin Navigation"
,
data:
{
placement:
'right'
,
container:
'body'
}
do
%span
.sr-only
Toggle navigation pinning
%span
.sr-only
Toggle navigation pinning
=
icon
(
'thumb-tack'
)
=
icon
(
'thumb-tack'
)
-
if
defined?
(
nav
)
&&
nav
-
if
defined?
(
nav
)
&&
nav
...
...
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