Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
8367e4ab
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 搜索 >>
提交
8367e4ab
编写于
1月 20, 2016
作者:
D
Dmitriy Zaporozhets
提交者:
Jacob Schatz
1月 20, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Implement new UI for pagination
上级
1f9153b9
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
33 addition
and
53 deletion
+33
-53
CHANGELOG
CHANGELOG
+1
-0
app/assets/stylesheets/framework/pagination.scss
app/assets/stylesheets/framework/pagination.scss
+3
-26
app/assets/stylesheets/framework/tw_bootstrap_variables.scss
app/assets/stylesheets/framework/tw_bootstrap_variables.scss
+11
-11
app/views/kaminari/gitlab/_next_page.html.haml
app/views/kaminari/gitlab/_next_page.html.haml
+6
-2
app/views/kaminari/gitlab/_paginator.html.haml
app/views/kaminari/gitlab/_paginator.html.haml
+2
-2
app/views/kaminari/gitlab/_prev_page.html.haml
app/views/kaminari/gitlab/_prev_page.html.haml
+6
-2
app/views/projects/issues/_issues.html.haml
app/views/projects/issues/_issues.html.haml
+0
-5
app/views/projects/merge_requests/_merge_requests.html.haml
app/views/projects/merge_requests/_merge_requests.html.haml
+0
-5
config/locales/en.yml
config/locales/en.yml
+4
-0
未找到文件。
CHANGELOG
浏览文件 @
8367e4ab
...
...
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.5.0 (unreleased)
- Add "visibility" flag to GET /projects api endpoint
- Upgrade gitlab_git to 7.2.23 to fix commit message mentions in first branch push
- New UI for pagination
v 8.4.0 (unreleased)
- Allow LDAP users to change their email if it was not set by the LDAP server
...
...
app/assets/stylesheets/framework/pagination.scss
浏览文件 @
8367e4ab
.gl-pagination
{
text-align
:
center
;
width
:
100%
;
border-top
:
1px
solid
$border-color
;
background-color
:
$background-color
;
margin
:
-
$gl-padding
;
margin
:
0
;
margin-top
:
0
;
.pagination
{
padding
:
0
;
margin
:
0
;
display
:
block
;
li
.first
,
li
.last
,
li
.next
,
li
.prev
{
>
a
{
color
:
$link-color
;
&
:hover
{
color
:
#fff
;
}
}
}
li
>
a
,
li
>
span
{
border
:
none
;
margin
:
0
;
@include
border-radius
(
0
!
important
);
padding
:
13px
19px
;
border-right
:
1px
solid
$border-color
;
}
}
}
...
...
app/assets/stylesheets/framework/tw_bootstrap_variables.scss
浏览文件 @
8367e4ab
...
...
@@ -66,20 +66,20 @@ $legend-color: $text-color;
//##
$pagination-color
:
$gl-gray
;
$pagination-bg
:
$background-color
;
$pagination-border
:
transparent
;
$pagination-bg
:
#fff
;
$pagination-border
:
$border-color
;
$pagination-hover-color
:
#fff
;
$pagination-hover-bg
:
$
brand-info
;
$pagination-hover-border
:
transparent
;
$pagination-hover-color
:
$gl-gray
;
$pagination-hover-bg
:
$
hover
;
$pagination-hover-border
:
$border-color
;
$pagination-active-color
:
#fff
;
$pagination-active-bg
:
$brand-info
;
$pagination-active-border
:
transparent
;
$pagination-active-color
:
$blue-dark
;
$pagination-active-bg
:
#fff
;
$pagination-active-border
:
$border-color
;
$pagination-disabled-color
:
#
fff
;
$pagination-disabled-bg
:
lighten
(
$brand-info
,
15%
)
;
$pagination-disabled-border
:
transparent
;
$pagination-disabled-color
:
#
cdcdcd
;
$pagination-disabled-bg
:
$background-color
;
$pagination-disabled-border
:
$border-color
;
//== Form states and alerts
...
...
app/views/kaminari/gitlab/_next_page.html.haml
浏览文件 @
8367e4ab
...
...
@@ -5,5 +5,9 @@
-# num_pages: total number of pages
-# per_page: number of items to fetch per page
-# remote: data-remote
%li
.next
=
link_to_unless
current_page
.
last?
,
raw
(
t
'views.pagination.next'
),
url
,
rel:
'next'
,
remote:
remote
-
if
current_page
.
last?
%li
{
class:
"next disabled"
}
%span
=
raw
(
t
'views.pagination.next'
)
-
else
%li
{
class:
"next"
}
=
link_to
raw
(
t
'views.pagination.next'
),
url
,
rel:
'next'
,
remote:
remote
app/views/kaminari/gitlab/_paginator.html.haml
浏览文件 @
8367e4ab
...
...
@@ -10,13 +10,13 @@
%ul
.pagination.clearfix
-
unless
current_page
.
first?
=
first_page_tag
unless
num_pages
<
5
# As kaminari will always show the first 5 pages
=
prev_page_tag
=
prev_page_tag
-
each_page
do
|
page
|
-
if
page
.
left_outer?
||
page
.
right_outer?
||
page
.
inside_window?
=
page_tag
page
-
elsif
!
page
.
was_truncated?
=
gap_tag
=
next_page_tag
-
unless
current_page
.
last?
=
next_page_tag
=
last_page_tag
unless
num_pages
<
5
app/views/kaminari/gitlab/_prev_page.html.haml
浏览文件 @
8367e4ab
...
...
@@ -5,5 +5,9 @@
-# num_pages: total number of pages
-# per_page: number of items to fetch per page
-# remote: data-remote
%li
{
class:
"prev"
}
=
link_to_unless
current_page
.
first?
,
raw
(
t
'views.pagination.previous'
),
url
,
rel:
'prev'
,
remote:
remote
-
if
current_page
.
first?
%li
{
class:
"prev disabled"
}
%span
=
raw
(
t
'views.pagination.previous'
)
-
else
%li
{
class:
"prev"
}
=
link_to
raw
(
t
'views.pagination.previous'
),
url
,
rel:
'prev'
,
remote:
remote
app/views/projects/issues/_issues.html.haml
浏览文件 @
8367e4ab
...
...
@@ -5,9 +5,4 @@
.nothing-here-block
No issues to show
-
if
@issues
.
present?
.issuable-filter-count
%span
.pull-right
=
number_with_delimiter
(
@issues
.
total_count
)
issues for this filter
=
paginate
@issues
,
theme:
"gitlab"
app/views/projects/merge_requests/_merge_requests.html.haml
浏览文件 @
8367e4ab
...
...
@@ -5,10 +5,5 @@
.nothing-here-block
No merge requests to show
-
if
@merge_requests
.
present?
.issuable-filter-count
%span
.pull-right
=
number_with_delimiter
(
@merge_requests
.
total_count
)
merge requests for this filter
=
paginate
@merge_requests
,
theme:
"gitlab"
config/locales/en.yml
浏览文件 @
8367e4ab
...
...
@@ -8,3 +8,7 @@ en:
wrong_size
:
"
is
the
wrong
size
(should
be
%{file_size})"
size_too_small
:
"
is
too
small
(should
be
at
least
%{file_size})"
size_too_big
:
"
is
too
big
(should
be
at
most
%{file_size})"
views
:
pagination
:
previous
:
"
Prev"
next
:
"
Next"
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录