-
+
{% call form_wrapper(action=action) %}
{{ form.hidden_tag() }}
diff --git a/tailwind.config.js b/tailwind.config.js
index 4ace33b4ed..fe422e7eab 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -104,12 +104,15 @@ module.exports = {
transparent: "transparent",
current: "currentColor",
red: {
- DEFAULT: "#b10e1e",
- hover: "#990c1a",
- border: "#6a0812",
- mellow: "#df3034",
- light: "#fef6f6",
- 300: "#D74D42",
+ DEFAULT: "#9F331A",
+ hover: "#471A0A",
+ border: "#9F331A",
+ mellow: "#D74224",
+ 100: "#FFC6C3",
+ 300: "#FB6252",
+ 500: "#D74224",
+ 700: "#9F331A",
+ 900: "#471A0A",
},
white: "#FFF",
blue: {
@@ -250,6 +253,7 @@ module.exports = {
minHeight: {
12: "1.875rem",
target: "45px",
+ emptyState: "190px",
},
minWidth: {
target: "45px",
diff --git a/tests/app/main/views/test_platform_admin.py b/tests/app/main/views/test_platform_admin.py
index d80ad1d81e..5e0eb5c6ea 100644
--- a/tests/app/main/views/test_platform_admin.py
+++ b/tests/app/main/views/test_platform_admin.py
@@ -93,9 +93,9 @@ def test_should_show_research_and_restricted_mode(
assert response.status_code == 200
mock_get_detailed_services.assert_called_once_with({"detailed": True, "include_from_test_key": True, "only_active": False})
page = BeautifulSoup(response.data.decode("utf-8"), "html.parser")
- # get first column in second row, which contains flags as text.
+ # get first column in first row, which contains service name and flags as a span in a single th.
table_body = page.find_all("table")[0].find_all("tbody")[0]
- service_mode = table_body.find_all("tbody")[0].find_all("tr")[1].find_all("td")[0].text.strip()
+ service_mode = table_body.find_all("tbody")[0].find_all("tr")[0].find_all("th")[0].find_all("span")[0].text.strip()
assert service_mode == displayed
@@ -503,9 +503,9 @@ def test_should_show_archived_services_last(
table_body = page.find_all("table")[0].find_all("tbody")[0]
services = [service.tr for service in table_body.find_all("tbody")]
assert len(services) == 3
- assert services[0].td.text.strip() == "A"
- assert services[1].td.text.strip() == "B"
- assert services[2].td.text.strip() == "C"
+ assert services[0].th.a.text.strip() == "A"
+ assert services[1].th.a.text.strip() == "B"
+ assert services[2].th.a.text.strip() == "C"
@pytest.mark.parametrize("research_mode", (True, False))
@@ -524,8 +524,8 @@ def test_shows_archived_label_instead_of_live_or_research_mode_label(
page = BeautifulSoup(response.data.decode("utf-8"), "html.parser")
table_body = page.find_all("table")[0].find_all("tbody")[0]
- service_mode = table_body.find_all("tbody")[0].find_all("tr")[1].td.text.strip()
- # get second column, which contains flags as text.
+ # get first column as table header, which contains flags as span.
+ service_mode = table_body.find_all("tbody")[0].find_all("tr")[0].th.span.text.strip()
assert service_mode == "archived"
@@ -602,9 +602,9 @@ def test_should_order_services_by_usage_with_inactive_last(
table_body = page.find_all("table")[0].find_all("tbody")[0]
services = [service.tr for service in table_body.find_all("tbody")]
assert len(services) == 3
- assert services[0].td.text.strip() == "My Service 2"
- assert services[1].td.text.strip() == "My Service 1"
- assert services[2].td.text.strip() == "My Service 3"
+ assert services[0].th.a.text.strip() == "My Service 2"
+ assert services[1].th.a.text.strip() == "My Service 1"
+ assert services[2].th.a.text.strip() == "My Service 3"
def test_sum_service_usage_is_sum_of_all_activity(fake_uuid):