Skip to content

Commit

Permalink
fix(#1407): fix visualization in 1024px viewport (#1420)
Browse files Browse the repository at this point in the history
(cherry picked from commit 7e224d4)

- styles of selectors for 1024px screens (#1441)
(cherry picked from commit 4646c17)
  • Loading branch information
leiyre authored and frascuchon committed May 10, 2022
1 parent 261f53a commit 46f8d4d
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 27 deletions.
2 changes: 1 addition & 1 deletion frontend/assets/scss/abstract/mixins/_media-queries.scss
Expand Up @@ -43,7 +43,7 @@
/// @example scss - Creates a single breakpoint with the label `phone`
/// $breakpoints: ('phone': 320px);
///
$breakpoints: ( 'phone': 320px, 'tablet': 768px, 'desktop': 1024px, 'desktopLarge': 1450px, 'xxl': 1900px, ) !default;
$breakpoints: ( 'phone': 320px, 'tablet': 768px, 'desktop': 1100px, 'desktopLarge': 1450px, 'xxl': 1900px, ) !default;
///
/// Creates a list of static expressions or media types
///
Expand Down
Expand Up @@ -124,7 +124,7 @@ export default {
}
&__content {
position: absolute;
top: 50px;
top: calc(100% + 10px);
left: 0;
margin-top: 0;
box-shadow: $shadow;
Expand Down
5 changes: 4 additions & 1 deletion frontend/components/commons/header/filters/FiltersArea.vue
Expand Up @@ -147,8 +147,11 @@ export default {
width: calc(100% - 300px);
}
&__searchbar {
margin-right: 2em;
margin-right: 10px;
width: 100%;
@include media(">desktop") {
margin-right: 15px;
}
&.--extended {
width: 100%;
margin-right: 0;
Expand Down
26 changes: 13 additions & 13 deletions frontend/components/commons/header/filters/FiltersList.vue
Expand Up @@ -288,35 +288,31 @@ $number-size: 18px;
$this: &;
position: relative;
display: inline-block;
z-index: 2;
&__list {
display: flex;
&__content {
width: 455px;
left: 0;
right: 0;
right: -10em;
margin: auto;
position: absolute;
top: calc(100% + 1em);
top: calc(100% + 10px);
box-shadow: $shadow;
background: $lighter-color;
padding: 20px 20px 10px 4em;
border-radius: $border-radius;
max-height: 550px;
z-index: 2;
@include media(">desktop") {
left: 0;
right: 0;
}
&--sort {
max-width: 410px;
}
&--large {
// width: 910px;
max-height: 80vh;
overflow: auto;
& > span {
// display: inline-block;
// width: 50%;
// &:nth-child(2n + 1) {
// padding-right: 1em;
// }
}
}
}
&__item {
Expand All @@ -341,13 +337,17 @@ $number-size: 18px;
position: relative;
margin-bottom: 0;
margin-top: 0;
padding: 0.8em 1em;
padding: 0.8em;
border-radius: $border-radius;
margin-right: 1em;
margin-right: 10px;
color: $font-secondary;
@include font-size(15px);
font-family: $sff;
white-space: nowrap;
@include media(">desktop") {
padding: 0.8em 1em;
margin-right: 15px;
}
&:hover {
background: palette(grey, smooth);
}
Expand Down
5 changes: 4 additions & 1 deletion frontend/components/core/ReTag.vue
Expand Up @@ -20,11 +20,14 @@ export default {
border-radius: 8px;
padding: 0.3em 1em;
margin: 3.5px;
max-width: 200px;
max-width: 175px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
vertical-align: top;
background: palette(grey, bg);
@include media(">desktopLarge") {
max-width: 200px;
}
}
</style>
12 changes: 9 additions & 3 deletions frontend/components/core/table/ReTableInfo.vue
Expand Up @@ -478,6 +478,11 @@ export default {
@include font-size(14px);
font-family: $sff;
text-align: left;
@include media("<=desktop") {
.svg-icon {
display: block;
}
}
span {
white-space: nowrap;
}
Expand All @@ -494,7 +499,7 @@ export default {
&__item {
position: relative;
list-style: none;
padding: 2em 8em 2em 2em;
padding: 2em 5em 2em 2em;
display: flex;
width: 100%;
border-bottom: 1px solid $line-light-color;
Expand All @@ -509,8 +514,9 @@ export default {
max-width: 120px;
}
&:first-child {
flex-shrink: 0;
min-width: 240px;
width: auto;
min-width: auto;
flex-grow: 1.5;
}
}
.svg-icon {
Expand Down
7 changes: 7 additions & 0 deletions frontend/components/core/table/TableFiltrableColumn.vue
Expand Up @@ -228,9 +228,16 @@ button {
outline: none;
background: transparent;
padding-left: 0;
padding-right: 0;
color: $font-secondary;
@include font-size(14px);
font-family: $sff;
@include media("<=desktop") {
::v-deep svg {
margin-right: 0 !important;
display: block;
}
}
&:hover,
&.active {
background: $bg;
Expand Down
Expand Up @@ -258,13 +258,6 @@ export default {
}
&__table {
margin-bottom: 2em !important;
@include media("<=desktop") {
::v-deep .table-info__header {
.table-info__item__col:first-child button {
width: 70px;
}
}
}
::v-deep {
.table-info__item__col {
width: 130px;
Expand Down

0 comments on commit 46f8d4d

Please sign in to comment.