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

fixing displaced property title if tooltip icon shown #1052

Merged
merged 2 commits into from
Apr 9, 2019
Merged

fixing displaced property title if tooltip icon shown #1052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef4eac6
fixing displaced property title if tooltip icon shown
Apr 9, 2019
b6599d7
unify input field margins (the inherited style has 3px margin-right w…
Apr 9, 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
13 changes: 8 additions & 5 deletions css/Properties/Properties.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,22 @@ $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 {
margin: $grid-input-margin 5px $grid-input-margin 0;
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;

Expand Down Expand Up @@ -174,7 +174,7 @@ $property-value-max-width: 250px;
opacity: .7;
}
}

// Delete property button + actions
&__actions {
position: absolute !important;
Expand All @@ -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;
Expand All @@ -199,4 +199,7 @@ $property-value-max-width: 250px;
}
}
}
.property__value {
margin-right: 0;
}
}
6 changes: 5 additions & 1 deletion css/Properties/PropertyTitle.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
8 changes: 4 additions & 4 deletions src/components/Properties/PropertyTitle.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
<template>
<h3 class="property__title property__row">
<div :class="icon" class="property__label property__title--icon" />
<span class="property__value">
{{ readableName }}
<span class="property__value property__title--right">
<div>{{ readableName }}</div>
<!-- display tooltip with hint if available -->
<div v-if="info" v-tooltip.auto="info" class="property__title--icon-details icon-details" />
</span>
<!-- display tooltip with hint if available -->
<div v-if="info" v-tooltip.auto="info" class="property__title--icon-details icon-details" />
</h3>
</template>

Expand Down