Skip to content

Commit eaa76e1

Browse files
paprocpaproc
committed
fix
1 parent a96ab13 commit eaa76e1

File tree

11 files changed

+2385
-1254
lines changed

11 files changed

+2385
-1254
lines changed

‎app/Components/Results/results.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import React, { useState } from 'react';
22
import ReactDOM from 'react-dom';
33
import './style.scss';
44
import { TranslatorProvider, useTranslator } from './resultsTranslator';
5-
import { co } from '@fullcalendar/core/internal-common';
65

76
interface Contestant {
87
contestant: {

‎app/Components/ResultsPanel/app.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ const CategoryColumn: React.FC<{
173173
<div className="team-name">{mappedTeams[p.team.teamId]?.name ?? p.team.name}</div>
174174
<div className="flags">
175175
{[...new Set(mappedTeams[p.team.teamId]?.participants.map(p => p.countryIso))].filter(iso => iso !== '').map(iso =>
176-
<span className={`flag-icon flag-icon-${iso?.toLowerCase()}`} />,
176+
<span className={`fi fi-${iso?.toLowerCase()}`} />,
177177
)}
178178
</div>
179179
</td>

‎app/Components/TeamList/teamList.latte‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
{do $inSchool++}
7272
{if $iterator->isLast() || (!is_null($members[$key + 1]) && isset($member->school) && isset($members[$key + 1]->school) && $member->school['schoolId'] != $members[$key + 1]->school['schoolId'])}
7373
<span class="text-muted"> ({if $inSchool > 1}{$inSchool}&nbsp;&times;&nbsp;{/if}{$member->school['nameAbbrev']??''}{if isset($member->school) && $member->school['countryISO'] !== ''} <span
74-
class="flag-icon flag-icon-{$member->school['countryISO']??'zz'|lower}"></span>{/if})</span>
74+
class="fi fi-{$member->school['countryISO']??'zz'|lower}"></span>{/if})</span>
7575
{do $inSchool = 0}
7676
{/if}
7777
{if !$iterator->isLast()}, {/if}

‎app/Components/TeamResults/styles.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
// margin-bottom: 20px; /* This will give a larger gap after the "One member teams only" checkbox. */
9595
// }
9696

97-
// .flag-icon {
97+
// .fi {
9898
// margin-right: 5px; /* Space between flag and country name */
9999
// }
100100

‎app/Components/TeamResults/teamResults.latte‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
{if $iterator->isLast() || (!is_null($members[$key + 1]) && isset($member->school) && isset($members[$key + 1]->school) && $member->school['schoolId'] != $members[$key + 1]->school['schoolId'])}
7070
{$member->name|trim}
7171
<span class="text-muted"> ({if $inSchool > 1}{$inSchool}&nbsp;&times;&nbsp;{/if}{$member->school['nameAbbrev']??$notAStudentText}{if isset($member->school) && $member->school['countryISO'] !== null}
72-
<span class="flag-icon flag-icon-{$member->school['countryISO']??'zz'|lower}"></span>{/if})</span>{if !$iterator->isLast()},{/if}
72+
<span class="fi fi-{$member->school['countryISO']??'zz'|lower}"></span>{/if})</span>{if !$iterator->isLast()},{/if}
7373
{do $inSchool = 0}
7474
{else}
7575
{$member->name|trim}{if !$iterator->isLast()},{/if}

‎app/Modules/Fol/Core/styles/main.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ $navbar-dark-hover-color: $text-on-primary;
2828

2929

3030
@import "node_modules/bootstrap/scss/bootstrap";
31-
$flag-icon-css-path: '/node_modules/flag-icon-css/flags';
32-
@import '../../../../../node_modules/flag-icon-css/sass/flag-icon';
31+
$flag-icons-path: '/node_modules/flag-icons/flags';
32+
@import "../../../../../node_modules/flag-icons/sass/flag-icons";
3333
@import '../node_modules/lightbox2/dist/css/lightbox.min.css';
3434

3535

‎app/Modules/Fol/DefaultModule/templates/Default/default.latte‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@
481481
<div class="legends-year">2023</div>
482482
<div class="legends-item">
483483
<div>
484-
<span class="flag-icon flag-icon-sg"></span>
484+
<span class="fi fi-sg"></span>
485485
Puddle
486486
</div>
487487
<div class="members">
@@ -493,7 +493,7 @@
493493
<div class="legends-year">2022</div>
494494
<div class="legends-item">
495495
<div>
496-
<span class="flag-icon flag-icon-us"></span>
496+
<span class="fi fi-us"></span>
497497
S.I.M.P.S.
498498
</div>
499499
<div class="members">
@@ -505,8 +505,8 @@
505505
<div class="legends-year">2021</div>
506506
<div class="legends-item">
507507
<div>
508-
<span class="flag-icon flag-icon-jp"></span>
509-
<span class="flag-icon flag-icon-us"></span>
508+
<span class="fi fi-jp"></span>
509+
<span class="fi fi-us"></span>
510510
Metaphysical Brawlers
511511
</div>
512512
<div class="members">
@@ -518,10 +518,10 @@
518518
<div class="legends-year">2020</div>
519519
<div class="legends-item">
520520
<div>
521-
<span class="flag-icon flag-icon-hk"></span>
522-
<span class="flag-icon flag-icon-jp"></span>
523-
<span class="flag-icon flag-icon-us"></span>
524-
<span class="flag-icon flag-icon-vn"></span>
521+
<span class="fi fi-hk"></span>
522+
<span class="fi fi-jp"></span>
523+
<span class="fi fi-us"></span>
524+
<span class="fi fi-vn"></span>
525525
The Large Noobs Collider
526526
</div>
527527
<div class="members">
@@ -535,7 +535,7 @@
535535
<div class="legends-year">2019</div>
536536
<div class="legends-item" n:syntax="off">
537537
<div>
538-
<span class="flag-icon flag-icon-us"></span>
538+
<span class="fi fi-us"></span>
539539
Temple of Next
540540
</div>
541541
<div class="members">
@@ -547,8 +547,8 @@
547547
<div class="legends-year">2018</div>
548548
<div class="legends-item">
549549
<div>
550-
<span class="flag-icon flag-icon-ch"></span>
551-
<span class="flag-icon flag-icon-cz"></span>
550+
<span class="fi fi-ch"></span>
551+
<span class="fi fi-cz"></span>
552552
NOFY066
553553
</div>
554554
<div class="members">
@@ -560,9 +560,9 @@
560560
<div class="legends-year">2017</div>
561561
<div class="legends-item">
562562
<div>
563-
<span class="flag-icon flag-icon-at"></span>
564-
<span class="flag-icon flag-icon-cz"></span>
565-
<span class="flag-icon flag-icon-sk"></span>
563+
<span class="fi fi-at"></span>
564+
<span class="fi fi-cz"></span>
565+
<span class="fi fi-sk"></span>
566566
FtáKopySk -fks.sk
567567
</div>
568568
<div class="members">
@@ -574,7 +574,7 @@
574574
<div class="legends-year">2016</div>
575575
<div class="legends-item">
576576
<div>
577-
<span class="flag-icon flag-icon-in"></span>
577+
<span class="fi fi-in"></span>
578578
Castrambe
579579
</div>
580580
<div class="members">

‎app/Modules/Vyfuk/Core/styles/main.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ $flag-icons-path: '/node_modules/flag-icons/flags';
4040
@import "./titlepage";
4141
@import "./navigation";
4242
@import "./organizers";
43-
@import "./other.scss"
43+
@import "./other.scss";
4444

4545
// @import "./../../../Fol/Core/styles/layout";
4646
// @import "./../../../Fol/Core/styles/titlepage";

‎app/Modules/Vyfuk/DefaultModule/templates/Events/dalsi.latte‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,9 @@
113113
<h2>FYKOS</h2>
114114
<p>
115115
FYKOS nabízí středoškolákům velmi podobné aktivity jako Výfuk. Pokud se do něj zapojíš, můžeš i na
116-
střední škole v průběhu roku řešit šest sérií fyzikálních úloh a za odměnu jet na [soustředění].
117-
Kromě toho FYKOS pravidelně organizuje <a href="https://fyziklani.cz/">Fyziklání</a>, <a
116+
střední škole v průběhu roku řešit šest sérií fyzikálních úloh a za odměnu jet na <a
117+
hreff="https://fykos.cz/akce/soustredeni">soustředění</a>. Kromě toho FYKOS pravidelně
118+
organizuje <a href="https://fyziklani.cz/">Fyziklání</a>, <a
118119
href="https://online.fyziklani.cz/">Fyziklání Online</a>, <a
119120
href="https://physics.naboj.org/cz/cs/">Fyzikální Náboj</a> a <a
120121
href="https://dsef.cz/">DSEF</a>.

0 commit comments

Comments
 (0)