diff --git a/_static/devguide_overrides.css b/_static/devguide_overrides.css index 2661c6810..625a9dda2 100644 --- a/_static/devguide_overrides.css +++ b/_static/devguide_overrides.css @@ -6,34 +6,6 @@ height: 110px; } -/* Release cycle chart */ -.release-cycle-chart .release-cycle-year-line { - stroke: var(--color-foreground-primary); -} - -.release-cycle-chart .release-cycle-year-text { - fill: var(--color-foreground-primary); -} - -.release-cycle-chart .release-cycle-today-line { - stroke: var(--color-brand-primary); -} - -.release-cycle-chart .release-cycle-row-shade { - fill: var(--color-background-item); -} - -.release-cycle-chart .release-cycle-version-label { - fill: var(--color-foreground-primary); -} - -.release-cycle-chart .release-cycle-blob-label.release-cycle-status-end-of-life, -.release-cycle-chart .release-cycle-blob-label.release-cycle-status-prerelease, -.release-cycle-chart .release-cycle-blob-label.release-cycle-status-feature { - /* and FG when it's not in a blob */ - fill: var(--color-foreground-primary); -} - .good pre { border-left: 3px solid rgba(74, 182, 93, 1); } diff --git a/_tools/release_cycle_template.svg.jinja b/_tools/release_cycle_template.svg.jinja index 702a8cf18..9f23814a9 100644 --- a/_tools/release_cycle_template.svg.jinja +++ b/_tools/release_cycle_template.svg.jinja @@ -7,93 +7,99 @@ @@ -103,9 +109,16 @@ + + {% for version in versions %} {% set y = version.y * line_height %} - {% if version.y % 2 %} {% for version in versions %} - + {% set top_y = version.y * line_height - 1 * SCALE %} {% set height = 1.25 * SCALE %} @@ -174,8 +187,6 @@ {% set end_x = date_to_x(version.end_of_life_date) %} {% set radius = 0.25 * SCALE %} - {% set small_text_y = version.y * line_height - 0.1 * SCALE %} - + + + {% for version in versions %} + + + {% set start_x = date_to_x(version.first_release_date) %} + {% set end_x = date_to_x(version.end_of_life_date) %} + {% set middle_x = ([end_x, date_to_x(version.start_security_date)]|min) %} + {% set small_text_y = version.y * line_height - 0.1 * SCALE %} - - {{ version.status }} - + {% for cls in ('text-outline', 'text-main') %} + + {{ version.status }} + + {% endfor %} {% endfor %} - - -