From 91daec579db269b9a63d44871f7aed2cad72f675 Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Wed, 17 May 2023 01:13:09 +0200 Subject: [PATCH] Reverted to the previous style for entities on mobile. Better to use screen width wisely and avoid unnecessary padding. --- .../src/components/panels/Entities/Index.vue | 24 ++------ .../components/panels/Entities/common.scss | 57 +------------------ 2 files changed, 8 insertions(+), 73 deletions(-) diff --git a/platypush/backend/http/webapp/src/components/panels/Entities/Index.vue b/platypush/backend/http/webapp/src/components/panels/Entities/Index.vue index 299b9a8f..5e851cb9 100644 --- a/platypush/backend/http/webapp/src/components/panels/Entities/Index.vue +++ b/platypush/backend/http/webapp/src/components/panels/Entities/Index.vue @@ -509,6 +509,7 @@ export default { @include until(#{$tablet - 1}) { padding: 0; + margin-bottom: $main-margin; } @include from($tablet) { @@ -524,11 +525,8 @@ export default { flex-direction: column; flex-grow: 1; position: relative; - - @include from($tablet) { - border-radius: 1em; - box-shadow: $group-shadow; - } + border-radius: 1em; + box-shadow: $group-shadow; } .header { @@ -579,10 +577,6 @@ export default { overflow: auto; flex-grow: 1; - @include until(#{$tablet - 1}) { - background: $default-bg-4; - } - @include from($tablet) { background: $default-bg-2; } @@ -590,16 +584,8 @@ export default { .entity-frame { background: $background-color; - @include until(#{$tablet - 1}) { - margin: 0.75em 0.25em; - border: $default-border-2; - border-radius: 1em; - } - - @include from($tablet) { - &:last-child { - border-radius: 0 0 1em 1em; - } + &:last-child { + border-radius: 0 0 1em 1em; } } } diff --git a/platypush/backend/http/webapp/src/components/panels/Entities/common.scss b/platypush/backend/http/webapp/src/components/panels/Entities/common.scss index 62b0d3f3..5ad49242 100644 --- a/platypush/backend/http/webapp/src/components/panels/Entities/common.scss +++ b/platypush/backend/http/webapp/src/components/panels/Entities/common.scss @@ -6,10 +6,6 @@ $collapse-toggler-width: 2em; background: $selected-bg; font-weight: bold; box-shadow: 0 0 3px 2px $default-shadow-color; - - @include until(#{$tablet - 1}) { - border-radius: 1em; - } } .entity-container { @@ -18,18 +14,7 @@ $collapse-toggler-width: 2em; align-items: center; position: relative; padding: 0 !important; - - @include until(#{$tablet - 1}) { - border-radius: 1em; - - &:not(:last-child) { - border-bottom: $default-border-3; - } - } - - @include from($tablet) { - border-bottom: $default-border-3; - } + border-bottom: $default-border-3; &.with-children:not(.collapsed) { @include expanded-entity(); @@ -50,12 +35,6 @@ $collapse-toggler-width: 2em; } @include until(#{$tablet - 1}) { - .entity-container { - .children { - border-radius: 0 0 1em 1em; - } - } - .child { &:not(:last-child) { .entity-container { @@ -239,38 +218,8 @@ $collapse-toggler-width: 2em; &.with-children:not(.collapsed) { box-shadow: 0 3px 4px 0 $default-shadow-color; - @include until(#{$tablet - 1}) { - border-radius: 1em; - } - - @include from($tablet) { - .children .child:last-child { - box-shadow: 0 3px 4px 0 $default-shadow-color; - } - } - } - - @include until(#{$tablet - 1}) { - box-shadow: 0 3px 4px 0 $default-shadow-color; - - &.collapsed { - border-radius: 1em; - } - - .children { - .entity-container-wrapper { - border-radius: 0; - box-shadow: none; - - &.with-children:not(.collapsed) { - border-radius: 1em; - box-shadow: 0 3px 4px 0 $default-shadow-color; - } - - &:last-child { - border-radius: 0 0 1em 1em; - } - } + .children .child:last-child { + box-shadow: 0 3px 4px 0 $default-shadow-color; } } }