From 952d974fb6f39ff910805772adef2d22032eb5eb Mon Sep 17 00:00:00 2001 From: Calvin Ho <18680207+calvh@users.noreply.github.com> Date: Wed, 12 May 2021 21:54:48 -0400 Subject: [PATCH 1/4] WEB: Remove row div from maintainers (GH41438) --- web/pandas/about/team.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/web/pandas/about/team.md b/web/pandas/about/team.md index 39f63202e1986..7d2a65d22905f 100644 --- a/web/pandas/about/team.md +++ b/web/pandas/about/team.md @@ -8,9 +8,8 @@ If you want to support pandas development, you can find information in the [dona ## Maintainers -
+
{% for row in maintainers.people | batch(6, "") %} -
{% for person in row %} {% if person %}
@@ -32,7 +31,6 @@ If you want to support pandas development, you can find information in the [dona
{% endif %} {% endfor %} -
{% endfor %}
From bb6308d47589d45b1ebe19d21f6cb0a21b4e63e6 Mon Sep 17 00:00:00 2001 From: Calvin Ho <18680207+calvh@users.noreply.github.com> Date: Thu, 13 May 2021 15:39:36 -0400 Subject: [PATCH 2/4] WEB: Fix maintainers grid display issue (GH41438) Overwrites previous commit Uses a single card-group container Uses CSS to fix width issues --- web/pandas/about/team.md | 42 +++++++++++++++----------------- web/pandas/static/css/pandas.css | 6 +++++ 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/web/pandas/about/team.md b/web/pandas/about/team.md index 7d2a65d22905f..4f553d31800a0 100644 --- a/web/pandas/about/team.md +++ b/web/pandas/about/team.md @@ -9,28 +9,26 @@ If you want to support pandas development, you can find information in the [dona ## Maintainers
- {% for row in maintainers.people | batch(6, "") %} - {% for person in row %} - {% if person %} -
- -
-
- {% if person.blog %} - - {{ person.name or person.login }} - - {% else %} - {{ person.name or person.login }} - {% endif %} -
-

{{ person.login }}

-
-
- {% else %} -
- {% endif %} - {% endfor %} + {% for person in maintainers.people %} + {% if person %} +
+ +
+
+ {% if person.blog %} + + {{ person.name or person.login }} + + {% else %} + {{ person.name or person.login }} + {% endif %} +
+

{{ person.login }}

+
+
+ {% else %} +
+ {% endif %} {% endfor %}
diff --git a/web/pandas/static/css/pandas.css b/web/pandas/static/css/pandas.css index d76d1a0befeba..12e73ace38514 100644 --- a/web/pandas/static/css/pandas.css +++ b/web/pandas/static/css/pandas.css @@ -45,6 +45,12 @@ a.navbar-brand img { div.card { margin: 0 0 .2em .2em !important; } +@media (min-width: 576px) { + div.card { + min-width: 10rem; + max-width: 10rem; + } +} div.card .card-title { font-weight: 500; color: #130654; From dd3859c9728d083bf347e139267ff220e7867ede Mon Sep 17 00:00:00 2001 From: Calvin Ho <18680207+calvh@users.noreply.github.com> Date: Thu, 13 May 2021 20:07:02 -0400 Subject: [PATCH 3/4] WEB: Remove if-else block in template (GH41438) --- web/pandas/about/team.md | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/web/pandas/about/team.md b/web/pandas/about/team.md index 4f553d31800a0..c8318dd8758ed 100644 --- a/web/pandas/about/team.md +++ b/web/pandas/about/team.md @@ -10,25 +10,21 @@ If you want to support pandas development, you can find information in the [dona
{% for person in maintainers.people %} - {% if person %} -
- -
-
- {% if person.blog %} - - {{ person.name or person.login }} - - {% else %} +
+ + + + {% else %} + {{ person.name or person.login }} + {% endif %} +
+

{{ person.login }}

- {% else %} -
- {% endif %} +
{% endfor %}
From 2c0efc0d9edce06fe801e42a6821820913dbf0e0 Mon Sep 17 00:00:00 2001 From: Calvin Ho <18680207+calvh@users.noreply.github.com> Date: Fri, 14 May 2021 13:04:58 -0400 Subject: [PATCH 4/4] WEB: Add CSS selector to width rule (GH41438) Add .card-group.maintainers to limit rule to team page --- web/pandas/static/css/pandas.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/pandas/static/css/pandas.css b/web/pandas/static/css/pandas.css index 12e73ace38514..459f006db5727 100644 --- a/web/pandas/static/css/pandas.css +++ b/web/pandas/static/css/pandas.css @@ -46,7 +46,7 @@ div.card { margin: 0 0 .2em .2em !important; } @media (min-width: 576px) { - div.card { + .card-group.maintainers div.card { min-width: 10rem; max-width: 10rem; }