From 316cabfb241a86758a77127e532a60f1334497a8 Mon Sep 17 00:00:00 2001
From: Craig Anderson <craiga@craiga.id.au>
Date: Tue, 4 May 2021 16:08:56 +0100
Subject: [PATCH] Remove a bit of inline CSS. Add CSP nonce where it might be
 required and is available.

---
 .../static/rest_framework/css/bootstrap-tweaks.css     |  4 ++++
 rest_framework/templates/rest_framework/base.html      | 10 ++++++----
 .../templates/rest_framework/pagination/numbers.html   |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css
index c2fcb303d..5c033be37 100644
--- a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css
+++ b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css
@@ -231,3 +231,7 @@ body a:hover {
   margin-left: 5px;
   margin-right: 5px;
 }
+
+.pagination {
+  margin: 5px 0 10px 0;
+}
diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html
index a88e1591c..8ad0be48c 100644
--- a/rest_framework/templates/rest_framework/base.html
+++ b/rest_framework/templates/rest_framework/base.html
@@ -22,7 +22,9 @@
 
         <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/prettify.css" %}"/>
         <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/default.css" %}"/>
-        {% if code_style %}<style>{{ code_style }}</style>{% endif %}
+        {% if code_style %}
+          <style{% if request.csp_nonce %} nonce="{{request.csp_nonce}}"{% endif %}>{{ code_style }}</style>
+        {% endif %}
       {% endblock %}
 
     {% endblock %}
@@ -158,19 +160,19 @@
               <div class="page-header">
                 <h1>{{ name }}</h1>
               </div>
-              <div style="float:left">
+              <div class="pull-left">
                 {% block description %}
                   {{ description }}
                 {% endblock %}
               </div>
 
               {% if paginator %}
-                <nav style="float: right">
+                <nav class="pull-right">
                   {% get_pagination_html paginator %}
                 </nav>
               {% endif %}
 
-              <div class="request-info" style="clear: both" aria-label="{% trans "request info" %}">
+              <div class="request-info" aria-label="{% trans "request info" %}">
                 <pre class="prettyprint"><b>{{ request.method }}</b> {{ request.get_full_path }}</pre>
               </div>
 
diff --git a/rest_framework/templates/rest_framework/pagination/numbers.html b/rest_framework/templates/rest_framework/pagination/numbers.html
index 4ff9385f6..6b2664b43 100644
--- a/rest_framework/templates/rest_framework/pagination/numbers.html
+++ b/rest_framework/templates/rest_framework/pagination/numbers.html
@@ -1,4 +1,4 @@
-<ul class="pagination" style="margin: 5px 0 10px 0">
+<ul class="pagination">
   {% if previous_url %}
     <li>
       <a href="{{ previous_url }}" aria-label="Previous">