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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
ee8b0d37
Commit
ee8b0d37
authored
Jun 22, 2016
by
Annabel Dunstone
Committed by
Jacob Schatz
Jun 23, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move fade divs out of every scrolling container; remove unneeded scrolling CSS
parent
350e57fd
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
61 additions
and
114 deletions
+61
-114
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+0
-52
app/views/layouts/nav/_admin.html.haml
app/views/layouts/nav/_admin.html.haml
+5
-6
app/views/layouts/nav/_group.html.haml
app/views/layouts/nav/_group.html.haml
+5
-6
app/views/layouts/nav/_profile.html.haml
app/views/layouts/nav/_profile.html.haml
+47
-46
app/views/projects/commits/_head.html.haml
app/views/projects/commits/_head.html.haml
+4
-4
No files found.
app/assets/stylesheets/framework/nav.scss
View file @
ee8b0d37
...
...
@@ -304,41 +304,9 @@
}
.nav-links
{
@include
scrolling-links
();
border-bottom
:
none
;
height
:
51px
;
svg
{
position
:
relative
;
top
:
2px
;
margin-right
:
2px
;
height
:
15px
;
width
:
auto
;
path
,
polygon
{
fill
:
$layout-link-gray
;
}
}
.fade-right
{
@include
fade
(
left
,
rgba
(
250
,
250
,
250
,
0
.4
)
,
$background-color
);
right
:
-5px
;
.fa
{
right
:
-7px
;
}
}
.fade-left
{
@include
fade
(
right
,
rgba
(
250
,
250
,
250
,
0
.4
)
,
$background-color
);
left
:
-5px
;
.fa
{
left
:
-7px
;
}
}
li
{
a
{
...
...
@@ -374,16 +342,6 @@
}
}
}
.nav-control
{
.fade-right
{
@media
(
max-width
:
$screen-xs-min
)
{
right
:
-5px
;
}
}
}
}
.scrolling-tabs-container
{
...
...
@@ -435,16 +393,6 @@
left
:
-7px
;
}
}
&
.event-filter
{
.fade-right
{
visibility
:
hidden
;
@media
(
max-width
:
$screen-xs-max
)
{
visibility
:
visible
;
}
}
}
}
}
...
...
app/views/layouts/nav/_admin.html.haml
View file @
ee8b0d37
%div
{
class:
nav_control_class
}
.scrolling-tabs-container
{
class:
nav_control_class
}
=
render
'layouts/nav/admin_settings'
.fade-left
=
icon
(
'arrow-left'
)
.fade-right
=
icon
(
'arrow-right'
)
%ul
.nav-links.scrolling-tabs
%li
.fade-left
=
icon
(
'arrow-left'
)
=
nav_link
(
controller:
%w(dashboard admin projects users groups builds runners)
,
html_options:
{
class:
'home'
})
do
=
link_to
admin_root_path
,
title:
'Overview'
,
class:
'shortcuts-tree'
do
%span
...
...
@@ -37,5 +38,3 @@
=
link_to
admin_spam_logs_path
,
title:
"Spam Logs"
do
%span
Spam Logs
%li
.fade-right
=
icon
(
'arrow-right'
)
app/views/layouts/nav/_group.html.haml
View file @
ee8b0d37
%div
{
class:
nav_control_class
}
.scrolling-tabs-container
{
class:
nav_control_class
}
=
render
'layouts/nav/group_settings'
.fade-left
=
icon
(
'arrow-left'
)
.fade-right
=
icon
(
'arrow-right'
)
%ul
.nav-links.scrolling-tabs
%li
.fade-left
=
icon
(
'arrow-left'
)
=
nav_link
(
path:
'groups#show'
,
html_options:
{
class:
'home'
})
do
=
link_to
group_path
(
@group
),
title:
'Home'
do
%span
...
...
@@ -32,5 +33,3 @@
=
link_to
group_group_members_path
(
@group
),
title:
'Members'
do
%span
Members
%li
.fade-right
=
icon
(
'arrow-right'
)
app/views/layouts/nav/_profile.html.haml
View file @
ee8b0d37
%ul
.nav-links.scrolling-tabs
%li
.fade-left
.scrolling-tabs-container
.fade-left
=
icon
(
'arrow-left'
)
=
nav_link
(
path:
'profiles#show'
,
html_options:
{
class:
'home'
})
do
=
link_to
profile_path
,
title:
'Profile Settings'
do
%span
Profile
=
nav_link
(
controller:
[
:accounts
,
:two_factor_auths
])
do
=
link_to
profile_account_path
,
title:
'Account'
do
%span
Account
-
if
current_application_settings
.
user_oauth_applications?
=
nav_link
(
controller:
'oauth/applications'
)
do
=
link_to
applications_profile_path
,
title:
'Applications'
do
%span
Applications
=
nav_link
(
controller: :personal_access_tokens
)
do
=
link_to
profile_personal_access_tokens_path
,
title:
'Personal Access Tokens'
do
%span
Personal Access Tokens
=
nav_link
(
controller: :emails
)
do
=
link_to
profile_emails_path
,
title:
'Emails'
do
%span
Emails
-
unless
current_user
.
ldap_user?
=
nav_link
(
controller: :passwords
)
do
=
link_to
edit_profile_password_path
,
title:
'Password'
do
%span
Password
=
nav_link
(
controller: :notifications
)
do
=
link_to
profile_notifications_path
,
title:
'Notifications'
do
%span
Notifications
=
nav_link
(
controller: :keys
)
do
=
link_to
profile_keys_path
,
title:
'SSH Keys'
do
%span
SSH Keys
=
nav_link
(
controller: :preferences
)
do
=
link_to
profile_preferences_path
,
title:
'Preferences'
do
%span
Preferences
=
nav_link
(
path:
'profiles#audit_log'
)
do
=
link_to
audit_log_profile_path
,
title:
'Audit Log'
do
%span
Audit Log
%li
.fade-right
.fade-right
=
icon
(
'arrow-right'
)
%ul
.nav-links.scrolling-tabs
=
nav_link
(
path:
'profiles#show'
,
html_options:
{
class:
'home'
})
do
=
link_to
profile_path
,
title:
'Profile Settings'
do
%span
Profile
=
nav_link
(
controller:
[
:accounts
,
:two_factor_auths
])
do
=
link_to
profile_account_path
,
title:
'Account'
do
%span
Account
-
if
current_application_settings
.
user_oauth_applications?
=
nav_link
(
controller:
'oauth/applications'
)
do
=
link_to
applications_profile_path
,
title:
'Applications'
do
%span
Applications
=
nav_link
(
controller: :personal_access_tokens
)
do
=
link_to
profile_personal_access_tokens_path
,
title:
'Personal Access Tokens'
do
%span
Personal Access Tokens
=
nav_link
(
controller: :emails
)
do
=
link_to
profile_emails_path
,
title:
'Emails'
do
%span
Emails
-
unless
current_user
.
ldap_user?
=
nav_link
(
controller: :passwords
)
do
=
link_to
edit_profile_password_path
,
title:
'Password'
do
%span
Password
=
nav_link
(
controller: :notifications
)
do
=
link_to
profile_notifications_path
,
title:
'Notifications'
do
%span
Notifications
=
nav_link
(
controller: :keys
)
do
=
link_to
profile_keys_path
,
title:
'SSH Keys'
do
%span
SSH Keys
=
nav_link
(
controller: :preferences
)
do
=
link_to
profile_preferences_path
,
title:
'Preferences'
do
%span
Preferences
=
nav_link
(
path:
'profiles#audit_log'
)
do
=
link_to
audit_log_profile_path
,
title:
'Audit Log'
do
%span
Audit Log
app/views/projects/commits/_head.html.haml
View file @
ee8b0d37
.scrolling-tabs-container
.fade-left
=
icon
(
'arrow-left'
)
.fade-right
=
icon
(
'arrow-right'
)
.nav-links.sub-nav.scrolling-tabs
%ul
{
class:
(
container_class
)
}
%li
.fade-left
=
icon
(
'arrow-left'
)
=
nav_link
(
controller:
%w(tree blob blame edit_tree new_tree find_file)
)
do
=
link_to
project_files_path
(
@project
)
do
Files
...
...
@@ -26,5 +28,3 @@
=
nav_link
(
controller:
[
:tags
,
:releases
])
do
=
link_to
namespace_project_tags_path
(
@project
.
namespace
,
@project
)
do
Tags
%li
.fade-right
=
icon
(
'arrow-right'
)
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