From ef4eac61f7536e770cd72a62783382854ae299e0 Mon Sep 17 00:00:00 2001 From: Andreas Demmelbauer Date: Tue, 9 Apr 2019 10:41:32 -0700 Subject: [PATCH 1/2] fixing displaced property title if tooltip icon shown --- css/Properties/PropertyTitle.scss | 6 +++++- src/components/Properties/PropertyTitle.vue | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/css/Properties/PropertyTitle.scss b/css/Properties/PropertyTitle.scss index 63c30c664..aaa923041 100644 --- a/css/Properties/PropertyTitle.scss +++ b/css/Properties/PropertyTitle.scss @@ -27,10 +27,14 @@ opacity: 0.6; user-select: none; + .property__title--right { + display: flex; + justify-content: space-between; + } .property__title--icon { background-position: center right; } .property__title--icon-details { margin-left: 7px; } -} \ No newline at end of file +} diff --git a/src/components/Properties/PropertyTitle.vue b/src/components/Properties/PropertyTitle.vue index 44a73a22a..56d64b8f3 100644 --- a/src/components/Properties/PropertyTitle.vue +++ b/src/components/Properties/PropertyTitle.vue @@ -23,11 +23,11 @@ From b6599d749b952887688458cfdafcd9f9431deaea Mon Sep 17 00:00:00 2001 From: Andreas Demmelbauer Date: Tue, 9 Apr 2019 11:23:07 -0700 Subject: [PATCH 2/2] unify input field margins (the inherited style has 3px margin-right which moves the form) --- css/Properties/Properties.scss | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/css/Properties/Properties.scss b/css/Properties/Properties.scss index b659a5d25..262761dd2 100644 --- a/css/Properties/Properties.scss +++ b/css/Properties/Properties.scss @@ -41,14 +41,14 @@ $property-value-max-width: 250px; &--addressbooks &__actions { display: none !important; } - + // property row &__row { display: flex; align-items: center; position: relative; } - + // property label or multiselect within row &__label, &__label.multiselect { @@ -56,7 +56,7 @@ $property-value-max-width: 250px; padding: $grid-input-padding 0; flex: 1 0; // min width is 60px, let's grow until 120px height: $grid-input-height-with-margin; - width: $property-label-min-width; + width: $property-label-min-width; min-width: $property-label-min-width !important; // override multiselect max-width: $property-label-max-width; @@ -174,7 +174,7 @@ $property-value-max-width: 250px; opacity: .7; } } - + // Delete property button + actions &__actions { position: absolute !important; @@ -185,7 +185,7 @@ $property-value-max-width: 250px; border: 0; background-color: transparent; z-index: 10; - // opacity applies on the single action OR + // opacity applies on the single action OR &:not(.action-item--multiple), &.action-item--multiple .icon-more { opacity: 0.5; @@ -199,4 +199,7 @@ $property-value-max-width: 250px; } } } + .property__value { + margin-right: 0; + } }