Skip to content

Commit

Permalink
remove ember-css-modules (they don't work w embroider)
Browse files Browse the repository at this point in the history
  • Loading branch information
jaredgalanis committed Jul 8, 2024
1 parent 35114cd commit c96cfca
Show file tree
Hide file tree
Showing 21 changed files with 47 additions and 51 deletions.
2 changes: 1 addition & 1 deletion app/components/find-journal/index.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{! template-lint-disable no-action }}
<PowerSelect
@triggerClass={{if (eq @journalClass "is-invalid") (local-class "is-invalid") (local-class "is-valid")}}
@triggerClass={{if (eq @journalClass "is-invalid") "is-invalid"}}
@search={{perform this.searchJournals}}
@searchEnabled={{true}}
@selected={{@value}}
Expand Down
2 changes: 1 addition & 1 deletion app/components/grant-link-cell/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
the Grants table to display cells containing grant-related data that should
also link to the grant details page
}}
<LinkTo @route="grants.detail" @model={{@record.grant.id}} local-class="award-number">
<LinkTo @route="grants.detail" @model={{@record.grant.id}} class="award-number">
{{get @record @column.propertyName}}
</LinkTo>
2 changes: 1 addition & 1 deletion app/components/oap-compliance-cell/index.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{#if this.isStalled}}
<div class="text-center">
<p><i local-class="fa-circle" class="fas fa-circle mr-1"></i>
<p><i class="fas fa-circle mr-1"></i>
<span class="test">stalled (<a href="#">?</a>)</span></p>
</div>
{{else}}
Expand Down
8 changes: 4 additions & 4 deletions app/components/submission-repo-details/index.hbs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{{! template-lint-disable link-rel-noopener no-curly-component-invocation no-implicit-this }}
<li>
<div class="card float-left col-5 mr-3 mb-0">
<div local-class="sub-status" class="card-body">
<div local-class="card-title" class="row card-title">
<div class="card-body sub-status">
<div class="row card-title">
{{#if @repo.url}}
<a href={{@repo.url}} target="_blank">{{@repo.name}}</a>
{{else}}
Expand All @@ -16,7 +16,7 @@
<div class="col">
{{#if this.tooltip}}
<span class="{{this.status}}" tooltip-position="left" tooltip="{{this.tooltip}}">
<i local-class="deposit-status-icon" class="fas fa-info-circle"></i>
<i class="fas fa-info-circle deposit-status-icon"></i>
{{#if (eq this.status "not-submitted")}}
n&#47;a
{{else}}
Expand All @@ -25,7 +25,7 @@
</span>
{{else}}
<span class="{{this.status}}">
<i local-class="deposit-status-icon" class="fas fa-circle"></i>
<i class="fas fa-circle deposit-status-icon"></i>
{{this.status}}
</span>
{{/if}}
Expand Down
16 changes: 8 additions & 8 deletions app/components/workflow-review/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<div class="text-muted">
Please review the information below
</div>
<table local-class="review-step-table" class="table table-responsive-sm table-bordered w-100">
<table id="#review-step-table" class="table table-responsive-sm table-bordered w-100">
<tbody>
{{#if this.mustVisitWeblink}}
<ExternalRepoReview
Expand All @@ -39,7 +39,7 @@
{{/if}}

<tr>
<td local-class="max-width">
<td class="max-width">
Repositories
</td>
<td>
Expand Down Expand Up @@ -95,7 +95,7 @@
Files
</td>
<td>
<table local-class="files-table" class="w-100">
<table class="files-table w-100">
<thead>
<tr>
<th scope="col">File Type</th>
Expand All @@ -115,15 +115,15 @@
<tr>
<td data-label="icon">
{{#if (eq file.mimeType "png")}}
<i local-class="line-height-35 text-gray fa-30" class="fas fa-file-image"></i>
<i class="fas fa-file-image line-height-35 text-gray fa-30"></i>
{{else if (eq file.mimeType "vnd.openxmlformats-officedocument.presentationml.presentation")}}
<i local-class="line-height-35 text-gray fa-30" class="fas fa-file-powerpoint"></i>
<i class="fas fa-file-powerpoint line-height-35 text-gray fa-30"></i>
{{else if (eq file.mimeType "msword")}}
<i local-class="line-height-35 text-gray fa-30" class="fas fa-file-word"></i>
<i class="fas fa-file-word line-height-35 text-gray fa-30"></i>
{{else if (eq file.mimeType "pdf")}}
<i local-class="line-height-35 text-gray fa-30" class="fas fa-file-pdf"></i>
<i class="fas fa-file-pdf line-height-35 text-gray fa-30"></i>
{{else}}
<i local-class="line-height-35 text-gray fa-30" class="far fa-file"></i>
<i class="far fa-file line-height-35 text-gray fa-30"></i>
{{/if}}
</td>
<td class="workflow-review-file-name" data-label="name" data-test-workflow-review-file-name>
Expand Down
11 changes: 11 additions & 0 deletions app/styles/app.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
@import url('branding.css');
@import url('font-awesome-5-0-13.css');
@import url('workflow-wrapper.css');
@import url('workflow-review.css');
@import url('grant-link-cell.css');
@import url('workflow-files.css');
@import url('find-journal.css');
@import url('message-dialog.css');
@import url('workflow-metadata.css');
@import url('oap-compliance-cell.css');
@import url('submission-action-cell.css');
@import url('submission-repo-details.css');
@import url('workflow-basics-user-search.css');

#dashboard-container .card {
height: 100%;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@
line-height: 35px;
}

table td {
border: 1px dotted silver;
word-break: break-all;
#review-step-table {
/* stylelint-disable-next-line no-descending-specificity */
td {
border: 1px dotted silver;
word-break: break-all;
}
}

.max-width {
Expand Down
File renamed without changes.
16 changes: 8 additions & 8 deletions app/templates/not-found-error.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
</div>
<div class="col my-auto">
<h2>404: Page not found</h2>
<p local-class="helpful-text">Looks like the page you're looking for does not exist. If you think there is a problem
with the site, please
{{#if this.contactUrl}}
<a href="{{this.contactUrl}}">let us know</a>.
{{else}}
contact your administrator.
{{/if}}
</p>
<p class="helpful-text">
Looks like the page you're looking for does not exist. If you think there is a problem with the site, please
{{#if this.contactUrl}}
<a href="{{this.contactUrl}}">let us know</a>.
{{else}}
contact your administrator.
{{/if}}
</p>
</div>
</div>
16 changes: 7 additions & 9 deletions app/templates/submissions/detail.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
</i>
</p>
{{else}}
<table local-class="files-table" class="w-100">
<table class="files-table w-100">
<thead>
<tr>
<th scope="col"></th>
Expand All @@ -271,17 +271,15 @@
<tr>
<td data-label="icon">
{{#if (eq file.mimeType "png")}}
<i local-class="line-height-35 text-gray fa-30" class="fas fa-file-image"></i>
{{else if
(eq file.mimeType "vnd.openxmlformats-officedocument.presentationml.presentation")
}}
<i local-class="line-height-35 text-gray fa-30" class="fas fa-file-powerpoint"></i>
<i class="fas fa-file-image line-height-35 text-gray fa-30"></i>
{{else if (eq file.mimeType "vnd.openxmlformats-officedocument.presentationml.presentation")}}
<i class="fas fa-file-powerpoint line-height-35 text-gray fa-30"></i>
{{else if (eq file.mimeType "msword")}}
<i local-class="line-height-35 text-gray fa-30" class="fas fa-file-word"></i>
<i class="fas fa-file-word line-height-35 text-gray fa-30"></i>
{{else if (eq file.mimeType "pdf")}}
<i local-class="line-height-35 text-gray fa-30" class="fas fa-file-pdf"></i>
<i class="fas fa-file-pdf line-height-35 text-gray fa-30"></i>
{{else}}
<i local-class="line-height-35 text-gray fa-30" class="far fa-file"></i>
<i class="far fa-file line-height-35 text-gray fa-30"></i>
{{/if}}
</td>
<td id="submissions-detail-file-cell" data-label="name">
Expand Down
15 changes: 0 additions & 15 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
const EmberApp = require('ember-cli/lib/broccoli/ember-app');
const stringHash = require('string-hash');

const disableCssModules = ['/pass-ui/styles/app.css', '/pass-ui/styles/font-awesome-5-0-13.css'];

module.exports = function (defaults) {
let app = new EmberApp(defaults, {
// Add options here
Expand All @@ -30,19 +28,6 @@ module.exports = function (defaults) {
},
},

cssModules: {
generateScopedName(className, modulePath) {
if (!disableCssModules.includes(modulePath)) {
let hash = stringHash(modulePath).toString(36).substring(0, 6);
let scopedName = `_${className}_${hash}`;

return scopedName;
}

return className;
},
},

fingerprint: {
enabled: false,
},
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@
"ember-composable-helpers": "^5.0.0",
"ember-concurrency": "^2.3.4",
"ember-concurrency-decorators": "^1.0.0",
"ember-css-modules": "^2.0.1",
"ember-data": "~5.3.3",
"ember-file-upload": "^7.3.0",
"ember-inflector": "^4.0.2",
Expand Down

0 comments on commit c96cfca

Please sign in to comment.