Commit 82ababf0 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray Committed by Jacob Schatz

Fix layout of shortcut keys in dropdown

parent cba47179
...@@ -191,26 +191,19 @@ ...@@ -191,26 +191,19 @@
display: none; display: none;
} }
&.shortcuts span{
display: inline-block;
width: 140px;
}
&.shortcuts .kbd { &.shortcuts .kbd {
background-color: $gray-light;
color: $gl-text-color;
border: 1px solid $gray-darkest;
box-shadow: 0 -1px 0 $gray-darkest inset;
display: inline-block; display: inline-block;
padding: 3px 5px; vertical-align: top;
padding: 3px 0;
margin-right: 5px;
font-size: 11px; font-size: 11px;
line-height: 10px; line-height: 10px;
color: #555;
vertical-align: middle;
background-color: #fcfcfc;
border-width: 1px;
border-style: solid;
border-color: #ccc #ccc #bbb;
border-image: none;
border-radius: 3px; border-radius: 3px;
box-shadow: 0 -1px 0 #bbb inset; width: 20px;
width: 21px;
text-align: center; text-align: center;
} }
......
%ul %ul
= nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: "#{project_tab_class} home"}) do = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: "#{project_tab_class} home"}) do
= link_to dashboard_projects_path, title: 'Projects', class: 'dashboard-shortcuts-projects' do = link_to dashboard_projects_path, title: 'Projects', class: 'dashboard-shortcuts-projects' do
%span
Projects
.kbd .kbd
P P
%span
Projects
= nav_link(path: 'dashboard#activity') do = nav_link(path: 'dashboard#activity') do
= link_to activity_dashboard_path, class: 'dashboard-shortcuts-activity', title: 'Activity' do = link_to activity_dashboard_path, class: 'dashboard-shortcuts-activity', title: 'Activity' do
%span
Activity
.kbd .kbd
A A
%span
Activity
- if koding_enabled? - if koding_enabled?
= nav_link(controller: :koding) do = nav_link(controller: :koding) do
= link_to koding_path, title: 'Koding' do = link_to koding_path, title: 'Koding' do
...@@ -18,36 +18,36 @@ ...@@ -18,36 +18,36 @@
Koding Koding
= nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
= link_to dashboard_groups_path, class: 'dashboard-shortcuts-groups', title: 'Groups' do = link_to dashboard_groups_path, class: 'dashboard-shortcuts-groups', title: 'Groups' do
%span
Groups
.kbd .kbd
G G
%span
Groups
= nav_link(controller: 'dashboard/milestones') do = nav_link(controller: 'dashboard/milestones') do
= link_to dashboard_milestones_path, class: 'dashboard-shortcuts-milestones', title: 'Milestones' do = link_to dashboard_milestones_path, class: 'dashboard-shortcuts-milestones', title: 'Milestones' do
%span
Milestones
.kbd .kbd
L L
%span
Milestones
= nav_link(path: 'dashboard#issues') do = nav_link(path: 'dashboard#issues') do
= link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do
.kbd
I
%span %span
Issues Issues
.badge= number_with_delimiter(cached_assigned_issuables_count(current_user, :issues, :opened)) .badge= number_with_delimiter(cached_assigned_issuables_count(current_user, :issues, :opened))
.kbd
I
= nav_link(path: 'dashboard#merge_requests') do = nav_link(path: 'dashboard#merge_requests') do
= link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do
.kbd
M
%span %span
Merge Requests Merge Requests
.badge= number_with_delimiter(cached_assigned_issuables_count(current_user, :merge_requests, :opened)) .badge= number_with_delimiter(cached_assigned_issuables_count(current_user, :merge_requests, :opened))
.kbd
M
= nav_link(controller: 'dashboard/snippets') do = nav_link(controller: 'dashboard/snippets') do
= link_to dashboard_snippets_path, class: 'dashboard-shortcuts-snippets', title: 'Snippets' do = link_to dashboard_snippets_path, class: 'dashboard-shortcuts-snippets', title: 'Snippets' do
%span
Snippets
.kbd .kbd
S S
%span
Snippets
%li.divider %li.divider
%li %li
= link_to "Help", help_path, title: 'About GitLab CE', class: 'about-gitlab' = link_to "Help", help_path, title: 'About GitLab CE', class: 'about-gitlab'
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment