diff options
| author | nicolas <nclm@users.noreply.github.com> | 2016-11-25 18:14:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-25 18:14:42 +0100 |
| commit | 9f9680412f305fb70bbb19f6efd07b484ce82939 (patch) | |
| tree | 0ce95ea013cc4fb570bcd44ef6624ec34da4ea0d | |
| parent | 959e4b81987080353415556cc3bbd2aab478adb4 (diff) | |
| parent | 4495baf4513cc4a07d077bf0081de686a3b7f985 (diff) | |
Merge pull request #6 from Gargron/master
Merge
| -rw-r--r-- | app/assets/stylesheets/forms.scss | 13 | ||||
| -rw-r--r-- | app/controllers/api_controller.rb | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/app/assets/stylesheets/forms.scss b/app/assets/stylesheets/forms.scss index 306f474d6..22b05946e 100644 --- a/app/assets/stylesheets/forms.scss +++ b/app/assets/stylesheets/forms.scss @@ -48,11 +48,16 @@ code { display: block; } - input[type=checkbox] { - display: inline-block; + label.checkbox { position: relative; - top: 3px; - margin-right: 8px; + padding-left: 25px; + } + + input[type=checkbox] { + position: absolute; + left: 0; + top: 1px; + margin: 0; } } diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index a3a2a3275..d2d3bc4a4 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -48,7 +48,7 @@ class ApiController < ApplicationController response.headers['X-RateLimit-Limit'] = match_data[:limit].to_s response.headers['X-RateLimit-Remaining'] = (match_data[:limit] - match_data[:count]).to_s - response.headers['X-RateLimit-Reset'] = (now + (match_data[:period] - now.to_i % match_data[:period])).to_s + response.headers['X-RateLimit-Reset'] = (now + (match_data[:period] - now.to_i % match_data[:period])).iso8601(6) end def set_pagination_headers(next_path = nil, prev_path = nil) |