Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
e82b989e
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
e82b989e
编写于
12月 03, 2018
作者:
K
Kushal Pandya
提交者:
Annabel Dunstone Gray
12月 03, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix secondary nav dropdown menu styling in tablet and mobile screens
上级
59de4e8f
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
36 addition
and
31 deletion
+36
-31
app/assets/stylesheets/framework/filters.scss
app/assets/stylesheets/framework/filters.scss
+6
-10
app/assets/stylesheets/framework/secondary_navigation_elements.scss
.../stylesheets/framework/secondary_navigation_elements.scss
+4
-0
app/views/admin/runners/_sort_dropdown.html.haml
app/views/admin/runners/_sort_dropdown.html.haml
+1
-1
app/views/explore/projects/_filter.html.haml
app/views/explore/projects/_filter.html.haml
+3
-3
app/views/projects/forks/index.html.haml
app/views/projects/forks/index.html.haml
+1
-1
app/views/projects/tags/index.html.haml
app/views/projects/tags/index.html.haml
+1
-1
app/views/shared/_milestones_sort_dropdown.html.haml
app/views/shared/_milestones_sort_dropdown.html.haml
+1
-1
app/views/shared/_sort_dropdown.html.haml
app/views/shared/_sort_dropdown.html.haml
+1
-1
app/views/shared/groups/_dropdown.html.haml
app/views/shared/groups/_dropdown.html.haml
+1
-1
app/views/shared/labels/_sort_dropdown.html.haml
app/views/shared/labels/_sort_dropdown.html.haml
+1
-1
changelogs/unreleased/54648-fix-order-by-dropdown-tablet-screens.yml
...unreleased/54648-fix-order-by-dropdown-tablet-screens.yml
+5
-0
spec/features/issues/filtered_search/filter_issues_spec.rb
spec/features/issues/filtered_search/filter_issues_spec.rb
+2
-2
spec/features/issues/user_sorts_issues_spec.rb
spec/features/issues/user_sorts_issues_spec.rb
+2
-2
spec/features/merge_requests/user_sorts_merge_requests_spec.rb
...features/merge_requests/user_sorts_merge_requests_spec.rb
+3
-3
spec/features/projects/labels/issues_sorted_by_priority_spec.rb
...eatures/projects/labels/issues_sorted_by_priority_spec.rb
+2
-2
spec/support/helpers/features/sorting_helpers.rb
spec/support/helpers/features/sorting_helpers.rb
+1
-1
spec/support/helpers/sorting_helper.rb
spec/support/helpers/sorting_helper.rb
+1
-1
未找到文件。
app/assets/stylesheets/framework/filters.scss
浏览文件 @
e82b989e
...
...
@@ -363,6 +363,12 @@
background-color
:
$white-light
;
border-top
:
0
;
}
.filter-dropdown-container
{
.dropdown
{
margin-left
:
0
;
}
}
}
@include
media-breakpoint-down
(
sm
)
{
...
...
@@ -372,16 +378,6 @@
.dropdown-menu
{
width
:
100%
;
}
.dropdown
{
margin-left
:
0
;
}
.fa-chevron-down
{
position
:
absolute
;
right
:
10px
;
top
:
10px
;
}
}
}
...
...
app/assets/stylesheets/framework/secondary_navigation_elements.scss
浏览文件 @
e82b989e
...
...
@@ -158,6 +158,10 @@
width
:
100%
;
}
.dropdown-menu-toggle
{
margin-bottom
:
0
;
}
form
{
display
:
block
;
height
:
auto
;
...
...
app/views/admin/runners/_sort_dropdown.html.haml
浏览文件 @
e82b989e
-
sorted_by
=
sort_options_hash
[
@sort
]
.dropdown.inline.prepend-left-10
%button
.dropdown-toggle
{
type:
'button'
,
data:
{
toggle:
'dropdown'
,
display:
'static'
}
}
%button
.dropdown-
menu-
toggle
{
type:
'button'
,
data:
{
toggle:
'dropdown'
,
display:
'static'
}
}
=
sorted_by
=
icon
(
'chevron-down'
)
%ul
.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable.dropdown-menu-sort
...
...
app/views/explore/projects/_filter.html.haml
浏览文件 @
e82b989e
-
if
current_user
.dropdown
%button
.dropdown-toggle
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
,
'data-display'
=>
'static'
}
=
icon
(
'globe'
)
%span
.light
=
_
(
"Visibility:"
)
%button
.dropdown-
menu-
toggle
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
,
'data-display'
=>
'static'
}
=
icon
(
'globe'
,
class:
'mt-1'
)
%span
.light
.ml-3
=
_
(
"Visibility:"
)
-
if
params
[
:visibility_level
].
present?
=
visibility_level_label
(
params
[
:visibility_level
].
to_i
)
-
else
...
...
app/views/projects/forks/index.html.haml
浏览文件 @
e82b989e
...
...
@@ -9,7 +9,7 @@
spellcheck:
false
,
data:
{
'filter-selector'
=>
'span.namespace-name'
}
.dropdown
%button
.dropdown-toggle
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%button
.dropdown-
menu-
toggle
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%span
.light
sort:
-
if
@sort
.
present?
=
sort_options_hash
[
@sort
]
...
...
app/views/projects/tags/index.html.haml
浏览文件 @
e82b989e
...
...
@@ -14,7 +14,7 @@
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
s_
(
'TagsPage|Filter by tag name'
),
id:
'tag-search'
,
class:
'form-control search-text-input input-short'
,
spellcheck:
false
}
.dropdown
%button
.dropdown-toggle
{
type:
'button'
,
data:
{
toggle:
'dropdown'
}
}
%button
.dropdown-
menu-
toggle
{
type:
'button'
,
data:
{
toggle:
'dropdown'
}
}
%span
.light
=
tags_sort_options_hash
[
@sort
]
=
icon
(
'chevron-down'
)
...
...
app/views/shared/_milestones_sort_dropdown.html.haml
浏览文件 @
e82b989e
.dropdown.inline.prepend-left-10
%button
.dropdown-toggle
{
type:
'button'
,
data:
{
toggle:
'dropdown'
}
}
%button
.dropdown-
menu-
toggle
{
type:
'button'
,
data:
{
toggle:
'dropdown'
}
}
%span
.light
-
if
@sort
.
present?
=
milestone_sort_options_hash
[
@sort
]
...
...
app/views/shared/_sort_dropdown.html.haml
浏览文件 @
e82b989e
...
...
@@ -2,7 +2,7 @@
-
viewing_issues
=
controller
.
controller_name
==
'issues'
||
controller
.
action_name
==
'issues'
.dropdown.inline.prepend-left-10
%button
.dropdown-toggle
{
type:
'button'
,
data:
{
toggle:
'dropdown'
,
display:
'static'
}
}
%button
.dropdown-
menu-
toggle
{
type:
'button'
,
data:
{
toggle:
'dropdown'
,
display:
'static'
}
}
=
sorted_by
=
icon
(
'chevron-down'
)
%ul
.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable.dropdown-menu-sort
...
...
app/views/shared/groups/_dropdown.html.haml
浏览文件 @
e82b989e
...
...
@@ -9,7 +9,7 @@
-
default_sort_by
=
sort_value_recently_created
.dropdown.inline.js-group-filter-dropdown-wrap.append-right-10
%button
.dropdown-toggle
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%button
.dropdown-
menu-
toggle
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%span
.dropdown-label
=
options_hash
[
default_sort_by
]
=
icon
(
'chevron-down'
)
...
...
app/views/shared/labels/_sort_dropdown.html.haml
浏览文件 @
e82b989e
-
sort_title
=
label_sort_options_hash
[
@sort
]
||
sort_title_name_desc
.dropdown.inline
%button
.dropdown-toggle
{
type:
'button'
,
data:
{
toggle:
'dropdown'
}
}
%button
.dropdown-
menu-
toggle
{
type:
'button'
,
data:
{
toggle:
'dropdown'
}
}
=
sort_title
=
icon
(
'chevron-down'
)
%ul
.dropdown-menu.dropdown-menu-right.dropdown-menu-sort
...
...
changelogs/unreleased/54648-fix-order-by-dropdown-tablet-screens.yml
0 → 100644
浏览文件 @
e82b989e
---
title
:
Fix Order By dropdown menu styling in tablet and mobile screens
merge_request
:
23446
author
:
type
:
fixed
spec/features/issues/filtered_search/filter_issues_spec.rb
浏览文件 @
e82b989e
...
...
@@ -430,10 +430,10 @@ describe 'Filter issues', :js do
expect_issues_list_count
(
2
)
sort_toggle
=
find
(
'.filter
ed-search-wrapper .dropdown
-toggle'
)
sort_toggle
=
find
(
'.filter
-dropdown-container .dropdown-menu
-toggle'
)
sort_toggle
.
click
find
(
'.filter
ed-search-wrapp
er .dropdown-menu li a'
,
text:
'Created date'
).
click
find
(
'.filter
-dropdown-contain
er .dropdown-menu li a'
,
text:
'Created date'
).
click
wait_for_requests
expect
(
find
(
'.issues-list .issue:first-of-type .issue-title-text a'
)).
to
have_content
(
new_issue
.
title
)
...
...
spec/features/issues/user_sorts_issues_spec.rb
浏览文件 @
e82b989e
...
...
@@ -20,7 +20,7 @@ describe "User sorts issues" do
end
it
'keeps the sort option'
do
find
(
'
button.dropdown
-toggle'
).
click
find
(
'
.filter-dropdown-container button.dropdown-menu
-toggle'
).
click
page
.
within
(
'.content ul.dropdown-menu.dropdown-menu-right li'
)
do
click_link
(
'Milestone'
)
...
...
@@ -40,7 +40,7 @@ describe "User sorts issues" do
end
it
"sorts by popularity"
do
find
(
"
button.dropdown
-toggle"
).
click
find
(
"
.filter-dropdown-container button.dropdown-menu
-toggle"
).
click
page
.
within
(
".content ul.dropdown-menu.dropdown-menu-right li"
)
do
click_link
(
"Popularity"
)
...
...
spec/features/merge_requests/user_sorts_merge_requests_spec.rb
浏览文件 @
e82b989e
...
...
@@ -19,7 +19,7 @@ describe 'User sorts merge requests' do
end
it
'keeps the sort option'
do
find
(
'
button.dropdown
-toggle'
).
click
find
(
'
.filter-dropdown-container button.dropdown-menu
-toggle'
).
click
page
.
within
(
'.content ul.dropdown-menu.dropdown-menu-right li'
)
do
click_link
(
'Milestone'
)
...
...
@@ -49,7 +49,7 @@ describe 'User sorts merge requests' do
it
'separates remember sorting with issues'
do
create
(
:issue
,
project:
project
)
find
(
'
button.dropdown
-toggle'
).
click
find
(
'
.filter-dropdown-container button.dropdown-menu
-toggle'
).
click
page
.
within
(
'.content ul.dropdown-menu.dropdown-menu-right li'
)
do
click_link
(
'Milestone'
)
...
...
@@ -70,7 +70,7 @@ describe 'User sorts merge requests' do
end
it
'sorts by popularity'
do
find
(
'
button.dropdown
-toggle'
).
click
find
(
'
.filter-dropdown-container button.dropdown-menu
-toggle'
).
click
page
.
within
(
'.content ul.dropdown-menu.dropdown-menu-right li'
)
do
click_link
(
'Popularity'
)
...
...
spec/features/projects/labels/issues_sorted_by_priority_spec.rb
浏览文件 @
e82b989e
...
...
@@ -32,7 +32,7 @@ describe 'Issue prioritization' do
visit
project_issues_path
(
project
,
sort:
'label_priority'
)
# Ensure we are indicating that issues are sorted by priority
expect
(
page
).
to
have_selector
(
'.dropdown-toggle'
,
text:
'Label priority'
)
expect
(
page
).
to
have_selector
(
'.dropdown-
menu-
toggle'
,
text:
'Label priority'
)
page
.
within
(
'.issues-holder'
)
do
issue_titles
=
all
(
'.issues-list .issue-title-text'
).
map
(
&
:text
)
...
...
@@ -70,7 +70,7 @@ describe 'Issue prioritization' do
sign_in
user
visit
project_issues_path
(
project
,
sort:
'label_priority'
)
expect
(
page
).
to
have_selector
(
'.dropdown-toggle'
,
text:
'Label priority'
)
expect
(
page
).
to
have_selector
(
'.dropdown-
menu-
toggle'
,
text:
'Label priority'
)
page
.
within
(
'.issues-holder'
)
do
issue_titles
=
all
(
'.issues-list .issue-title-text'
).
map
(
&
:text
)
...
...
spec/support/helpers/features/sorting_helpers.rb
浏览文件 @
e82b989e
...
...
@@ -13,7 +13,7 @@ module Spec
module
Features
module
SortingHelpers
def
sort_by
(
value
)
find
(
'
button.dropdown
-toggle'
).
click
find
(
'
.filter-dropdown-container button.dropdown-menu
-toggle'
).
click
page
.
within
(
'.content ul.dropdown-menu.dropdown-menu-right li'
)
do
click_link
(
value
)
...
...
spec/support/helpers/sorting_helper.rb
浏览文件 @
e82b989e
...
...
@@ -10,7 +10,7 @@
#
module
SortingHelper
def
sorting_by
(
value
)
find
(
'
button.dropdown
-toggle'
).
click
find
(
'
.filter-dropdown-container button.dropdown-menu
-toggle'
).
click
page
.
within
(
'.content ul.dropdown-menu.dropdown-menu-right li'
)
do
click_link
value
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录