Skip to content

Commit

Permalink
Fix CodeScan and Accessibility CI errors
Browse files Browse the repository at this point in the history
  • Loading branch information
brianzelip committed May 9, 2024
1 parent a50b289 commit 3ef0292
Show file tree
Hide file tree
Showing 14 changed files with 24 additions and 335 deletions.
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*.yml
*.yaml
*.json
frontend/app/assets/javascripts/twitter/
frontend/app/assets/stylesheets/vendor/
frontend/vendor/
public/app/assets/javascripts/bootstrap-accessibility/
public/vendor/assets/javascripts/
4 changes: 2 additions & 2 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
frontend/app/assets/stylesheets/bootstrap
frontend/app/assets/stylesheets/vendor
frontend/vendor/
public/app/assets/stylesheets/foundation
public/vendor/
public/vendor/
4 changes: 2 additions & 2 deletions frontend/app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import 'archivesspace/variables';
@import 'bootstrap';
@import 'bootstrap-overrides';
@import 'fontawesome';
@import 'codemirror';
@import 'vendor/fontawesome.scss';
@import 'vendor/codemirror.css';
@import 'archivesspace';
9 changes: 0 additions & 9 deletions frontend/app/assets/stylesheets/archivesspace.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,5 @@
@import 'archivesspace/merge_selector';
@import 'archivesspace/custom_reports';
@import 'archivesspace/datepicker';

// @import 'datepicker3';
// @import 'combobox';
// @import 'codemirror/codemirror';
// @import 'codemirror/util/simple-hint';
// @import 'css-spinners/spinner';
@import 'themes/default/default';
// @import 'bootstrap-select/bootstrap-select';
// @import 'tablesorter/bootstrap';

@import 'archivesspace/print';
2 changes: 1 addition & 1 deletion frontend/app/assets/stylesheets/archivesspace/buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
.unsuppress-record.disabled,
.delete-record.disabled,
.btn-danger.disabled,
.btn-danger[disabled="disabled"],
.btn-danger[disabled='disabled'],
[data-allow-disabled] .btn.disabled {
color: #000;
background-color: #aaa;
Expand Down
4 changes: 2 additions & 2 deletions frontend/app/assets/stylesheets/archivesspace/common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ td .btn-group {
border-color: $gray-600;
}

.bg-asFormHeadingBg{
.bg-asFormHeadingBg {
background-color: $asFormHeadingBg;
@include vertical(#f3f3f3, #ededed);
}
Expand All @@ -261,7 +261,7 @@ td .btn-group {
}

.hover-bsCoolGray:hover {
background-color: $bsCoolGray
background-color: $bsCoolGray;
}

.hover-bg-dark:hover {
Expand Down
12 changes: 6 additions & 6 deletions frontend/app/assets/stylesheets/archivesspace/form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -380,8 +380,8 @@ ul.subrecord-form-list {
}
.drag-handle {
position: absolute;
left: .5rem;
top: .5rem;
left: 0.5rem;
top: 0.5rem;
display: flex;
align-items: start;
cursor: move;
Expand Down Expand Up @@ -474,7 +474,7 @@ ul.subrecord-form-list {
// #font {
// @include shorthand($baseFontSize,normal,$baseLineHeight);
// }
position:relative;
position: relative;
margin-bottom: 9px;
font-size: $baseFontSize;
line-height: $baseLineHeight;
Expand All @@ -491,7 +491,7 @@ ul.subrecord-form-list {
height: 100px;
overflow: auto;
}

.mixed-content-wrapper {
font-size: 0.9em;
z-index: 10;
Expand Down Expand Up @@ -525,7 +525,7 @@ ul.subrecord-form-list {
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-size: 14px;
font-weight: normal;
line-height: 1.42857143;
line-height: 1.4286;
text-align: left;
background-color: #fff;
background-clip: padding-box;
Expand Down Expand Up @@ -639,7 +639,7 @@ ul.subrecord-form-list {

.content-list {
.drag-handle.inline {
top: .5rem !important;
top: 0.5rem !important;
}

.add-content-item-btn {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@
}
tr {
&.has-space:nth-of-type(odd) {
background-color: rgba(57, 132, 57, .2);
background-color: rgba(57, 132, 57, 0.2);
&:hover {
background-color: rgba(57, 132, 57, .4);
background-color: rgba(57, 132, 57, 0.4);
}
}
&.no-space:nth-of-type(odd) {
background-color: rgba(255, 196, 13, .2);
background-color: rgba(255, 196, 13, 0.2);
&:hover {
background-color: rgba(255, 196, 13, .4);
background-color: rgba(255, 196, 13, 0.4);
}
}
&.errored:nth-of-type(odd) {
background-color: rgba(157, 38, 29, .2);
background-color: rgba(157, 38, 29, 0.2);
&:hover {
background-color: rgba(157, 38, 29, .4);
background-color: rgba(157, 38, 29, 0.4);
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions frontend/app/assets/stylesheets/archivesspace/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ $purple: #7a43b6;
// override bootstrap for accessibility
$info: #60c2ef;

/* Can't take it anymore
so am forking the incumbent approach for sanity and expediency */
:root {
--bs-text-body: #212529;
}
2 changes: 1 addition & 1 deletion frontend/app/assets/stylesheets/bootstrap-overrides.scss
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ body {

.dropdown-item {
color: #212529;

&:hover,
&.focus {
color: #212529;
Expand Down
Loading

0 comments on commit 3ef0292

Please sign in to comment.