Skip to content
Snippets Groups Projects
Commit 700ab886 authored by Henrique Varella Ehrenfried's avatar Henrique Varella Ehrenfried :speech_balloon:
Browse files

Improve search layout

parent 2e19a369
No related branches found
No related tags found
5 merge requests!57Merge of develop into master,!56Fixed buttons reportar, seguir, compartilhar, guardar and entrar (in comments...,!39Update admin system,!32Homologa,!31Fix console error
.MuiAccordionActions-root{
display: block !important;
}
.MuiListItemIcon-root{
min-width: 30px !important;
}
...@@ -13,6 +13,8 @@ import { TextField } from "@material-ui/core"; ...@@ -13,6 +13,8 @@ import { TextField } from "@material-ui/core";
import Grid from '@material-ui/core/Grid'; import Grid from '@material-ui/core/Grid';
import CircularProgress from '@material-ui/core/CircularProgress'; import CircularProgress from '@material-ui/core/CircularProgress';
import './ExpansionPanel.css'
const ExpansionPanel = withStyles({ const ExpansionPanel = withStyles({
root: { root: {
border: "1px solid rgba(0, 0, 0, .125)", border: "1px solid rgba(0, 0, 0, .125)",
...@@ -101,7 +103,7 @@ export default function SearchExpansionPanel(props) { ...@@ -101,7 +103,7 @@ export default function SearchExpansionPanel(props) {
style={{ style={{
fontSize: "18px", fontSize: "18px",
textTransform: "uppercase", textTransform: "uppercase",
fontWeight: "500" fontWeight: "500",
}} }}
> >
Filtros Filtros
......
...@@ -141,7 +141,7 @@ export default function Search(props) { ...@@ -141,7 +141,7 @@ export default function Search(props) {
return ( return (
<div style={{ backgroundColor: "#f4f4f4" }}> <div style={{ backgroundColor: "#f4f4f4" }}>
<Principal> <Principal>
<BreadCrumbsDiv> <BreadCrumbsDiv style={{margin:"15px 2%", }}>
<StyledBreadCrumbs> <StyledBreadCrumbs>
<Link to="/">Página Inicial</Link> <Link to="/">Página Inicial</Link>
<span>Busca</span> <span>Busca</span>
...@@ -152,7 +152,7 @@ export default function Search(props) { ...@@ -152,7 +152,7 @@ export default function Search(props) {
<HeaderFilters elevation={4} square> <HeaderFilters elevation={4} square>
<Grid container spacing={0} style={{ height: "100%" }}> <Grid container spacing={0} style={{ height: "100%" }}>
<Grid item xs style={{display:"flex", flexDirection:"column", justifyContent:"center", paddingLeft:20}}> <Grid item xs style={{display:"flex", flexDirection:"column", justifyContent:"center", paddingLeft:20}}>
<div style={{ marginRight:5 }}> <div style={{ marginRight:5, marginTop:15 }}>
<div className="textInfo"> <div className="textInfo">
<span style={{ fontWeight:"bold" }}> <span style={{ fontWeight:"bold" }}>
MOSTRAR MOSTRAR
...@@ -171,7 +171,7 @@ export default function Search(props) { ...@@ -171,7 +171,7 @@ export default function Search(props) {
{ {
optionResult === "User" ? null : optionResult === "User" ? null :
<Grid item xs style={{display: "flex", flexDirection: "column", justifyContent: "center", paddingRight: 20,}}> <Grid item xs style={{display: "flex", flexDirection: "column", justifyContent: "center", paddingRight: 20,}}>
<div style={{marginLeft:5}}> <div style={{marginLeft:5, marginTop:15}}>
<div className="textInfo"> <div className="textInfo">
<span style={{ fontWeight:"bold" }}> <span style={{ fontWeight:"bold" }}>
ORDENAR POR ORDENAR POR
...@@ -187,14 +187,15 @@ export default function Search(props) { ...@@ -187,14 +187,15 @@ export default function Search(props) {
</div> </div>
</Grid> </Grid>
} }
<Grid item xs={12}>
<div style={{display: "flex", flexDirection: "column", justifyContent: "center" }}>
<div style={{textAlign: "center", paddingTop: 10, fontWeight:"bolder"}}>
Exibindo {totalResults === 0 ? 0 : resultsPerPage} resultados de {totalResults} encontrados
</div>
</div>
</Grid>
</Grid> </Grid>
</HeaderFilters> </HeaderFilters>
<div style={{display: "flex", flexDirection: "column", justifyContent: "center" }}>
<div style={{textAlign: "center", paddingTop: 10, paddingBottom:30, fontWeight:"bolder"}}>
Exibindo {totalResults === 0 ? 0 : resultsPerPage} resultados de {totalResults} encontrados
</div>
</div>
{ {
isloading ? <LoadingSpinner text="Carregando..." /> : isloading ? <LoadingSpinner text="Carregando..." /> :
...@@ -238,15 +239,19 @@ export default function Search(props) { ...@@ -238,15 +239,19 @@ export default function Search(props) {
optionResult === "LearningObject" ? ( optionResult === "LearningObject" ? (
<GridBuscaResource container spacing={2}> <GridBuscaResource container spacing={2}>
<Grid item xs={12} md={3}> <Grid item xs={12} md={2}>
<Paper elevation={4} square> <Grid container >
<SearchExpansionPanel onChange={collectStuff} onFiltering={isFiltering} /> <Grid item xs={12}>
</Paper> <Paper elevation={4} square>
<SearchExpansionPanel onChange={collectStuff} onFiltering={isFiltering} />
</Paper>
</Grid>
</Grid>
</Grid> </Grid>
<Grid item xs> <Grid item xs>
<Grid container spacing={2}> <Grid container spacing={2}>
{resultsResource.map((card) => ( {resultsResource.map((card) => (
<Grid item xs key={card.id}> <Grid item xs={12} sm={6} md={4} lg={3} key={card.id}>
<ResourceCardFunction <ResourceCardFunction
avatar={card.publisher.avatar} avatar={card.publisher.avatar}
id={card.id} id={card.id}
...@@ -391,7 +396,7 @@ const GridBuscaUser = styled(Grid)` ...@@ -391,7 +396,7 @@ const GridBuscaUser = styled(Grid)`
`; `;
const HeaderFilters = styled(Paper)` const HeaderFilters = styled(Paper)`
height: 110px; height: 150px;
text-align: center; text-align: center;
background-color: #fff; background-color: #fff;
margin-bottom: 30px; margin-bottom: 30px;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment