Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: 1024pix/pix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e069cd40798a11b2665fb22045af529a7a87304c
Choose a base ref
..
head repository: 1024pix/pix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7b87cb794076b62184a3de1593f3df1f685ad815
Choose a head ref
5 changes: 4 additions & 1 deletion orga/app/components/campaign/results/evolution-header.gjs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import { concat } from '@ember/helper';
import { t } from 'ember-intl';

import TooltipWithIcon from '../../ui/tooltip-with-icon';

<template>
<div class="evolution-header">
<div class="evolution-header {{if @align (concat 'evolution-header--' @align)}}">

{{t "pages.campaign-results.table.column.evolution"}}

<TooltipWithIcon
@iconName="help"
@position="top"
5 changes: 3 additions & 2 deletions orga/app/components/campaign/results/profile-list.gjs
View file
Original file line number Diff line number Diff line change
@@ -57,7 +57,7 @@ import ParticipationEvolutionIcon from './participation-evolution-icon';
{{#if @campaign.multipleSendings}}
<TableHeader @align="center">
<EvolutionHeader
class="table__column--center"
@align="center"
@tooltipContent={{t "pages.profiles-list.table.evolution-tooltip.content"}}
/></TableHeader>

@@ -107,7 +107,8 @@ import ParticipationEvolutionIcon from './participation-evolution-icon';
</PixTag>
{{/if}}
</td>
<td class="table__column--center"> <ParticipationEvolutionIcon @evolution={{profile.evolution}} /></td>
<td class="table__column--center">
<ParticipationEvolutionIcon @evolution={{profile.evolution}} /></td>
<td class="table__column--center hide-on-mobile">
{{#if profile.certifiable}}
<PixTag @color="green-light">{{t "pages.profiles-list.table.column.certifiable"}}</PixTag>
2 changes: 1 addition & 1 deletion orga/app/components/ui/tooltip-with-icon.gjs
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ import PixIcon from '@1024pix/pix-ui/components/pix-icon';
import PixTooltip from '@1024pix/pix-ui/components/pix-tooltip';
import { uniqueId } from '@ember/helper';

const tooltipId = uniqueId;
const tooltipId = uniqueId();

<template>
<PixTooltip @id={{tooltipId}} @position={{@position}} @isInline={{@isInline}} class="tooltip-with-icon">
5 changes: 5 additions & 0 deletions orga/app/styles/components/campaign/results/evolution-header.scss
View file
Original file line number Diff line number Diff line change
@@ -3,5 +3,10 @@
gap: var(--pix-spacing-1x);
align-items: center;


&--center {
justify-content: center;

}
}

4 changes: 1 addition & 3 deletions orga/app/styles/components/ui/tooltip-with-icon.scss
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
.tooltip-with-icon {
width: fit-content;
display: inline-flex;


// @TODO: Remove !important when PixTooltip wil be fixed
&__increase{
width: 1.5rem;
height: 1.5rem;