Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ajustes de estilo e funcionamento da busca avançada #271

Merged
merged 5 commits into from
Jul 10, 2019
Merged

Ajustes de estilo e funcionamento da busca avançada #271

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4549ac1
Ajustes de estilo e funcionamento da busca avançada
agnogueira Jun 27, 2019
73f0e50
Update changelog
agnogueira Jun 27, 2019
e71c659
Corrige o posicionamento do menu quando esta sobre a busca avancada
agnogueira Jun 27, 2019
2630702
Merge branch 'master' into ajustes-busca
rodfersou Jul 9, 2019
451ede1
Merge branch 'master' into ajustes-busca
rodfersou Jul 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ Changelog
2.0.4 (unreleased)
^^^^^^^^^^^^^^^^^^

- Corrige estilos e funcionamento dos filtros da busca.
[agnogueira]

- Correções de contraste(fecha `#264 <https://github.com/plonegovbr/brasil.gov.temas/issues/264>`_).
[agnogueira]

Expand Down
2 changes: 1 addition & 1 deletion webpack/app/brasilgovtemas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ $(() => {
if ($('.template-centrais-de-conteudo')[0] != null) {
new ContentCentral();
}
if ($('.template-filtro-de-resultados')[0] != null) {
if ($('.template-busca')[0] != null) {
new ResultsFilter();
}
if ($('#viewlet-social-like')[0] != null) {
Expand Down
2 changes: 1 addition & 1 deletion webpack/app/scss/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ header#main-header {
position: absolute;
left: 0;
right: 0;
z-index: 1;
z-index: 2;
box-shadow: 0 8px 6px -6px #ccc;


Expand Down
18 changes: 13 additions & 5 deletions webpack/app/scss/_search.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#search-field {
border: 1px solid #ccc !important;
border-bottom: 0;
margin: 0 13px -16px 12px;
margin: 0 -5px -16px 12px;
padding: 10px;
text-align: left;

Expand Down Expand Up @@ -40,7 +40,7 @@
}
form .actionMenuHeader {
position: absolute;
top: -40px;
top: -50px;
right: 40px;
border-left: 1px solid #ccc;
padding-left: 30px;
Expand All @@ -57,6 +57,9 @@
color: #333;
}
}
#content #search-filter fieldset {
margin-right: 25px;
}
#search-results-wrapper {
position: initial;
}
Expand All @@ -66,7 +69,7 @@
padding: 1em;
box-sizing: border-box;
border: 1px solid #ccc;
margin: -1px 0 30px 12px;
margin: -1px 0 30px -4px;

dl {
float: none;
Expand Down Expand Up @@ -94,6 +97,12 @@
bottom: 20px;
right: 20px;
}
.actionMenuContent.closed {
display: none;
}
#search-filter-toggle.closed:after {
transform: rotate(180deg);
}
}
#search-results-bar.open {
border: 1px solid #ccc;
Expand Down Expand Up @@ -218,7 +227,7 @@
white-space: nowrap;
float: right;
margin-left: 5px;
margin-top: 5px;
margin-top: 2px;
}

#search-filter-toggle.open:after {
Expand Down Expand Up @@ -516,4 +525,3 @@ fieldset.noborder {
#results ul:first-child li:nth-child(5n-0) {background: #53cfd0 !important;}

#results ul:first-child li:nth-child(4n-3) {margin-left: 0;}