kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Reverted the change from .second-block to .calender-block

Browse source
This commit is contained in:
Jose Ivan 2017-01-25 11:27:42 -08:00
parent 21630c6be9
commit 27a3505e02
4 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/users/calendar.js
View file

@ -88,7 +88,7 @@
var lastMonth, lastMonthX, month, x; var lastMonth, lastMonthX, month, x;
if (a === 0 && stamp.day === 0) { if (a === 0 && stamp.day === 0) {
month = stamp.date.getMonth(); month = stamp.date.getMonth();
x = (_this.daySizeWithSpace * i + 1) + _this.daySizeWithSpace; x = (_this.daySizeWithSpace * i + 41) + _this.daySizeWithSpace;
lastMonth = _.last(_this.months); lastMonth = _.last(_this.months);
if (lastMonth != null) { if (lastMonth != null) {
lastMonthX = lastMonth.x; lastMonthX = lastMonth.x;

1
app/assets/stylesheets/framework/blocks.scss
View file

@ -56,7 +56,6 @@
&.second-block { &.second-block {
margin-top: -1px; margin-top: -1px;
margin-bottom: 0; margin-bottom: 0;
direction: rtl;
} }
&.footer-block { &.footer-block {

1
app/assets/stylesheets/framework/calendar.scss
View file

@ -1,6 +1,7 @@
.calender-block { .calender-block {
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
direction: rtl;
@media (min-width: $screen-sm-min) and (max-width: $screen-md-max) { @media (min-width: $screen-sm-min) and (max-width: $screen-md-max) {
overflow-x: scroll; overflow-x: scroll;

4
changelogs/unreleased/contribution-calendar-scroll.yml Normal file
View file

@ -0,0 +1,4 @@
---
title: contribution calendar scrolls from right to left
merge_request:
author: