diff --git a/src/app/components/Cards.js b/src/app/components/Cards.js
index f1a330a8222106ef4ae8bac39ac56af4b3d8f1fb..63688317e0e14002e5b4d61c4dd0c2b15300e75a 100644
--- a/src/app/components/Cards.js
+++ b/src/app/components/Cards.js
@@ -104,7 +104,7 @@ export default function Cards(props) {
>
<CardMedia
- className="hover:scale-105 z-1 hover:relative z-0 border border-gray-color transition-transform rounded-xl flex-shrink-0 aspect-video"
+ className="hover:border-secondary hover:border-4 border-gray-color transition-transform rounded-xl flex-shrink-0 aspect-video"
sx={{
width: props?.thumbWidth ?? 327,
height: props?.thumbHeight ?? 181,
@@ -121,19 +121,26 @@ export default function Cards(props) {
<CardHeader
className="self-start flex-shrink"
- avatar={props?.noAvatar ? null :
- <Avatar
- component={Link}
- href={`/perfil/${props["authorId"]}`}
- src={`https://api.portalmec.c3sl.ufpr.br/${props["avatar"]}`}
- alt={props["author"]}
- sx={{
- width: 28,
- height: 28,
- marginTop: 0,
- bgcolor: "#00bacc",
- }}
+ avatar={props?.noAvatar || !props["avatar"] ? <div className="w-[36px] rounded-full bg-orange"/> :
+ <img
+ src={`https://api.portalmec.c3sl.ufpr.br/${props["avatar"]}`}
+ alt={props["author"]}
+ className="w-[36px] h-[36px] object-cover rounded-full"
+
/>
+ // <Avatar
+ // component={Link}
+ // href={`/perfil/${props["authorId"]}`}
+ // src={`https://api.portalmec.c3sl.ufpr.br/${props["avatar"]}`}
+ // alt={props["author"]}
+ // sx={{
+ // width: 28,
+ // height: 28,
+ // marginTop: 0,
+ // bgcolor: "#00bacc",
+ // zIndex: 0,
+ // }}
+ // />
}
title={
<Typography variant="body2" color="" className="line-clamp-2 text-main-text font-bold"
diff --git a/src/app/components/Content.js b/src/app/components/Content.js
index 4cc79850fc2fb450d771d70a9f3123334592d0eb..a879a70ec0ad37a5c009cdec5198c2ec20e5ab5f 100644
--- a/src/app/components/Content.js
+++ b/src/app/components/Content.js
@@ -50,7 +50,7 @@ export default function Content({ name, inputFilter }) {
{name != "MEC" && name != "Usuários" ?
(
<>
- <div className="ml-1 fixed top-[135px] z-10 w-full "
+ <div className="ml-1 fixed top-[155px] w-full "
style={{
backgroundImage: `linear-gradient(rgba(245, 249, 249, 0.7),
rgba(245, 249, 249, 1)),url("/images/fundo.webp")`,
diff --git a/src/app/components/DownloadButton.js b/src/app/components/DownloadButton.js
index c3681141fc5b036bd2cc4abc85bf751a5ad027f7..d8f6029d9dd90de90fb35e64428516ebd3acf938 100644
--- a/src/app/components/DownloadButton.js
+++ b/src/app/components/DownloadButton.js
@@ -36,13 +36,13 @@ export default function DownloadButton({ id, objects }) {
return (
<>
- <Button
- className=" border-secondary w-32 rounded-xl hover:bg-secondary-hover bg-secondary text-white max-md:my-3 font-bold normal-case flex "
+ <button
+ className="px-3 py-2 text-sm justify-center border-secondary w-32 rounded-xl hover:bg-secondary-hover bg-secondary text-white max-md:my-3 font-bold normal-case flex "
variant="outlined"
onClick={handleDowloadCollection}
startIcon={<DownloadIcon className='text-white' />}>
Baixar
- </Button>
+ </button>
</>
)
}
\ No newline at end of file
diff --git a/src/app/components/FiltersModal.js b/src/app/components/FiltersModal.js
index dc8842a4dc177ff7ef8b7ececd30c46228f7c75b..4174d732ff7b843fa65063250f933c9dd542a952 100644
--- a/src/app/components/FiltersModal.js
+++ b/src/app/components/FiltersModal.js
@@ -38,15 +38,7 @@ export default function FiltersModal() {
return (
- <div className='justify-self-end'>
- <div className='flex ml-2'>
- {activeFilters &&
- <Button onClick={() => {setActiveFilters(false) }} href="/recursos" className={`normal-case font-semibold text-sm bg-text-filter rounded-lg min-w-32 mx-1 text-white hover:bg-slate-300`}>
- Limpar Filtros
- </Button>
- }
- <Button startIcon={<TuneIcon />} onClick={handleOpen} className='bg-text-filter font-semibold normal-case text-white rounded-lg px-3 mr-2'>Filtros</Button>
- </div>
+ <>
<Modal
open={open}
onClose={handleClose}
@@ -61,7 +53,6 @@ export default function FiltersModal() {
<p className=' text-2xl font-bold text-text-filter '>
Filtros de Pesquisa
</p>
-
<CloseIcon onClick={handleClose} sx={{ color: "#6c8080", fontSize: "35px" }} />
</div>
</div>
@@ -87,8 +78,17 @@ export default function FiltersModal() {
</div>
</div>
</div>
-
</Modal>
- </div>
+ <div className='justify-self-end'>
+ <div className='flex ml-2'>
+ {activeFilters &&
+ <Button onClick={() => { setActiveFilters(false) }} href="/recursos" className={`normal-case font-semibold text-sm bg-text-filter rounded-lg min-w-32 mx-1 text-white hover:bg-slate-300`}>
+ Limpar Filtros
+ </Button>
+ }
+ <Button startIcon={<TuneIcon />} onClick={handleOpen} className='bg-text-filter font-semibold normal-case text-white rounded-lg px-3 mr-2'>Filtros</Button>
+ </div>
+ </div>
+ </>
);
}
\ No newline at end of file
diff --git a/src/app/components/GroupButtonsFilters.js b/src/app/components/GroupButtonsFilters.js
index c904094cb8f38714ae9f3b2875680746890b4f6c..2733c04fefe2774fd681960229cc9b443bc79930 100644
--- a/src/app/components/GroupButtonsFilters.js
+++ b/src/app/components/GroupButtonsFilters.js
@@ -45,7 +45,7 @@ export default function GroupButtonsFilters({ setTitlePage, setSelectFilter, sel
]
return (
- <div className="flex justify-between pb-5 px-4 overflow-x-scroll no-scrollbar">
+ <div className="flex justify-between pb-5 px-4 overflow-x-scroll no-scrollbar w-full pr-48 max-sm:pr-0">
<div className="flex ">
{atalhos.map((item, index) => {
return (
diff --git a/src/app/components/GroupCardsCollections.js b/src/app/components/GroupCardsCollections.js
index e62f68b172b4362289bb196741585306c77051eb..75f00e713adec9307e5141fdcd055be049905222 100644
--- a/src/app/components/GroupCardsCollections.js
+++ b/src/app/components/GroupCardsCollections.js
@@ -28,7 +28,7 @@ export default function GroupCardsCollections({ data, cardsPerRow }) {
return (
<div className="flex flex-col">
<div className="mx-1 flex flex-col">
- <div id="contentSize" className={`flex content flex-wrap max-sm:justify-center max-sm:ml-0 md:ml-0 ml-8 ${expanded ? "" : "overflow-y-hidden h-[300px]"}`}>
+ <div id="contentSize" className={`flex content flex-wrap max-sm:justify-center max-sm:ml-0 md:ml-0 ${expanded ? "" : "overflow-y-hidden h-[300px]"}`}>
{data.length !== 0 ? data.map((item, index) => {
return (
@@ -56,19 +56,19 @@ export default function GroupCardsCollections({ data, cardsPerRow }) {
{/*mostra botão de ver mais caso os recursos de uma coleção cabem em mais de uma linha */}
{showButton ?
(
- <Button
+ <button
fullWidth
disableElevation
variant="outlined"
- className="mb-2 border-hidden hover:bg-transparent rounded-xl normal-case flex "
+ className="hover:bg-main -ml-4 py-2 border-hidden rounded-xl normal-case flex justify-center"
onClick={toggleContent}
>
- <p className="hover:bg-main px-4 text-main-text-click text-lg rounded-md"
- alt={expanded ? "Ver menos..." : "Ver mais..."}
+ <p className=" px-4 text-main-text-click text-lg rounded-md"
+ alt={expanded ? "Ver menos" : "Ver mais..."}
>
- {expanded ? "Ver menos..." : "Ver mais..."}
+ {expanded ? "Ver menos" : "Ver mais..."}
</p>
- </Button>
+ </button>
) : null}
</>
</div>
diff --git a/src/app/components/Overlay.js b/src/app/components/Overlay.js
index d5dba95a6c1eddc9ed028e76ebddda0c1b146e49..5ab33181cd6cebe886aadab7302bbe31fe65432e 100644
--- a/src/app/components/Overlay.js
+++ b/src/app/components/Overlay.js
@@ -62,7 +62,7 @@ export default function Overlay({
<div
className={`flex flex-col ml-0 ${
openMenu ? "md:ml-64" : "md:ml-24"
- } mt-[135px]`}
+ } mt-[165px]`}
>
{children}
</div>
diff --git a/src/app/components/SearchComponent.js b/src/app/components/SearchComponent.js
index 194fc940dc76a56ae83ed09a069c969fa47471db..28f59a175cbe0d9be0b8a46438fc19d923cd743e 100644
--- a/src/app/components/SearchComponent.js
+++ b/src/app/components/SearchComponent.js
@@ -126,7 +126,7 @@ export default function SearchComponent({ setQuery, sizeWindow }) {
if (e.key === "Enter") e.preventDefault();
if (drop) e.stopPropagation();
}}
- className="w-full"
+ className="w-full z-30"
onSubmit={handleSubmit}
>
<div className="flex gap-3 items-center">
@@ -177,7 +177,7 @@ export default function SearchComponent({ setQuery, sizeWindow }) {
style={{ width: `${width}px` }}
tabIndex={0}
>
- <ul className="relative z-100">
+ <ul className=" z-10">
{suggestions.map((suggestion, index) => (
<li
key={index}
diff --git a/src/app/components/SideBar.js b/src/app/components/SideBar.js
index e73eeebb05f77ad1e578d052b723ebee824ccd60..d349fe3b2b750f7cab06edf50865a4689b2381ee 100644
--- a/src/app/components/SideBar.js
+++ b/src/app/components/SideBar.js
@@ -89,7 +89,7 @@ export default function SideBar({ setFilterSubject, openMenu }) {
return (
<>
<div
- className={`top-[135px] start-0 overflow-y-auto pb-24 pl-8 w-64 text-white fixed h-full z-40 ease-in-out duration-300 ${
+ className={`top-[155px] start-0 overflow-y-auto pb-24 pl-8 w-64 text-white fixed h-full z-40 ease-in-out duration-300 ${
!openMenu ? "-translate-x-full " : "translate-x-0"
}`}
style={{
@@ -159,7 +159,7 @@ export default function SideBar({ setFilterSubject, openMenu }) {
</div>
{!openMenu && (
<div className="max-md:hidden ">
- <div className="flex flex-col pt-2 items-strech gap-1 top-4 sm:top-[135px] start-0 overflow-y-auto p-2 bg-transparent w-24 text-white fixed h-full z-40 ease-in-out duration-300 ">
+ <div className="flex flex-col pt-2 items-strech gap-1 top-4 sm:top-[155px] start-0 overflow-y-auto p-2 bg-transparent w-24 text-white fixed h-full z-40 ease-in-out duration-300 ">
{acessoRapido.map((item, index) => {
return (
<Link
diff --git a/src/app/components/UsersPageCard.js b/src/app/components/UsersPageCard.js
index 91f60d73644be469a56d0adeba4bdf55e840148f..7a971d04c4faed15e3c00ce210671cc7639ca9c5 100644
--- a/src/app/components/UsersPageCard.js
+++ b/src/app/components/UsersPageCard.js
@@ -12,7 +12,7 @@ export default function UsersPageCard({ item }) {
return (
item &&
<Link href={`/perfil/${item["id"]}`}>
- <div className="flex flex-col w-[300px] min-h-[270px] bg-white m-4 rounded-lg">
+ <div className="flex flex-col w-[300px] min-h-[270px] bg-white m-4 rounded-lg hover:bg-main-hover">
<div className="grid justify-items-center h-[200px] pt-2">
<Avatar src={"https://api.portalmec.c3sl.ufpr.br/" + item["avatar"]} sx={{ position: "inherit" }} className=" min-h-[120px] min-w-[120px] m-2" />
diff --git a/src/app/recurso/[id]/components/resourceInfo.js b/src/app/recurso/[id]/components/resourceInfo.js
index 331adcc380b92267f1864a04ab6f517e8bac77ac..5916bfd9049b76ea5797c8a472bf636a42d32313 100644
--- a/src/app/recurso/[id]/components/resourceInfo.js
+++ b/src/app/recurso/[id]/components/resourceInfo.js
@@ -54,7 +54,7 @@ export default function ResourceInfo({ learningObject }) {
<Tab className="hover:bg-slate-300 rounded-lg" value="metrics" label="Métricas" />
</Tabs>
{viewMore ? (
- <div className="text-sm flex-shrink-0" ref={viewMoreComponentRef}>
+ <div className="text-sm flex-shrink-0 p-2" ref={viewMoreComponentRef}>
{content[value]}
</div>
) : (