diff --git a/AUTHORS b/AUTHORS index 4f7ef379f6..80119cc990 100644 --- a/AUTHORS +++ b/AUTHORS @@ -314,6 +314,7 @@ answer newbie questions, and generally made Django that much better: Helen Sherwood-Taylor Henrique Romano Henry Dang + Himanshu Chauhan hipertracker@gmail.com Hiroki Kiyohara Honza Král diff --git a/django/views/templates/default_urlconf.html b/django/views/templates/default_urlconf.html index 269e396429..3bfa6a1e0e 100644 --- a/django/views/templates/default_urlconf.html +++ b/django/views/templates/default_urlconf.html @@ -224,9 +224,8 @@ color: #747755; } footer { - padding: 30px 0; + padding: 25px 0; position: fixed; - height: 30px; left: 50%; bottom: 0; width: 960px; @@ -237,21 +236,10 @@ border-top: 1px solid #efefef; } .option { - position: absolute; - width: 260px; - top: 25px; - } - .one { - left: 0px; - } - .two { - left: 50%; - margin-left: 5px; - -webkit-transform: translateX(-50%); - transform: translateX(-50%); - } - .three { - right: 0px; + float: left; + width: 33.33%; + box-sizing: border-box; + padding-right: 5px; } .option svg { width: 25px; @@ -263,6 +251,9 @@ float: left; margin-right: 10px; } + .option div { + display: table; + } .option h4 { color: #19865C; font-size: 19px; @@ -280,9 +271,6 @@ .logo h2 { margin-left: 0px; } - .two { - margin-left: 5px; - } } @media (max-width: 800px) { footer, main { @@ -297,6 +285,8 @@ left: auto; right: auto; top: auto; + padding: 0 25px; + margin-bottom: 60px; } .two { margin-left: 0px; @@ -327,11 +317,6 @@ width: 100%; margin-top: 50px; } - .option { - padding: 0 25px; - width: 100%; - margin-bottom: 60px; - } } @media (min-width: 801px) and (max-height: 730px) { .figure { @@ -394,8 +379,10 @@ -

{% trans "Django Documentation" %}

-

{% trans "Topics, references, & how-to's" %}

+
+

{% trans "Django Documentation" %}

+

{% trans "Topics, references, & how-to's" %}

+
@@ -404,8 +391,10 @@ -

{% trans "Tutorial: A Polling App" %}

-

{% trans "Get started with Django" %}

+
+

{% trans "Tutorial: A Polling App" %}

+

{% trans "Get started with Django" %}

+
@@ -414,8 +403,10 @@ -

{% trans "Django Community" %}

-

{% trans "Connect, get help, or contribute" %}

+
+

{% trans "Django Community" %}

+

{% trans "Connect, get help, or contribute" %}

+
diff --git a/docs/releases/2.0.2.txt b/docs/releases/2.0.2.txt index 219784251b..4f0878c8d0 100644 --- a/docs/releases/2.0.2.txt +++ b/docs/releases/2.0.2.txt @@ -9,4 +9,5 @@ Django 2.0.2 fixes several bugs in 2.0.1. Bugfixes ======== -* ... +* Fixed hidden content at the bottom of the "The install worked successfully!" + page for some languages (:ticket:`28885`).