diff options
| author | Phil Hughes <me@iamphill.com> | 2017-01-06 14:43:21 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-02-06 09:25:11 +0000 |
| commit | 8331036944cc6b7cc376b464eae353882f125113 (patch) | |
| tree | 917382162251adb0c80a04d5d0d10c073a0f0687 /app | |
| parent | 2b9457412c389ed2509774810fc1a7f634845e14 (diff) | |
| download | gitlab-ce-8331036944cc6b7cc376b464eae353882f125113.tar.gz | |
Fixed some specs
CHANGELOG item
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/issuable_form.js | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/member_expiration_date.js.es6 | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/calendar.scss | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/issuable_form.js b/app/assets/javascripts/issuable_form.js index 49fe9f48b7b..c7c744ef61f 100644 --- a/app/assets/javascripts/issuable_form.js +++ b/app/assets/javascripts/issuable_form.js @@ -15,7 +15,7 @@ IssuableForm.prototype.wipRegex = /^\s*(\[WIP\]\s*|WIP:\s*|WIP\s+)+\s*/i; function IssuableForm(form) { - var $issuableDueDate; + var $issuableDueDate, calendar; this.form = form; this.toggleWip = bind(this.toggleWip, this); this.renderWipExplanation = bind(this.renderWipExplanation, this); @@ -37,7 +37,7 @@ this.initMoveDropdown(); $issuableDueDate = $('#issuable-due-date'); if ($issuableDueDate.length) { - var calendar = new Pikaday({ + calendar = new Pikaday({ field: $issuableDueDate.get(0), theme: 'gitlab-theme', format: 'yyyy-mm-dd', diff --git a/app/assets/javascripts/member_expiration_date.js.es6 b/app/assets/javascripts/member_expiration_date.js.es6 index 6c3730b7acd..8b045dfc134 100644 --- a/app/assets/javascripts/member_expiration_date.js.es6 +++ b/app/assets/javascripts/member_expiration_date.js.es6 @@ -21,12 +21,12 @@ theme: 'gitlab-theme', format: 'yyyy-mm-dd', minDate: new Date(), - onSelect: (dateText) => { + onSelect(dateText) { $input.val(dateFormat(new Date(dateText), 'yyyy-mm-dd')); $input.trigger('change'); - toggleClearInput.call(this); + toggleClearInput.call($input); }, }); diff --git a/app/assets/stylesheets/framework/calendar.scss b/app/assets/stylesheets/framework/calendar.scss index 261179835d9..d485e75a434 100644 --- a/app/assets/stylesheets/framework/calendar.scss +++ b/app/assets/stylesheets/framework/calendar.scss @@ -46,7 +46,7 @@ .pika-single.gitlab-theme { .pika-label { - color: $gl-gray; + color: $gl-text-color-secondary; font-size: 14px; font-weight: normal; } |