Compare commits

..

No commits in common. "eb262fe2b25e0edd9b5ca6e8972d62f37b2e9ff9" and "5064491e29d223ba18ebf321a896a079ab00a99d" have entirely different histories.

5 changed files with 6 additions and 49 deletions

View File

@ -1677,32 +1677,19 @@ Add your custom styles in this file so it is easier to update the theme.
}
@media screen and (max-width: 48em) {
<<<<<<< HEAD
.edit-post-visual-editor__content-area .ofisuport-filters section {
display: inline-block;
=======
.edit-post-visual-editor__content-area .post,
.edit-post-visual-editor__content-area .page {
margin: 0 0 1em;
}
.edit-post-visual-editor__content-area .ofisuport-filters section {
display: block;
>>>>>>> dev
}
.edit-post-visual-editor__content-area .ofisuport-filters section h5 {
display: block;
display: inline-block;
width: 100%;
}
.edit-post-visual-editor__content-area .ofisuport-filters section .filter {
display: inline-block;
width: 45%;
margin-top: 0.5rem;
margin-right: 0.3em;
float: left;
}
.edit-post-visual-editor__content-area .ofisuport-filters section .filter:last-of-type {
margin-bottom: 2rem;
}
}
@media screen and (min-width: 48em) {

File diff suppressed because one or more lines are too long

View File

@ -153,27 +153,18 @@
@media screen and (max-width: 48em) {
//only smaller than 48em
.post,
.page {
margin: 0 0 1em;
}
.ofisuport-filters {
section {
display: block;
display: inline-block;
h5 {
display: block;
display: inline-block;
width: 100%;
}
.filter {
display: inline-block;
width: 45%;
margin-top: 0.5rem;
margin-right: 0.3em;
float: left;
&:last-of-type {
margin-bottom: 2rem;
}
}
}
}

View File

@ -1612,32 +1612,19 @@ textarea {
}
@media screen and (max-width: 48em) {
<<<<<<< HEAD
.ofisuport-filters section {
display: inline-block;
=======
.post,
.page {
margin: 0 0 1em;
}
.ofisuport-filters section {
display: block;
>>>>>>> dev
}
.ofisuport-filters section h5 {
display: block;
display: inline-block;
width: 100%;
}
.ofisuport-filters section .filter {
display: inline-block;
width: 45%;
margin-top: 0.5rem;
margin-right: 0.3em;
float: left;
}
.ofisuport-filters section .filter:last-of-type {
margin-bottom: 2rem;
}
}
@media screen and (min-width: 48em) {

File diff suppressed because one or more lines are too long