diff --git a/src/app/colecao/[id]/components/publisherInfoCollection.js b/src/app/colecao/[id]/components/publisherInfoCollection.js index e26bb80d3465e1b5367c6d39affacccad3d5d98d..ce21216aee7ee189056f540cb61487e9c4b9a30f 100644 --- a/src/app/colecao/[id]/components/publisherInfoCollection.js +++ b/src/app/colecao/[id]/components/publisherInfoCollection.js @@ -41,14 +41,14 @@ export default function PublisherInfoCollection({ publisher, disabledButton = fa function getRandomBg(id) { const colors = [ "bg-turquoise", - "bg-orange", + "bg-orange-HC-white", "bg-turquoise-hover", "bg-darkOrange-HC-gray ", - "bg-violet", - "bg-pink", - "bg-red", + "bg-violet-HC-white", + "bg-pink-HC-white", + "bg-red-HC-white", "bg-darkGray-HC-white", - "bg-darkGray-HC-white-click", + "bg-darkGray-HC-white-underline", "bg-ice-HC-dark ", "bg-darkGray-HC-white", "bg-darkGray-HC-white", diff --git a/src/app/components/AboutCarousel.js b/src/app/components/AboutCarousel.js index 67ca958f9a50464ec49463f1ceaa37d5488903a9..24fcc60ea1118b49064b6a58b1935d459e9cf253 100644 --- a/src/app/components/AboutCarousel.js +++ b/src/app/components/AboutCarousel.js @@ -80,8 +80,8 @@ export const Carousel = () => { /> ))} </div> - <div className="text-[#6C8080] text-[18px] font-medium"> - <button onClick={() => setPaused(!paused)} className="text-[#6C8080]"> + <div className="text-darkGray-HC-white-underline text-[18px] font-medium"> + <button onClick={() => setPaused(!paused)} className="text-darkGray-HC-white-underline"> {paused ? "Continuar" : "Parar"} {paused ? <PlayArrowRoundedIcon /> : <PauseRoundedIcon />} </button> diff --git a/src/app/components/ShareModal.js b/src/app/components/ShareModal.js index 160029fb84769b5c1fcc33bda2bd454f906447f1..bdc8d59d18383cf083f2b901bea3f3e40a8143da 100644 --- a/src/app/components/ShareModal.js +++ b/src/app/components/ShareModal.js @@ -44,14 +44,14 @@ export default function ShareModal({ open, onClose, title, link }) { }} > <div> - <div className="flex flex-col bg-ice-HC-dark p-6 rounded-lg items-center"> - <div className="text-xl font-bold text-darkGray-HC-white-underline">{title}</div> + <div className="flex flex-col bg-ice-HC-dark p-6 rounded-lg items-center outline outline-1 outline-ice-HC-white"> + <div className="text-xl font-bold text-darkGray-HC-white">{title}</div> <div className="p-3 mt-2 flex flex-col sm:flex-row"> <div> <Button disableElevation variant="outlined" - className="border-main text-darkGray-HC-white-underline border text-lg normal-case flex gap-2 " + className="border-darkGray-HC-white text-darkGray-HC-white-underline border text-lg normal-case flex gap-2 " sx={{ justifyContent: "start" }} onClick={() => { navigator.clipboard.writeText(link); diff --git a/src/app/components/SideBar.js b/src/app/components/SideBar.js index e570c06725f5fcd81eeecce99c7786b9a4f260d4..c49cc1ddc10ec0e2eb5471071e837c2098f3ac5c 100644 --- a/src/app/components/SideBar.js +++ b/src/app/components/SideBar.js @@ -141,14 +141,14 @@ export default function SideBar({ setFilterState, filterState }) { key={index} alt={item.title} title={item.title} - className={`aspect-square cursor-pointer hover:bg-lightGray-HC-white hover:text-darkGray-HC-dark focus:bg-lightGray-HC-white text-center rounded-lg pt-2 w-[80px] - ${(page === item.href) || (pathname.startsWith(item.href)) ? "bg-lightGray-HC-white text-darkGray-HC-dark font-bold" : ""} + className={`aspect-square cursor-pointer hover:bg-lightGray-HC-white hover:text-darkGray-HC-dark-underline focus:bg-lightGray-HC-white text-center rounded-lg pt-2 w-[80px] + ${(page === item.href) || (pathname.startsWith(item.href)) ? "bg-lightGray-HC-white text-darkGray-HC-dark-underline font-bold" : ""} `} > <item.icon - className={`text-3xl rounded-xl cursor-pointer ${page === item.href ? "text-darkGray-HC-dark font-bold" : ""}`} + className={`text-3xl rounded-xl cursor-pointer ${page === item.href ? "text-darkGray-HC-dark-underline font-bold" : ""}`} /> - <div className={`py-1 text-base `}> + <div className={`py-1 text-base ${page === item.href ? "text-darkGray-HC-dark-underline font-bold" : ""}`}> {item.title} </div> </Link> diff --git a/src/app/recurso/[id]/components/actionButtons.js b/src/app/recurso/[id]/components/actionButtons.js index 7a67a35c5ee9ec91803892089034d4f13b16497b..4ee38dc572a0943560f19aea999c65d01d1a38c7 100644 --- a/src/app/recurso/[id]/components/actionButtons.js +++ b/src/app/recurso/[id]/components/actionButtons.js @@ -179,12 +179,12 @@ export default function ActionButtons({ learningObject, setNeedLoginOpen, state !info ? null : <Button id="conteudo" key={buttonKey++} - className=" first:bg-turquoise-HC-white first:hover:text-darkGray-HC-white first:text-darkGray-HC-dark first:hover:bg-lightGray-HC-dark text-darkGray-HC-white group outline outline-1 outline-ice-HC-white group/button shadow-none flex justify-start rounded-xl p-1 m-1 normal-case text-sm min-w-min font-bold bg-white-HC-dark hover:bg-lightGray-HC-white text-darkGray-HC-white-underline hover:text-darkGray-HC-dark focus:bg-ice-HC-dark" + className="group first:bg-turquoise-HC-white first:hover:text-darkGray-HC-white first:text-darkGray-HC-dark first:hover:bg-darkTurquoise-HC-dark text-darkGray-HC-white group outline outline-1 outline-ice-HC-white group/button shadow-none flex justify-start rounded-xl p-1 m-1 normal-case text-sm min-w-min font-bold bg-white-HC-dark hover:bg-lightGray-HC-white text-darkGray-HC-white-underline hover:text-darkGray-HC-dark focus:bg-ice-HC-dark" onClick={info.action} {...info.extraProps} > - <div className="p-1">{info.icon}</div> - <div className="p-1">{info.name}</div> + <div className="p-1 text-darkGray-HC-white group-hover:text-darkGray-HC-dark-underline group-first:group-hover:text-white-HC-underline group-first:text-white-HC-dark-underline">{info.icon}</div> + <div className="p-1 text-darkGray-HC-white group-hover:text-darkGray-HC-dark-underline group-first:group-hover:text-white-HC-underline group-first:text-white-HC-dark-underline">{info.name}</div> </Button> ); @@ -207,7 +207,7 @@ export default function ActionButtons({ learningObject, setNeedLoginOpen, state {buttonInfo.map(genButton)} </div> : - <div className="flex justify-start py-4 max-sm:no-scrollbar max-sm:overflow-x-auto animate-scrollHint hover:text-darkGray-HC-dark"> + <div className="flex justify-start py-4 max-sm:no-scrollbar max-sm:overflow-x-auto animate-scrollHint text-red-800"> {genButton(buttonInfo[1] || buttonInfo[2])} </div> } diff --git a/src/app/recurso/[id]/components/collectModal.js b/src/app/recurso/[id]/components/collectModal.js index 0da5abf3735fa70947c97aa2568efbd8895666d2..0e594d2eff13526504332ce02f49cd667e06e18e 100644 --- a/src/app/recurso/[id]/components/collectModal.js +++ b/src/app/recurso/[id]/components/collectModal.js @@ -182,11 +182,11 @@ export default function CollectModal({ open, onClose, idLogin, resourceId }) { onClose={onClose} className="grid place-items-center" > - <div className="flex flex-col w-[50%] bg-ice-HC-dark p-5 md:w-[25%] h-[40%] -mt-[0%] sm:h-[70%] max-sm:h-[85%] max-sm:w-[85%] overflow-y-scroll max-sm:-mt-[25%] sm:-mt-[30%] md:-mt-[20%] xl:-mt-[0%] rounded-lg min-h-[250px] "> + <div className="flex flex-col w-[50%] bg-ice-HC-dark p-5 md:w-[25%] h-[40%] -mt-[0%] sm:h-[70%] max-sm:h-[85%] max-sm:w-[85%] overflow-y-scroll max-sm:-mt-[25%] sm:-mt-[30%] md:-mt-[20%] xl:-mt-[0%] rounded-lg min-h-[250px] outline outline-1 outline-ice-HC-white"> <ModalRepeat open={repeatedOpen} onClose={() => { setRepeatedOpen(false) }} /> <ModalSucess open={sucessOpen} onClose={() => { setSucessOpen(false) }} /> - <p className="text-2xl font-bold text-darkGray-HC-white-underline">Guardar Recurso</p> - <p className="text-xl text-darkGray-HC-white-underline mb-2">Escolha a coleção que deseja guardar esse recurso</p> + <p className="text-2xl font-bold text-darkGray-HC-white">Guardar Recurso</p> + <p className="text-xl text-darkGray-HC-white mb-2">Escolha a coleção que deseja guardar esse recurso</p> <div className="overflow-auto -mx-2"> {totalCount > 0 ? collections.map((item, i) => { @@ -198,12 +198,12 @@ export default function CollectModal({ open, onClose, idLogin, resourceId }) { <LockIcon className="mr-2 text-darkGray-HC-white-underline" /> : <LockOpenIcon className="mr-2 text-darkGray-HC-white-underline" /> } - <p className=" text-darkGray-HC-white-underline text-lg inline"> + <p className=" text-darkGray-HC-white text-lg inline"> {item["name"]} </p> </div> <button - className=" inline px-2 text-sm text-ice-HC-dark border-main rounded-lg normal-case h-9 font-bold bg-turquoise hover:bg-turquoise-hover" + className=" inline px-2 text-sm text-white-HC-dark-underline border-main rounded-lg normal-case h-9 font-bold bg-turquoise-HC-white hover:bg-darkTurquoise-HC-dark hover:text-white-HC-underline outline outline-1 outline-ice-HC-white" onClick={() => saveResourceCol(item["id"], resourceId, i)} > Guardar @@ -221,7 +221,7 @@ export default function CollectModal({ open, onClose, idLogin, resourceId }) { <div className="flex justify-center pt-5 mt-5"> <CreateCollectionModal open={collectionOpen} onClose={() => setCollectionOpen(false)} idLogin={idLogin} /> <button - className="inline-block px-2 text-sm text-ice-HC-dark border-main rounded-lg normal-case h-9 font-bold bg-turquoise hover:bg-turquoise-hover" + className="inline-block px-2 text-sm text-white-HC-dark-underline border-main rounded-lg normal-case h-9 font-bold bg-turquoise-HC-white hover:bg-darkTurquoise-HC-dark hover:text-white-HC-underline outline outline-1 outline-ice-HC-white mx-1" onClick={() => setCollectionOpen(true)} alt="Criar Coleção" > diff --git a/src/app/recurso/[id]/components/createComments.js b/src/app/recurso/[id]/components/createComments.js index 86fc2a7022e8d12f9023f6fd55d97cb3837d0d7a..d3e1aafe96726172a9e927dcc7575c1a7856d284 100644 --- a/src/app/recurso/[id]/components/createComments.js +++ b/src/app/recurso/[id]/components/createComments.js @@ -71,7 +71,7 @@ export default function CreateComments({ user, logged, handleSubmitComment, newC value={newComment} /> <div className="flex justify-end gap-2 mt-2"> - <button className="w-24 h-8 border-black rounded-lg text-darkGray-HC-white-underline text-sm hover:bg-ice-HC-dark outline outline-1 outline-ice-HC-white" onClick={() => setNewComment("")}> cancelar </button> + <button className="w-24 h-8 border-black rounded-lg text-darkGray-HC-white-underline text-sm hover:text-white-HC-dark-underline hover:bg-ice-HC-white outline outline-1 outline-ice-HC-white" onClick={() => setNewComment("")}> cancelar </button> <button className="bg-turquoise-HC-white hover:bg-darkTurquoise-HC-dark hover:text-white w-24 h-8 rounded-lg text-white-HC-dark-underline text-sm hover:bg-turquoise-hover outline outline-1 outline-ice-HC-white" onClick={() => { if (!logged) setNeedLoginOpen(true) handleSubmitComment() diff --git a/src/app/recurso/[id]/components/relatedResources.js b/src/app/recurso/[id]/components/relatedResources.js index 12322b2fafb8dfae678e92885a506910ad2242dd..6a96b0e608b4756f2cf6e623e0300073dc3711e2 100644 --- a/src/app/recurso/[id]/components/relatedResources.js +++ b/src/app/recurso/[id]/components/relatedResources.js @@ -51,7 +51,7 @@ export default function RelatedResources({ learningObject }) { return ( <Loading loaded={got}> <div className="flex flex-col"> - <div className="text-darkGray-HC-white-underline font-bold text-xl">Recursos Relacionados</div> + <div className="text-darkGray-HC-white font-bold text-xl">Recursos Relacionados</div> <div> {related.map((item, index) => { return ( diff --git a/src/app/recurso/[id]/components/reportModal.js b/src/app/recurso/[id]/components/reportModal.js index c735f0eded9cfb1be5db7e3daf7d3abf32a5f8a2..d03444bc7358d48e5d8f367812ffd69177680a2d 100644 --- a/src/app/recurso/[id]/components/reportModal.js +++ b/src/app/recurso/[id]/components/reportModal.js @@ -22,8 +22,8 @@ const ModalSucess = ({ open, onClose, modalOnClose }) => { }, }, }}> - <div className="flex flex-col justify-center bg-ice-HC-dark p-5 rounded"> - <p className="text-xl justify-center flex text-darkGray-HC-white-underline mb-2">Agradecemos a sua denúncia</p> + <div className="flex flex-col justify-center bg-ice-HC-dark p-5 rounded outline outline-1 outline-ice-HC-white" > + <p className="text-xl justify-center flex text-darkGray-HC-white mb-2">Agradecemos a sua denúncia</p> <div className="flex flex-row mt-2"> <button className=" text-sm p-2 ml-1 text-darkGray-HC-white-underline border-main rounded-lg normal-case h-9 font-bold bg-ice-HC-dark hover:bg-ice-HC-dark-hover" @@ -107,10 +107,10 @@ export default function ReportModal({ open, onClose, learningObject, setReported }, }} > - <div className="flex flex-col bg-ice-HC-dark p-3 rounded-lg"> - <div className="text-xl font-bold text-darkGray-HC-white-underline">Reportar</div> + <div className="flex flex-col bg-ice-HC-dark p-3 rounded-lg outline outline-1 outline-ice-HC-white"> + <div className="text-xl font-bold text-darkGray-HC-white">Reportar</div> <div className="p-3 flex flex-col"> - <div className="text-base font-bold text-darkGray-HC-white-underline"> + <div className="text-base font-bold text-darkGray-HC-white"> O que está acontecendo? </div> <form onSubmit={handleSubmit}> @@ -120,9 +120,9 @@ export default function ReportModal({ open, onClose, learningObject, setReported name="report-radio-group" sx={{ '& .MuiRadio-root': { - color: 'var(--grey)', + color: 'var(--darkGray-HC-white)', '&.Mui-checked': { - color: 'var(--secondary)', + color: 'var(--turquoise-HC-white)', }, }, }} @@ -156,22 +156,23 @@ export default function ReportModal({ open, onClose, learningObject, setReported variant="standard" error={info.length > 150 || info.length === 0} sx={{ - '& .MuiInputLabel-root': { color: 'var(--grey)' }, // Label color - '& .MuiInput-root::after': { borderBottomColor: 'var(--black)' }, // Focused border - '& .MuiInput-root::before': { borderBottomColor: 'var(--grey)' }, // Default border - '& .Mui-error': { color: 'var(--red)' }, // Error text color - '& .MuiFormHelperText-root': { color: 'var(--grey)' }, // Helper text color + '& .MuiInputLabel-root': { color: 'var(--darkGray-HC-white)' }, // Label color + '& .MuiInputLabel-root.Mui-focused': { color: 'var(--turquoise-HC-white)' }, // Cor quando focado + '& .MuiInput-root::after': { borderBottomColor: 'var(--black-HC-white)' }, // Focused border + '& .MuiInput-root::before': { borderBottomColor: 'var(--darkGray-HC-white)' }, // Default border + '& .Mui-error': { color: 'var(--red-HC-white)' }, // Error text color + '& .MuiFormHelperText-root': { color: 'var(--darkGray-HC-white)' }, // Helper text color '& .MuiInputBase-input': { color: 'var(--black-HC-white)' }, }} /> - <div className="text-sm text-end font-normal text-darkGray-HC-white-underline"> + <div className="text-sm text-end font-normal text-darkGray-HC-white"> Os campos preenchidos com * são obrigatórios. </div> <Button type="submit" variant="contained" disabled={info.length > 150 || info.length === 0} - className="bg-turquoise hover:bg-ice-HC-dark-hover disabled:bg-red mt-3 text-white-HC-dark-underline hover:text-turquoise-HC-underline shadow-none rounded normal-case text-base font-bold" + className="bg-turquoise-HC-white hover:bg-darkTurquoise-HC-dark disabled:bg-red-HC-white mt-3 text-white-HC-dark-underline hover:text-white-HC-underline shadow-none rounded normal-case text-base font-bold outline outline-1 outline-ice-HC-white" > Enviar </Button>