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
Léo-Paul Géneau
gitlab-ce
Commits
309d4066
Commit
309d4066
authored
Jul 18, 2017
by
Takuya Noguchi
Committed by
Clement Ho
Jul 18, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify width for dropdown-menu on mobile
parent
2abb40f1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
13 deletions
+8
-13
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+1
-10
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+1
-1
app/views/layouts/nav/_dashboard.html.haml
app/views/layouts/nav/_dashboard.html.haml
+2
-2
changelogs/unreleased/34468-remove-extra-blank-on-admin-on-mobile.yml
...nreleased/34468-remove-extra-blank-on-admin-on-mobile.yml
+4
-0
No files found.
app/assets/stylesheets/framework/dropdowns.scss
View file @
309d4066
...
@@ -205,6 +205,7 @@
...
@@ -205,6 +205,7 @@
@media
(
max-width
:
$screen-sm-min
)
{
@media
(
max-width
:
$screen-sm-min
)
{
width
:
100%
;
width
:
100%
;
min-width
:
180px
;
}
}
&
.dropdown-open-left
{
&
.dropdown-open-left
{
...
@@ -288,12 +289,6 @@
...
@@ -288,12 +289,6 @@
padding
:
5px
8px
;
padding
:
5px
8px
;
color
:
$gl-text-color-secondary
;
color
:
$gl-text-color-secondary
;
}
}
.badge
{
position
:
absolute
;
right
:
8px
;
top
:
5px
;
}
}
}
.droplab-dropdown
{
.droplab-dropdown
{
...
@@ -466,10 +461,6 @@
...
@@ -466,10 +461,6 @@
left
:
auto
;
left
:
auto
;
right
:
0
;
right
:
0
;
margin-top
:
-5px
;
margin-top
:
-5px
;
@media
(
max-width
:
$screen-xs-max
)
{
left
:
0
;
}
}
}
.dropdown-menu-selectable
{
.dropdown-menu-selectable
{
...
...
app/assets/stylesheets/framework/nav.scss
View file @
309d4066
...
@@ -325,7 +325,7 @@
...
@@ -325,7 +325,7 @@
position
:
absolute
;
position
:
absolute
;
top
:
7px
;
top
:
7px
;
right
:
15px
;
right
:
15px
;
z-index
:
2
;
z-index
:
300
;
li
.active
{
li
.active
{
font-weight
:
bold
;
font-weight
:
bold
;
...
...
app/views/layouts/nav/_dashboard.html.haml
View file @
309d4066
...
@@ -42,18 +42,18 @@
...
@@ -42,18 +42,18 @@
.key
.key
=
icon
(
'arrow-up'
,
'aria-label'
=>
'hidden'
)
=
icon
(
'arrow-up'
,
'aria-label'
=>
'hidden'
)
I
I
%span
.badge.pull-right
=
number_with_delimiter
(
assigned_issuables_count
(
:issues
))
%span
%span
Issues
Issues
.badge
=
number_with_delimiter
(
assigned_issuables_count
(
:issues
))
=
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
.shortcut-mappings
.shortcut-mappings
.key
.key
=
icon
(
'arrow-up'
,
'aria-label'
=>
'hidden'
)
=
icon
(
'arrow-up'
,
'aria-label'
=>
'hidden'
)
M
M
%span
.badge.pull-right
=
number_with_delimiter
(
assigned_issuables_count
(
:merge_requests
))
%span
%span
Merge Requests
Merge Requests
.badge
=
number_with_delimiter
(
assigned_issuables_count
(
:merge_requests
))
=
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
.shortcut-mappings
.shortcut-mappings
...
...
changelogs/unreleased/34468-remove-extra-blank-on-admin-on-mobile.yml
0 → 100644
View file @
309d4066
---
title
:
Use smaller min-width for dropdown-menu-nav only on mobile
merge_request
:
12528
author
:
Takuya Noguchi
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