From e66281e575a2c233d16c5ffefc1e26c6da6b9330 Mon Sep 17 00:00:00 2001 From: Pierre Ferreira Date: Wed, 15 Nov 2023 14:35:06 +0100 Subject: [PATCH] ajout du theme tertiary pour les boutons et remplacement de l'icon alpha par une loupe. :art: --- cryptide_project/src/Pages/InGame.css | 2 +- cryptide_project/src/Pages/InGame.tsx | 16 +++++++++------- cryptide_project/src/Style/Theme.tsx | 2 +- .../src/res/icon/magnifying-glass.png | Bin 0 -> 2438 bytes 4 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 cryptide_project/src/res/icon/magnifying-glass.png diff --git a/cryptide_project/src/Pages/InGame.css b/cryptide_project/src/Pages/InGame.css index 600710e..04bed07 100644 --- a/cryptide_project/src/Pages/InGame.css +++ b/cryptide_project/src/Pages/InGame.css @@ -107,7 +107,7 @@ .button{ /*background-color: #85C9C2;*/ - border: solid 2px #85C9C2; + border: solid 2px #7aa3f4; border-radius: 10px; width: 100px; diff --git a/cryptide_project/src/Pages/InGame.tsx b/cryptide_project/src/Pages/InGame.tsx index 8a90482..02341ca 100644 --- a/cryptide_project/src/Pages/InGame.tsx +++ b/cryptide_project/src/Pages/InGame.tsx @@ -19,6 +19,7 @@ import Replay from "../res/icon/replay.png"; import Info from "../res/icon/infoGreen.png"; import Check from "../res/icon/checkboxGreen.png"; import Alpha from "../res/GreekLetters/alphaW.png"; +import MGlass from "../res/icon/magnifying-glass.png"; /* nav */ import { Link } from 'react-router-dom'; @@ -34,6 +35,7 @@ import { Nav, NavDropdown } from 'react-bootstrap'; import { FormattedMessage } from 'react-intl'; import Color from '../model/Color'; import { useGame } from '../Contexts/GameContext'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; //@ts-ignore const InGame = ({locale, changeLocale}) => { @@ -138,7 +140,7 @@ const InGame = ({locale, changeLocale}) => { {IsSolo ? (
Tour : {cptTour} @@ -147,7 +149,7 @@ const InGame = ({locale, changeLocale}) => {
diff --git a/cryptide_project/src/Style/Theme.tsx b/cryptide_project/src/Style/Theme.tsx index 50df20a..199ff79 100644 --- a/cryptide_project/src/Style/Theme.tsx +++ b/cryptide_project/src/Style/Theme.tsx @@ -3,7 +3,7 @@ const theme = { colors: { primary: '#0064E0', secondary: '#0052B8', - + tertiary: '#7aa3f4', //* Pour les boutons de l'interface. text: '#fff' //faire une gestion dark/light diff --git a/cryptide_project/src/res/icon/magnifying-glass.png b/cryptide_project/src/res/icon/magnifying-glass.png new file mode 100644 index 0000000000000000000000000000000000000000..7d29f82081022856b57020b73c463dff2562d3dc GIT binary patch literal 2438 zcmV;133>L3P)Mha?5+=xH$+_*9zh;cC?r^2-PSWf=_44gf0w%mXl)m+sL3&gV81z*qn!0G_&_9bK-9Z3G0eCT@j?4tW@hQ@B24^u7!S4AGplYk=4B1H;(vs z$zao+?*bkG@DwYSF95hS2gkR)0eob6_i_M-W%)fpL%*c$mc71Pguh37@2vn9IqcVD zRLYhjzGO0e&sqTc<>0%5;{=Psx0;V-Hc0#L3t(XcZN0V~m?K%PVB3TAJ8SS&FR?bx0I)3Lpx14*MdXSh7A1CO4!_HLW*a(+CdNLN=lA3#Je5V;#0IBaTP|x1 z-#IMD-{&Qx3>{SFpy_wxeKp&`ACM>cN-Tz}4oEP&1K1#R4lSQ2Tb>^s@luG+<8xS1 z8_V|qv~9G^vz*Tw-ih8Pu{>hvmzPt^mF_ydyc7B#t8tN4|xY zbNP6OfnUShOEKcXQ2;81cl|br*T^pkok5*+NEV6}O{)6Q1C*bh${{O>%mu#HH%EAQL&51WRv0=wA)@`?Cy7zt8b|eGOY7 z=?Ot{zaTV4_N1dV?~Cc4p#V>xDdxdWCmUUj2gxEq;6cLYM;b0s3griwOFj_fBQtk! z&=S8Tjj&|ZYbQMOvd}?KBMc@8@{y}raI`mg`beHV(oJDcgh4MszNH9|(*#t1>Vc`N)rgoWZ$| zOYYK_3!lF?Lq`$cSSrX#2C$%bP!M!@#LrV;M@W2UVyu{ewP$ooRS z^g&=uj(GV|%&uW|KYKTlV;nmTfpLc*=#>^NnQZ3c0Gx<0Stj%gU4aM1xP&NmQIVWO z4n<%L69i3ih}2F7-$q4i)-@OyEIA0ZDoGf-`$MGC=5)#R!zLr0jQ& zOcMHoLdk;U4MAYa(2+#G5c-3%qy)+Jg21mJd9*TQE$M_nIZhC`f<0xE#7Khz7_3gz z#GnUIp@t;!uFwzUEu6@(FzOH&iaE&gH;%I_jZp-!EBhGo8jv4E&~z09r;DB=9iA^u z^DOt5d{z-@*V zu#j0y8kFX20gU1#YT5!Q;KUct=n6sZ`A8Ud2^~T0T*Gt4JPFo$s06-jkU7qYE%HKZ z!;z2@FYkr0IL|Qn6d{yI#uz%~oq!A?`x>^q>JUAEqlAlnWtarM2Y}Yz`AcqJDK2Z1 zXpS-D4A{X1oqV3)FBt}Zbps@+^nz;*okT~&GvOyw4RTd;Z6k&EdMR~GijPixJd>x? zAWw=TrIb3f;Q~vhU(CfG^jK4_LSh>HH!`Srk_h(agw830wd{VrRgCK;&&QU*UmVjc zrm@N){Fg&@&I1rHdRQhewI2YqE%b}}a${I->C8=BowLxZK|27?IAkvOC6j4vILxsS z#PR~25}NVpMY`FmzwFmdf=T=TIsANZQNX!mKOW$eLtDZHAc`8mgne^_;?nc#?fH%Q z-|Ff$QvC#u*@s?|4v21>A*F1QW>@y z4#xbHFPmyBhtA;}IXYcz%;N7?@c_5XFkO7gv1G1q$+7ctOF-MN4{>zE1c_A&c&x)yqHbOZT$== zQQN;s^dz!{TaDn9>ry`cOj{WTZS>Ef3))c2cW!g2i>Q-8pa~mU#<4Hn*AcY&GEPW2 zlLIw7<>{P0->||AVi{@;PNwSTIte10Zb@0|%*td>PRP`mtCLe9>xQCS7|;QNPoYkN zfM{;Wg)H4~=p+b;7QzIeJ%4AzbA2qe6DvYYF&8SEGfWWSvJyx&n3Ndtj$r_8W?!8I z0WjL~E4D4=Ite_dsiholg+tP4)d@VOn;|Zu_Ecaik)xBqb1t#Clx^YqLfLKyl%q+B zu|BZFFo0VfT;FVyU|oo%XhLGB#r9w6aPw%}4rVlvEJ}t9Hzbg*y&yU}i5PTBL*A(iKlQ$6_a_6t0hn z$AxDoXMy4oeJz@ORhsH+CmNpdC99fJhu#i8kFz-=`wYw0q1VNp(u=KvsVv&67zETR zS#U;#@U$p}Iu(yNIfF2{6jyIm0->{G_