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
d6b2c870
Commit
d6b2c870
authored
Jul 26, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
style updates
fixed weird dropdown items in issues when on merge request page
parent
80b55398
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
37 deletions
+32
-37
app/assets/stylesheets/new_sidebar.scss
app/assets/stylesheets/new_sidebar.scss
+16
-12
app/views/layouts/nav/_new_project_sidebar.html.haml
app/views/layouts/nav/_new_project_sidebar.html.haml
+16
-25
No files found.
app/assets/stylesheets/new_sidebar.scss
View file @
d6b2c870
...
...
@@ -195,6 +195,7 @@ $new-sidebar-width: 220px;
>
li
{
>
a
{
@media
(
min-width
:
$screen-sm-min
)
{
margin-left
:
4px
;
margin-right
:
2px
;
}
}
...
...
@@ -204,10 +205,13 @@ $new-sidebar-width: 220px;
@media
(
min-width
:
$screen-sm-min
)
{
position
:
fixed
;
top
:
0
;
left
:
2
20
px
;
left
:
2
19
px
;
width
:
150px
;
background-color
:
$hover-background
;
margin-top
:
-1px
;
padding
:
1px
;
background-color
:
$white-light
;
box-shadow
:
2px
1px
3px
$dropdown-shadow-color
;
border
:
1px
solid
$gray-darker
;
border-radius
:
0
3px
3px
0
;
&
:
:
before
{
...
...
@@ -233,19 +237,20 @@ $new-sidebar-width: 220px;
transform
:
skew
(
33deg
);
}
&.
is-above
:
:
after
{
&
.is-above
{
margin-top
:
1px
;
&
:
:
after
{
top
:
auto
;
bottom
:
44px
;
transform
:
skew
(
-30deg
);
}
}
a
{
color
:
rgba
(
$white-light
,
.9
);
&
:hover
,
&
:focus
{
color
:
$white-light
;
background-color
:
rgba
(
$black
,
.12
);
background-color
:
$gray-darker
;
}
}
}
...
...
@@ -273,8 +278,7 @@ $new-sidebar-width: 220px;
&
:not
(
.active
)
:hover
>
a
,
>
a
:hover
{
background-color
:
$hover-background
;
color
:
$hover-color
;
background-color
:
$white-light
;
.badge
{
background-color
:
$indigo-500
;
...
...
app/views/layouts/nav/_new_project_sidebar.html.haml
View file @
d6b2c870
...
...
@@ -83,7 +83,6 @@
Issues
%ul
.sidebar-sub-level-items
-
if
project_nav_tab?
(
:issues
)
&&
!
current_controller?
(
:merge_requests
)
=
nav_link
(
controller: :issues
)
do
=
link_to
project_issues_path
(
@project
),
title:
'Issues'
do
%span
...
...
@@ -94,19 +93,11 @@
%span
Board
-
if
project_nav_tab?
(
:merge_requests
)
&&
current_controller?
(
:merge_requests
)
=
nav_link
(
controller: :merge_requests
)
do
=
link_to
project_merge_requests_path
(
@project
),
title:
'Merge Requests'
do
%span
Merge Requests
-
if
project_nav_tab?
:labels
=
nav_link
(
controller: :labels
)
do
=
link_to
project_labels_path
(
@project
),
title:
'Labels'
do
%span
Labels
-
if
project_nav_tab?
:milestones
=
nav_link
(
controller: :milestones
)
do
=
link_to
project_milestones_path
(
@project
),
title:
'Milestones'
do
%span
...
...
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