zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 9 Releases Wiki Activity

Merge pull request #6 from Gargron/master 

Merge
This commit is contained in:
nicolas 2016-11-25 18:14:42 +01:00 committed by GitHub
parent 959e4b8198 4495baf451
commit 9f9680412f
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/stylesheets/forms.scss
View File

@ -48,11 +48,16 @@ code {
display: block; display: block;
} }
input[type=checkbox] { label.checkbox {
display: inline-block;
position: relative; position: relative;
top: 3px; padding-left: 25px;
margin-right: 8px; }
input[type=checkbox] {
position: absolute;
left: 0;
top: 1px;
margin: 0;
} }
} }

2
app/controllers/api_controller.rb
View File

@ -48,7 +48,7 @@ class ApiController < ApplicationController
response.headers['X-RateLimit-Limit'] = match_data[:limit].to_s 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-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 end
def set_pagination_headers(next_path = nil, prev_path = nil) def set_pagination_headers(next_path = nil, prev_path = nil)