darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-06 07:18:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

merge from main

Browse Source
This commit is contained in:
Kenneth Kehl
2024-03-25 11:45:19 -07:00
parent 404ef2c3c3 db5c259818
commit cf56ec4263
2 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/assets/sass/uswds/_uswds-theme-custom-styles.scss
View File

@@ -168,26 +168,33 @@ td.table-empty-message {
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
padding: 1rem; padding: 1rem;
.user-list-item { }
@include at-media(desktop) {
width: calc(50% - units(1)); .user-list-item {
margin-bottom: 1rem; @include at-media(desktop) {
box-sizing: border-box; width: calc(50% - units(1));
} margin-bottom: 1rem;
// flex: 1 1 calc(100% - units(2)); box-sizing: border-box;
border: 1px solid color('gray-cool-10');
padding: units(2);
.tick-cross-list-permissions {
margin: units(1) 0;
padding-left: units(2);
}
.hint {
display: block;
font-size: size("body", "sm");
font-weight: normal;
}
} }
} .user-list-item-heading .live-search-relevant {
display: block;
word-wrap: break-word;
}
border: 1px solid color('gray-cool-10');
padding: units(2);
.tick-cross-list-permissions {
margin: units(1) 0;
padding-left: units(2);
}
.hint {
display: block;
font-size: size("body", "sm");
font-weight: normal;
}
}
.template-list-item-without-ancestors .template-list-folder:active, .template-list-item-without-ancestors .template-list-folder:active,
.template-list-item-without-ancestors .template-list-folder:active::before, .template-list-item-without-ancestors .template-list-folder:active::before,

6
tests/end_to_end/conftest.py
View File

@@ -68,7 +68,7 @@ def login_for_end_to_end_testing(browser):
context.storage_state(path=auth_state_path) context.storage_state(path=auth_state_path)
@pytest.fixture(scope="session") @pytest.fixture()
def end_to_end_authenticated_context(browser): def end_to_end_authenticated_context(browser):
# Create and load a previously authenticated context for Playwright E2E # Create and load a previously authenticated context for Playwright E2E
# tests. # tests.
@@ -82,13 +82,13 @@ def end_to_end_authenticated_context(browser):
return context return context
@pytest.fixture(scope="session") @pytest.fixture()
def end_to_end_context(browser): def end_to_end_context(browser):
context = browser.new_context() context = browser.new_context()
return context return context
@pytest.fixture(scope="session") @pytest.fixture()
def authenticated_page(end_to_end_context): def authenticated_page(end_to_end_context):
# Open a new page and go to the site. # Open a new page and go to the site.
page = end_to_end_context.new_page() page = end_to_end_context.new_page()