Skip to content

Commit 974c458

Browse files
JacobCoffeeJacobCoffee
authored
Merge branch 'main' into surrogate-key-for-rleeases
2 parents 58c64ae + a51785f commit 974c458

8 files changed

Lines changed: 49 additions & 27 deletions

File tree

‎base-requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ requests>=2.26.0
3636
django-honeypot==1.0.4 # 1.0.4 is first version that supports Django 4.2
3737
django-markupfield==2.0.1
3838

39-
django-allauth==64.2.1
39+
django-allauth==65.13.0
4040

4141
django-waffle==2.2.1
4242

‎static/sass/_base.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ $darkerblue: #1e2933;
8585
$link-color: $blue;
8686
$link-hover: $darkerblue;
8787

88-
$code-green: #11a611;
88+
$code-green: #0d870d;
8989
$default-border-color: $grey-lighter; /* Set a generic border color here to keep them consistent */
9090

9191

‎static/sass/mq.css‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1651,24 +1651,24 @@ html[xmlns] .slides { display: block; }
16511651
padding-top: 1em; }
16521652

16531653
.about-banner {
1654-
background: 120% 0 no-repeat url('../img/landing-about.png?1646853871') transparent;
1654+
background: 120% 0 no-repeat url('../img/landing-about.png?1767349471') transparent;
16551655
min-height: 345px;
16561656
padding-bottom: 3.5em;
16571657
margin-bottom: -2.5em; }
16581658

16591659
.download-for-current-os {
1660-
background: 130% 0 no-repeat url('../img/landing-downloads.png?1646853871') transparent;
1660+
background: 130% 0 no-repeat url('../img/landing-downloads.png?1767349471') transparent;
16611661
min-height: 345px;
16621662
padding-bottom: 4em;
16631663
margin-bottom: -3em; }
16641664

16651665
.documentation-banner {
1666-
background: 130% 0 no-repeat url('../img/landing-docs.png?1646853871') transparent;
1666+
background: 130% 0 no-repeat url('../img/landing-docs.png?1767349471') transparent;
16671667
padding-bottom: 1em; }
16681668

16691669
.community-banner {
16701670
text-align: left;
1671-
background: 110% 0 no-repeat url('../img/landing-community.png?1646853871') transparent;
1671+
background: 110% 0 no-repeat url('../img/landing-community.png?1767349471') transparent;
16721672
min-height: 345px;
16731673
padding-bottom: 2em;
16741674
margin-bottom: -1.25em; }
@@ -1772,7 +1772,7 @@ html[xmlns] .slides { display: block; }
17721772
right: 1em;
17731773
width: 210px;
17741774
height: 210px;
1775-
background: top left no-repeat url('../img/python-logo-large.png?1646853871') transparent; }
1775+
background: top left no-repeat url('../img/python-logo-large.png?1767349471') transparent; }
17761776
.psf-widget .widget-title, .psf-widget p, .python-needs-you-widget .widget-title, .python-needs-you-widget p {
17771777
margin-right: 34.04255%; }
17781778

‎static/sass/no-mq.css‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1359,24 +1359,24 @@ a.button {
13591359
padding-top: 1em; }
13601360

13611361
.about-banner {
1362-
background: 120% 0 no-repeat url('../img/landing-about.png?1646853871') transparent;
1362+
background: 120% 0 no-repeat url('../img/landing-about.png?1767349471') transparent;
13631363
min-height: 345px;
13641364
padding-bottom: 3.5em;
13651365
margin-bottom: -2.5em; }
13661366

13671367
.download-for-current-os {
1368-
background: 130% 0 no-repeat url('../img/landing-downloads.png?1646853871') transparent;
1368+
background: 130% 0 no-repeat url('../img/landing-downloads.png?1767349471') transparent;
13691369
min-height: 345px;
13701370
padding-bottom: 4em;
13711371
margin-bottom: -3em; }
13721372

13731373
.documentation-banner {
1374-
background: 130% 0 no-repeat url('../img/landing-docs.png?1646853871') transparent;
1374+
background: 130% 0 no-repeat url('../img/landing-docs.png?1767349471') transparent;
13751375
padding-bottom: 1em; }
13761376

13771377
.community-banner {
13781378
text-align: left;
1379-
background: 110% 0 no-repeat url('../img/landing-community.png?1646853871') transparent;
1379+
background: 110% 0 no-repeat url('../img/landing-community.png?1767349471') transparent;
13801380
min-height: 345px;
13811381
padding-bottom: 2em;
13821382
margin-bottom: -1.25em; }
@@ -1480,7 +1480,7 @@ a.button {
14801480
right: 1em;
14811481
width: 210px;
14821482
height: 210px;
1483-
background: top left no-repeat url('../img/python-logo-large.png?1646853871') transparent; }
1483+
background: top left no-repeat url('../img/python-logo-large.png?1767349471') transparent; }
14841484
.psf-widget .widget-title, .psf-widget p, .python-needs-you-widget .widget-title, .python-needs-you-widget p {
14851485
margin-right: 34.04255%; }
14861486

‎static/sass/style.css‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ pre {
603603
/* IE 5.5+ and up */ }
604604

605605
code {
606-
color: #11a611; }
606+
color: #0d870d; }
607607

608608
var {
609609
font-style: italic; }
@@ -724,6 +724,9 @@ a, a:active, a:visited, a:hover, a:visited:hover {
724724
color: #3776ab;
725725
text-decoration: none; }
726726

727+
table tr td a, table tr td a:active, table tr td a:visited, table tr td a:hover, table tr td a:visited:hover {
728+
color: #3571a3; }
729+
727730
a:hover, a:focus {
728731
color: #1e2933; }
729732

@@ -1619,7 +1622,7 @@ input#s,
16191622
padding: 1.25em 1.5em; }
16201623
.slide-code code {
16211624
display: inline-block;
1622-
color: #11a611; }
1625+
color: #0d870d; }
16231626
.slide-code code .comment {
16241627
color: #666666; }
16251628
.slide-code code .output {
@@ -1932,8 +1935,7 @@ input#s,
19321935
background-color: #e6e8ea;
19331936
padding: .125em .375em 0;
19341937
margin: 0 .25em; }
1935-
.text code, .text kbd,
1936-
.sidebar-widget code,
1938+
.text kbd,
19371939
.sidebar-widget kbd {
19381940
padding: .125em .375em 0;
19391941
margin: 0 -.0625em;
@@ -1950,7 +1952,7 @@ input#s,
19501952
.text pre,
19511953
.sidebar-widget pre {
19521954
padding: .5em;
1953-
border-left: 5px solid #11a611;
1955+
border-left: 5px solid #0d870d;
19541956
background: #e6e8ea;
19551957
-webkit-box-shadow: 0 0 0.5em rgba(0, 0, 0, 0.1) inset;
19561958
-moz-box-shadow: 0 0 0.5em rgba(0, 0, 0, 0.1) inset;
@@ -2266,7 +2268,7 @@ table tfoot {
22662268
/* ! ===== Success Stories landing page ===== */
22672269
.featured-success-story {
22682270
padding: 1.3125em 0;
2269-
background: center -230px no-repeat url('../img/success-glow2.png?1646853871') transparent;
2271+
background: center -230px no-repeat url('../img/success-glow2.png?1767349471') transparent;
22702272
/*blockquote*/ }
22712273
.featured-success-story img {
22722274
padding: 10px 30px; }
@@ -2587,6 +2589,13 @@ p.quote-by-organization {
25872589
font-size: 0.875em; }
25882590
.active-release-list-widget .list-row-container {
25892591
margin-bottom: .5em; }
2592+
.active-release-list-widget .release-cycle-chart img {
2593+
display: block;
2594+
margin: 0 auto;
2595+
width: 80%; }
2596+
@media screen and (max-width: 860px) {
2597+
.active-release-list-widget .release-cycle-chart img {
2598+
width: 100%; } }
25902599

25912600
.download-list-widget {
25922601
/*modernizr*/ }
@@ -3276,11 +3285,11 @@ span.highlighted {
32763285
.python .site-headline a:before {
32773286
width: 290px;
32783287
height: 82px;
3279-
content: url('../img/python-logo_print.png?1646853871'); }
3288+
content: url('../img/python-logo_print.png?1767349471'); }
32803289
.psf .site-headline a:before {
32813290
width: 334px;
32823291
height: 82px;
3283-
content: url('../img/psf-logo_print.png?1646853871'); } }
3292+
content: url('../img/psf-logo_print.png?1767349471'); } }
32843293
/*
32853294
* When we want to review the markup for W3 and similar errors, turn some of these on
32863295
* Uses :not selectors a bunch, so only modern browsers will support them

‎static/sass/style.scss‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@ a, a:active, a:visited, a:hover, a:visited:hover {
6666
text-decoration: none;
6767
}
6868

69+
table tr td {
70+
a, a:active, a:visited, a:hover, a:visited:hover {
71+
color: darken($link-color, 2%);
72+
}
73+
}
74+
6975
a:hover, a:focus { color: $link-hover; }
7076

7177
/*modernizr*/ .touch a[href^="tel:"] { border-bottom: 1px dotted $default-color; }
@@ -953,7 +959,7 @@ $show-baseline-grid-backgrounds: false;
953959
margin: 0 .25em;
954960
}
955961

956-
code, kbd {
962+
kbd {
957963
padding: .125em .375em 0;
958964
margin: 0 -.0625em;
959965
background: $grey-lightest;
@@ -1690,6 +1696,14 @@ $colors: $blue, $psf, $yellow, $green, $purple, $red;
16901696

16911697
.list-row-container { margin-bottom: .5em; }
16921698

1699+
.release-cycle-chart img {
1700+
display: block;
1701+
margin: 0 auto;
1702+
width: 80%;
1703+
@media screen and (max-width: 860px) {
1704+
width: 100%;
1705+
}
1706+
}
16931707
}
16941708

16951709
.download-list-widget {

‎templates/base.html‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@
3434
crossorigin="anonymous"
3535
></script>
3636
<script src="{{ STATIC_URL }}js/libs/modernizr.js"></script>
37-
<script async
38-
src="https://donate.python.org/fundraiser-banner/fundraiser-banner.js"></script>
39-
4037

4138
{% stylesheet 'style' %}
4239
{% stylesheet 'mq' %}

‎templates/downloads/index.html‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ <h1 class="call-to-action">Download the latest version of Python</h1>
5353
<h2 class="widget-title">Active Python releases</h2>
5454
<p class="success-quote"><a href="https://devguide.python.org/versions/#versions">For more information visit the Python Developer's Guide</a>.</p>
5555

56+
<p class="release-cycle-chart"><img src="https://devguide.python.org/_static/release-cycle.svg" alt="Python release cycle"></p>
57+
5658
{% box 'downloads-active-releases' %}
5759
</div>
5860

@@ -89,9 +91,9 @@ <h2 class="widget-title">Looking for a specific release?</h2>
8991
</div>
9092
</div>
9193

92-
<div class="row">
94+
<div class="row">
9395

94-
<div class="small-widget download-widget1">
96+
<div class="small-widget download-widget1">
9597
{% box 'download-widget1' %}
9698

9799
</div>
@@ -101,7 +103,7 @@ <h2 class="widget-title">Looking for a specific release?</h2>
101103

102104
</div>
103105

104-
<div class="small-widget download-widget3">
106+
<div class="small-widget download-widget3">
105107
{% box 'download-widget3' %}
106108

107109
</div>

0 commit comments

Comments
 (0)