darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-25 10:29:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/GSA/notifications-admin into 533-adjust-uswds-styles

Browse Source 
# Conflicts:
#	app/assets/javascripts/templateFolderForm.js
#	app/assets/sass/uswds/_uswds-theme-custom-styles.scss
This commit is contained in:
Jonathan Bobel
2023-06-19 10:47:56 -04:00
parent f266084ddb f81401d167
commit 6300a5fcc6
4 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/templateFolderForm.js
View File

@@ -82,7 +82,7 @@
this.render();
}
this.$form.on('click', 'button.usa-button', (event) => this.actionButtonClicked(event));
this.$form.on('click', 'button.usa-button--event', (event) => this.actionButtonClicked(event));
this.$form.on('change', 'input[type=checkbox]', () => this.templateFolderCheckboxChanged());
};
@@ -149,7 +149,7 @@
this.makeButton = (text, opts) => {
let $btn = $('<a href=""></a>')
.html(text)
.addClass('usa-link font-body-sm margin-left-1 js-cancel')
.addClass('usa-link js-cancel')
// isn't set if cancelSelector is undefined
.data('target', opts.cancelSelector || undefined)
.attr('tabindex', '0')
@@ -299,10 +299,10 @@
this.nothingSelectedButtons = $(`
<div id="nothing_selected">
<div class="js-stick-at-bottom-when-scrolling">
<button class="usa-button" value="add-new-template" aria-expanded="false">
<button class="usa-button usa-button--event" value="add-new-template" aria-expanded="false">
New template
</button>
<button class="usa-button" value="add-new-folder" aria-expanded="false">New folder</button>
<button class="usa-button usa-button--event" value="add-new-folder" aria-expanded="false">New folder</button>
<div class="template-list-selected-counter">
<span class="template-list-selected-counter__count" aria-hidden="true">
${this.selectionStatus.default}
@@ -315,10 +315,10 @@
this.itemsSelectedButtons = $(`
<div id="items_selected">
<div class="js-stick-at-bottom-when-scrolling">
<button class="usa-button" value="move-to-existing-folder" aria-expanded="false">
<button class="usa-button usa-button--event" value="move-to-existing-folder" aria-expanded="false">
Move<span class="usa-sr-only"> selection to folder</span>
</button>
<button class="usa-button" value="move-to-new-folder" aria-expanded="false">Add to new folder</button>
<button class="usa-button usa-button--event" value="move-to-new-folder" aria-expanded="false">Add to new folder</button>
<div class="template-list-selected-counter" aria-hidden="true">
<span class="template-list-selected-counter__count" aria-hidden="true">
${this.selectionStatus.selected(1)}

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

@@ -143,3 +143,30 @@ td.table-empty-message {
box-shadow: none;
border: 0;
}
.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:focus,
.template-list-item-without-ancestors .template-list-folder:focus::before,
.template-list-item-without-ancestors .template-list-template:active,
.template-list-item-without-ancestors .template-list-template:active::before,
.template-list-item-without-ancestors .template-list-template:focus,
.template-list-item-without-ancestors .template-list-template:focus::before {
background-color: transparent;
box-shadow: none;
}
.folder-heading a.folder-heading-folder,
.folder-heading-folder,
.template-list-folder {
background-image: none;
padding-left: 0;
text-indent: 0;
&:hover {
color: color("blue-warm-70v");
}
}
.template-list-item-without-ancestors a.template-list-folder:first-of-type {
text-indent: 0;
}