Skip to content

Commit

Permalink
Merge pull request CenterForOpenScience#681 from baylee-d/fix/ENG-93-…
Browse files Browse the repository at this point in the history
…support-section

[ENG-93] Fix images and add svg extension to broccoli
  • Loading branch information
baylee-d authored Jun 3, 2019
2 parents 1f09583 + 91af743 commit 2b6b216
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/new-home/-components/hero-banner/styles.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.hero {
color: #fff;
text-align: center;
background: url('/assets/images/dashboard/hero-home-banner.jpg') center center no-repeat;
background: url('/assets/images/new-home/hero-home-banner.jpg') center center no-repeat;
background-size: cover;
position: relative;
padding: 28px 20px 75px;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
<div local-class='container'>
<img data-test-icon-image src='/assets/images/dashboard/{{this.icon}}.svg' alt='{{this.icon}}'>
{{#if (eq this.icon 'search')}}
<img data-test-icon-image src='/assets/images/new-home/search.svg' alt={{this.icon}}>
{{else if (eq this.icon 'pencil-alt')}}
<img data-test-icon-image src='/assets/images/new-home/pencil-alt.svg' alt={{this.icon}}>
{{else if (eq this.icon 'chart-area')}}
<img data-test-icon-image src='/assets/images/new-home/chart-area.svg' alt={{this.icon}}>
{{else if (eq this.icon 'file-alt')}}
<img data-test-icon-image src='/assets/images/new-home/file-alt.svg' alt={{this.icon}}>
{{/if}}
<h2 data-test-support-header>
{{this.header}}
</h2>
Expand Down
6 changes: 3 additions & 3 deletions app/new-home/-components/support-section/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<img
data-test-arrow
local-class='arrowImage'
src='/assets/images/dashboard/arrow.svg'
src='/assets/images/new-home/arrow.svg'
alt={{t 'new-home.support-section.arrow'}}
>
</div>
Expand All @@ -32,7 +32,7 @@
<img
data-test-arrow
local-class='arrowImage'
src='/assets/images/dashboard/arrow.svg'
src='/assets/images/new-home/arrow.svg'
alt={{t 'new-home.support-section.arrow'}}
>
</div>
Expand All @@ -49,7 +49,7 @@
<img
data-test-arrow
local-class='arrowImage'
src='/assets/images/dashboard/arrow.svg'
src='/assets/images/new-home/arrow.svg'
alt={{t 'new-home.support-section.arrow'}}
>
</div>
Expand Down
2 changes: 2 additions & 0 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
const nodeSass = require('node-sass');

const EmberApp = require('ember-cli/lib/broccoli/ember-app');
const broccoliAssetRevDefaults = require('broccoli-asset-rev/lib/default-options');

const { EMBER_ENV } = process.env;
const IS_PROD = EMBER_ENV === 'production';
Expand Down Expand Up @@ -65,6 +66,7 @@ module.exports = function(defaults) {
},
fingerprint: {
enabled: true,
extensions: broccoliAssetRevDefaults.extensions.concat(['svg']),
exclude: [
'zxcvbn.js',
'assets/osf-assets',
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes

0 comments on commit 2b6b216

Please sign in to comment.