summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/generic
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-19 16:22:04 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-19 16:22:04 +0200
commit9fb3ef8888cc49619e259ddb5e9c559e9724be86 (patch)
tree236474d18f2a19a83491cc9b6c3f4b5f67d3e293 /app/assets/stylesheets/generic
parent5a8d73243a7b68f2724a6d5f9d482dda24e9dfe4 (diff)
downloadgitlab-ce-9fb3ef8888cc49619e259ddb5e9c559e9724be86.tar.gz
Apply new design to paginationstyle-pagination
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets/stylesheets/generic')
-rw-r--r--app/assets/stylesheets/generic/blocks.scss7
-rw-r--r--app/assets/stylesheets/generic/pagination.scss32
2 files changed, 36 insertions, 3 deletions
diff --git a/app/assets/stylesheets/generic/blocks.scss b/app/assets/stylesheets/generic/blocks.scss
index ce024272a30..6ce34b5c3e8 100644
--- a/app/assets/stylesheets/generic/blocks.scss
+++ b/app/assets/stylesheets/generic/blocks.scss
@@ -20,11 +20,11 @@
.gray-content-block {
margin: -$gl-padding;
- background-color: #f8fafc;
+ background-color: $background-color;
padding: $gl-padding;
margin-bottom: 0px;
- border-top: 1px solid #e7e9ed;
- border-bottom: 1px solid #e7e9ed;
+ border-top: 1px solid $border-color;
+ border-bottom: 1px solid $border-color;
color: $gl-gray;
&.top-block {
@@ -48,6 +48,7 @@
&.footer-block {
margin-top: 0;
+ border-bottom: none;
margin-bottom: -$gl-padding;
}
diff --git a/app/assets/stylesheets/generic/pagination.scss b/app/assets/stylesheets/generic/pagination.scss
new file mode 100644
index 00000000000..a937677ebdc
--- /dev/null
+++ b/app/assets/stylesheets/generic/pagination.scss
@@ -0,0 +1,32 @@
+.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;
+ }
+ }
+}