diff options
| author | Jose Ivan <jivanvlop@gmail.com> | 2017-01-25 11:27:42 -0800 |
|---|---|---|
| committer | Jose Ivan <jivanvlop@gmail.com> | 2017-01-25 12:16:44 -0800 |
| commit | 27a3505e028ab4a6af2386367c9d60e01eae04c7 (patch) | |
| tree | 40d6f5578908a0fb035f13bcb16efca4ec999fc0 | |
| parent | 21630c6be9e33e573034c7f47e2696884b303346 (diff) | |
| download | gitlab-ce-27a3505e028ab4a6af2386367c9d60e01eae04c7.tar.gz | |
Reverted the change from .second-block to .calender-block
| -rw-r--r-- | app/assets/javascripts/users/calendar.js | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/calendar.scss | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/contribution-calendar-scroll.yml | 4 |
4 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/users/calendar.js b/app/assets/javascripts/users/calendar.js index 7ffc546ffc1..ee8893818ea 100644 --- a/app/assets/javascripts/users/calendar.js +++ b/app/assets/javascripts/users/calendar.js @@ -88,7 +88,7 @@ var lastMonth, lastMonthX, month, x; if (a === 0 && stamp.day === 0) { month = stamp.date.getMonth(); - x = (_this.daySizeWithSpace * i + 1) + _this.daySizeWithSpace; + x = (_this.daySizeWithSpace * i + 41) + _this.daySizeWithSpace; lastMonth = _.last(_this.months); if (lastMonth != null) { lastMonthX = lastMonth.x; diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index 099e95fed0e..592ef0d647f 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -56,7 +56,6 @@ &.second-block { margin-top: -1px; margin-bottom: 0; - direction: rtl; } &.footer-block { diff --git a/app/assets/stylesheets/framework/calendar.scss b/app/assets/stylesheets/framework/calendar.scss index ef921a8c6a9..1d2d1bfc0d7 100644 --- a/app/assets/stylesheets/framework/calendar.scss +++ b/app/assets/stylesheets/framework/calendar.scss @@ -1,6 +1,7 @@ .calender-block { padding-left: 0; padding-right: 0; + direction: rtl; @media (min-width: $screen-sm-min) and (max-width: $screen-md-max) { overflow-x: scroll; diff --git a/changelogs/unreleased/contribution-calendar-scroll.yml b/changelogs/unreleased/contribution-calendar-scroll.yml new file mode 100644 index 00000000000..a504d59e61c --- /dev/null +++ b/changelogs/unreleased/contribution-calendar-scroll.yml @@ -0,0 +1,4 @@ +--- +title: contribution calendar scrolls from right to left +merge_request: +author: |