Sync changes from upstream repository

Hubot · Hubot · commit c9280d6b15be · 2014-12-03T17:05:23.000Z
diff --git a/lib/resources.rb b/lib/resources.rb
@@ -46,7 +46,6 @@ def avatar_url_for(login)
       end
 
       def headers(status, head = {})
-        css_class = (status == 202 || status == 204 || status == 205 || status == 404) ? 'headers no-response' : 'headers'
         lines = ["Status: #{STATUSES[status]}"]
         head.each do |key, value|
           case key
@@ -60,7 +59,7 @@ def headers(status, head = {})
         lines << "X-RateLimit-Limit: 5000" unless head.has_key?('X-RateLimit-Limit')
         lines << "X-RateLimit-Remaining: 4999" unless head.has_key?('X-RateLimit-Remaining')
 
-        %(<pre class="#{css_class}"><code>#{lines * "\n"}</code></pre>\n)
+        %(<pre class="headers"><code>#{lines * "\n"}</code></pre>\n)
       end
 
       def link_header(rels)
@@ -99,7 +98,7 @@ def json(key)
 
         hash = yield hash if block_given?
 
-        %(<pre><code class="language-javascript">) +
+        %(<pre class="body-response"><code class="language-javascript">) +
           JSON.pretty_generate(hash) + "</code></pre>"
       end
 
diff --git a/static/css/documentation.css b/static/css/documentation.css
@@ -1220,14 +1220,9 @@ pre span.comment {color: #aaa;}
 
 .headers {
   margin-bottom: 0;
-  border-bottom: none;
-  border-radius: 3px 3px 0 0;
-  background-color: #f4f4f4;
-}
-
-.no-response {
   border-radius: 3px 3px;
   border-bottom: 1px solid #CACACA;
+  background-color: #f4f4f4;
 }
 
 .headers + pre {
@@ -1236,6 +1231,10 @@ pre span.comment {color: #aaa;}
   border-top-color: #ddd;
 }
 
+.headers + pre.body-response {
+  margin-top: -2px;
+}
+
 .terminal {
   background-color: #444;
   color: #fff;
