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
c34517ad
Commit
c34517ad
authored
Feb 09, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add js prefix to right sidebar
parent
5430849c
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
5 deletions
+8
-5
app/assets/javascripts/lib/utils/common_utils.js.es6
app/assets/javascripts/lib/utils/common_utils.js.es6
+3
-0
app/assets/javascripts/sidebar.js.es6
app/assets/javascripts/sidebar.js.es6
+2
-2
app/views/projects/builds/_sidebar.html.haml
app/views/projects/builds/_sidebar.html.haml
+1
-1
app/views/projects/wikis/_sidebar.html.haml
app/views/projects/wikis/_sidebar.html.haml
+1
-1
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+1
-1
No files found.
app/assets/javascripts/lib/utils/common_utils.js.es6
View file @
c34517ad
...
@@ -69,6 +69,9 @@
...
@@ -69,6 +69,9 @@
var hash = w.gl.utils.getLocationHash();
var hash = w.gl.utils.getLocationHash();
if (!hash) return;
if (!hash) return;
// This is required to handle non-unicode characters in hash
hash = decodeURIComponent(hash);
// scroll to user-generated markdown anchor if we cannot find a match
// scroll to user-generated markdown anchor if we cannot find a match
if (document.getElementById(hash) === null) {
if (document.getElementById(hash) === null) {
var target = document.getElementById('user-content-' + hash);
var target = document.getElementById('user-content-' + hash);
...
...
app/assets/javascripts/sidebar.js.es6
View file @
c34517ad
...
@@ -71,9 +71,9 @@
...
@@ -71,9 +71,9 @@
const $navHeight = $('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight();
const $navHeight = $('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight();
const diff = $navHeight - $('body').scrollTop();
const diff = $navHeight - $('body').scrollTop();
if (diff > 0) {
if (diff > 0) {
$('.right-sidebar').outerHeight($(window).height() - diff);
$('.
js-
right-sidebar').outerHeight($(window).height() - diff);
} else {
} else {
$('.right-sidebar').outerHeight('100%');
$('.
js-
right-sidebar').outerHeight('100%');
}
}
}
}
...
...
app/views/projects/builds/_sidebar.html.haml
View file @
c34517ad
-
builds
=
@build
.
pipeline
.
builds
.
to_a
-
builds
=
@build
.
pipeline
.
builds
.
to_a
%aside
.right-sidebar.right-sidebar-expanded.build-sidebar.js-build-sidebar
{
data:
{
"offset-top"
=>
"151"
,
"spy"
=>
"affix"
}
}
%aside
.right-sidebar.right-sidebar-expanded.build-sidebar.js-build-sidebar
.js-right-sidebar
{
data:
{
"offset-top"
=>
"151"
,
"spy"
=>
"affix"
}
}
.block.build-sidebar-header.visible-xs-block.visible-sm-block.append-bottom-default
.block.build-sidebar-header.visible-xs-block.visible-sm-block.append-bottom-default
Job
Job
%strong
##{@build.id}
%strong
##{@build.id}
...
...
app/views/projects/wikis/_sidebar.html.haml
View file @
c34517ad
%aside
.right-sidebar.right-sidebar-expanded.wiki-sidebar.js-wiki-sidebar
{
data:
{
"offset-top"
=>
"101"
,
"spy"
=>
"affix"
}
}
%aside
.right-sidebar.right-sidebar-expanded.wiki-sidebar.js-wiki-sidebar
.js-right-sidebar
{
data:
{
"offset-top"
=>
"101"
,
"spy"
=>
"affix"
}
}
.block.wiki-sidebar-header.append-bottom-default
.block.wiki-sidebar-header.append-bottom-default
%a
.gutter-toggle.pull-right.visible-xs-block.visible-sm-block.js-sidebar-wiki-toggle
{
href:
"#"
}
%a
.gutter-toggle.pull-right.visible-xs-block.visible-sm-block.js-sidebar-wiki-toggle
{
href:
"#"
}
=
icon
(
'angle-double-right'
)
=
icon
(
'angle-double-right'
)
...
...
app/views/shared/issuable/_sidebar.html.haml
View file @
c34517ad
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_bundle_tag
(
'issuable'
)
=
page_specific_javascript_bundle_tag
(
'issuable'
)
%aside
.right-sidebar
{
data:
{
"offset-top"
=>
"101"
,
"spy"
=>
"affix"
},
class:
sidebar_gutter_collapsed_class
,
'aria-live'
=>
'polite'
}
%aside
.right-sidebar
.js-right-sidebar
{
data:
{
"offset-top"
=>
"101"
,
"spy"
=>
"affix"
},
class:
sidebar_gutter_collapsed_class
,
'aria-live'
=>
'polite'
}
.issuable-sidebar
.issuable-sidebar
-
can_edit_issuable
=
can?
(
current_user
,
:"admin_
#{
issuable
.
to_ability_name
}
"
,
@project
)
-
can_edit_issuable
=
can?
(
current_user
,
:"admin_
#{
issuable
.
to_ability_name
}
"
,
@project
)
.block.issuable-sidebar-header
.block.issuable-sidebar-header
...
...
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