Skip to content

Commit

Permalink
Fix Font Awesome warnings due to Ember 3.20 bumping
Browse files Browse the repository at this point in the history
- bump ember-fontawesome from 0.2.1 to 0.2.2
- replace component use style from Mustache-format to AngleBracket-format ; ex: {{fa-icon 'plus'}} → <FaIcon 'plus'/>
- fix deprecation warning for positionned param ; ex: <FaIcon 'plus'/> → <FaIcon @ICON='plus'/>
  • Loading branch information
jbuget authored Sep 23, 2020
1 parent 1701a92 commit 112bc77
Show file tree
Hide file tree
Showing 9 changed files with 14,867 additions and 22,293 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
</button>
{{/if}}
<button data-test-id='panel-candidate__action__cancel' class="button button--square button--lightgrey certification-candidates-row-actions__close" type="button" {{on "click" (fn @onClickCancel @candidateData)}}>
{{fa-icon "times" class="fa-fw certification-candidates-add-button__icon"}}
<FaIcon @icon='times' class='fa-fw certification-candidates-add-button__icon' />
</button>
</div>
</td>
Expand Down
4 changes: 2 additions & 2 deletions certif/app/components/login-form.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
/>
<button type="button" aria-label="rendre le mot de passe lisible" class="login-form__icon" {{action 'togglePasswordVisibility'}} >
{{#if this.isPasswordVisible}}
<div tabindex="-1" onmousedown={{this.togglePasswordVisibility}}>{{fa-icon 'eye' class="fa-fw login-form-icon__eye"}}</div>
<div tabindex="-1" onmousedown={{this.togglePasswordVisibility}}><FaIcon @icon='eye' class="fa-fw login-form-icon__eye" /></div>
{{else}}
<div tabindex="-1" onmousedown={{this.togglePasswordVisibility}}>{{fa-icon 'eye-slash' class="fa-fw login-form-icon__eye"}}</div>
<div tabindex="-1" onmousedown={{this.togglePasswordVisibility}}><FaIcon @icon='eye-slash' class="fa-fw login-form-icon__eye" /></div>
{{/if}}
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion certif/app/components/no-session-panel.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="no-session-panel__link-to-create">
<LinkTo @route="authenticated.sessions.new" class="button button--link button--with-icon">
Créer une session
{{fa-icon 'plus'}}
<FaIcon @icon='plus' />
</LinkTo>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</div>
<div class="session-finalization-formbuilder-link-step__link">
<a href={{this.formBuilderLinkUrl}} target="_blank" rel="noopener noreferrer" >
{{fa-icon 'arrow-right'}} Formulaire 123formbuilder
<FaIcon @icon='arrow-right' /> Formulaire 123formbuilder
</a>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<div class="content-text context-text--small">
<div class="panel-actions__header">
<div class="panel-actions__header-icon">
{{fa-icon "info"}}
<FaIcon @icon="info" />
</div>
<div class="panel-actions__header-title">Ajouter des candidats</div>
</div>
<div class="panel-actions__action-row">
<div class="panel-actions__action-icon">
{{fa-icon "file-download"}}
<FaIcon @icon="file-download" />
</div>
<div class="panel-actions__description">
<div class="panel-actions__title">Télécharger le PV de session</div>
Expand All @@ -20,14 +20,14 @@
<a data-test-id="attendance_sheet_download_button"
class="button button--link button--with-icon"
href="{{this.currentSession.urlToDownload}}" target="_blank" rel="noopener noreferrer" download>
Télécharger (.ods){{fa-icon 'file-download'}}
Télécharger (.ods)<FaIcon @icon='file-download' />
</a>
</div>
</div>
<div class="panel-actions__action-row">
{{#if this.importAllowed}}
<div class="panel-actions__action-icon">
{{fa-icon "cloud-upload-alt"}}
<FaIcon @icon="cloud-upload-alt" />
</div>
<div class="panel-actions__description">
<div class="panel-actions__title">Importer le PV de session</div>
Expand All @@ -45,13 +45,13 @@
class="button button--with-icon"
role="button"
tabindex="0">
Importer (.ods){{fa-icon 'cloud-upload-alt'}}
Importer (.ods)<FaIcon @icon='cloud-upload-alt' />
</span>
</FileUpload>
</div>
{{else}}
<div class="panel-actions__action-icon">
{{fa-icon 'exclamation-circle' class="panel-actions__warning-icon"}}
<FaIcon @icon='exclamation-circle' class="panel-actions__warning-icon" />
</div>
<div class="panel-actions__description">
<strong class="panel-actions__warning">
Expand All @@ -76,7 +76,7 @@
Ajouter un candidat
</div>
<button type="button" class="button button--square button--lightgrey">
{{fa-icon "plus" class="fa-fw certification-candidates-add-button__icon"}}
<FaIcon @icon="plus" class="fa-fw certification-candidates-add-button__icon" />
</button>
</div>
</div>
Expand Down Expand Up @@ -156,7 +156,7 @@
data-test-id="panel-candidate__actions__delete__{{candidate.id}}"
type="button"
class="button button--square button--lightgrey button--lightgrey--disabled certification-candidates-actions__delete__button--disabled" >
{{fa-icon "trash-alt" class="fa-fw"}}
<FaIcon @icon="trash-alt" class="fa-fw" />
</button>
<div class="certification-candidates-actions__delete__tooltip">
Ce candidat a déjà rejoint la session. Vous ne pouvez pas le supprimer.
Expand All @@ -167,7 +167,7 @@
type="button"
class="button button--square button--lightgrey certification-candidates-actions__delete__button"
{{on 'click' (fn this.deleteCertificationCandidate candidate)}} >
{{fa-icon "trash-alt" class="fa-fw"}}
<FaIcon @icon='trash-alt' class='fa-fw' />
</button>
{{/if}}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
{{#if (is-clipboard-supported)}}
<div class="tooltip">
<span class="tooltip__text tooltip-text session-details-content__tooltip-text">{{this.tooltipText}}</span>
<CopyButton @clipboardText={{this.session.accessCode}} @success={{this.clipboardSuccess}} @mouseLeave={{this.clipboardOut}} @classNames="icon-button session-details-content__clipboard-button">
{{fa-icon 'copy' prefix='far'}}
<CopyButton @clipboardText={{this.session.accessCode}} @success={{this.clipboardSuccess}} {{on 'mouseLeave' this.clipboardOut}} @classNames="icon-button session-details-content__clipboard-button">
<FaIcon @icon='copy' prefix='far' />
</CopyButton>
</div>
{{/if}}
Expand Down
2 changes: 1 addition & 1 deletion certif/app/templates/authenticated/sessions/list.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="session-list__header">
<LinkTo @route="authenticated.sessions.new" class="button button--link button--with-icon">
Créer une session
{{fa-icon 'plus'}}
<FaIcon @icon='plus'/>
</LinkTo>
</div>

Expand Down
Loading

0 comments on commit 112bc77

Please sign in to comment.