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
Boxiang Sun
gitlab-ce
Commits
9fb3ef88
Commit
9fb3ef88
authored
Sep 19, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply new design to pagination
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
5a8d7324
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
43 additions
and
10 deletions
+43
-10
app/assets/stylesheets/base/gl_variables.scss
app/assets/stylesheets/base/gl_variables.scss
+6
-6
app/assets/stylesheets/generic/blocks.scss
app/assets/stylesheets/generic/blocks.scss
+4
-3
app/assets/stylesheets/generic/pagination.scss
app/assets/stylesheets/generic/pagination.scss
+32
-0
app/views/kaminari/gitlab/_paginator.html.haml
app/views/kaminari/gitlab/_paginator.html.haml
+1
-1
No files found.
app/assets/stylesheets/base/gl_variables.scss
View file @
9fb3ef88
...
@@ -65,20 +65,20 @@ $legend-color: $text-color;
...
@@ -65,20 +65,20 @@ $legend-color: $text-color;
//
//
//##
//##
$pagination-color
:
#fff
;
$pagination-color
:
$gl-gray
;
$pagination-bg
:
$b
rand-success
;
$pagination-bg
:
$b
ackground-color
;
$pagination-border
:
transparent
;
$pagination-border
:
transparent
;
$pagination-hover-color
:
#fff
;
$pagination-hover-color
:
#fff
;
$pagination-hover-bg
:
darken
(
$brand-success
,
15%
)
;
$pagination-hover-bg
:
$brand-info
;
$pagination-hover-border
:
transparent
;
$pagination-hover-border
:
transparent
;
$pagination-active-color
:
#fff
;
$pagination-active-color
:
#fff
;
$pagination-active-bg
:
darken
(
$brand-success
,
15%
)
;
$pagination-active-bg
:
$brand-info
;
$pagination-active-border
:
transparent
;
$pagination-active-border
:
transparent
;
$pagination-disabled-color
:
#
b4bcc2
;
$pagination-disabled-color
:
#
fff
;
$pagination-disabled-bg
:
lighten
(
$brand-
success
,
15%
);
$pagination-disabled-bg
:
lighten
(
$brand-
info
,
15%
);
$pagination-disabled-border
:
transparent
;
$pagination-disabled-border
:
transparent
;
...
...
app/assets/stylesheets/generic/blocks.scss
View file @
9fb3ef88
...
@@ -20,11 +20,11 @@
...
@@ -20,11 +20,11 @@
.gray-content-block
{
.gray-content-block
{
margin
:
-
$gl-padding
;
margin
:
-
$gl-padding
;
background-color
:
#f8fafc
;
background-color
:
$background-color
;
padding
:
$gl-padding
;
padding
:
$gl-padding
;
margin-bottom
:
0px
;
margin-bottom
:
0px
;
border-top
:
1px
solid
#e7e9ed
;
border-top
:
1px
solid
$border-color
;
border-bottom
:
1px
solid
#e7e9ed
;
border-bottom
:
1px
solid
$border-color
;
color
:
$gl-gray
;
color
:
$gl-gray
;
&
.top-block
{
&
.top-block
{
...
@@ -48,6 +48,7 @@
...
@@ -48,6 +48,7 @@
&
.footer-block
{
&
.footer-block
{
margin-top
:
0
;
margin-top
:
0
;
border-bottom
:
none
;
margin-bottom
:
-
$gl-padding
;
margin-bottom
:
-
$gl-padding
;
}
}
...
...
app/assets/stylesheets/generic/pagination.scss
0 → 100644
View file @
9fb3ef88
.gl-pagination
{
border-top
:
1px
solid
$border-color
;
background-color
:
$background-color
;
margin
:
-
$gl-padding
;
margin-top
:
0
;
.pagination
{
padding
:
0
;
margin
:
0
;
display
:
block
;
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/views/kaminari/gitlab/_paginator.html.haml
View file @
9fb3ef88
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
-# paginator: the paginator that renders the pagination tags inside
-# paginator: the paginator that renders the pagination tags inside
=
paginator
.
render
do
=
paginator
.
render
do
%div
.gl-pagination
%div
.gl-pagination
%ul
.pagination
%ul
.pagination
.clearfix
=
prev_page_tag
unless
current_page
.
first?
=
prev_page_tag
unless
current_page
.
first?
-
each_page
do
|
page
|
-
each_page
do
|
page
|
-
if
page
.
left_outer?
||
page
.
right_outer?
||
page
.
inside_window?
-
if
page
.
left_outer?
||
page
.
right_outer?
||
page
.
inside_window?
...
...
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