Merge pull request #7962 from opf/fix/31896-Text-in-custom-field-not-correctly-displayed

[31896] Text in custom field not correctly displayed
pull/7967/head
Henriette Dinger 5 years ago committed by GitHub
commit c91fbdd6b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      app/assets/stylesheets/content/_autocomplete.sass
  2. 4
      app/assets/stylesheets/content/work_packages/_table_content.sass
  3. 10
      app/assets/stylesheets/content/work_packages/inplace_editing/_display_fields.sass
  4. 2
      frontend/src/app/modules/grids/widgets/custom-text/custom-text.component.ts

@ -175,7 +175,7 @@ mark.ui-autocomplete-match
height: initial !important height: initial !important
min-height: initial !important min-height: initial !important
.wp-table--cell-container & .ng-value-label .ng-value-label
display: initial !important display: initial !important
// Ensure dropdown is above modals // Ensure dropdown is above modals

@ -84,6 +84,9 @@
td td
padding: 0 !important padding: 0 !important
.group--value
@include text-shortener
// Shrink column of details / inline-create icons // Shrink column of details / inline-create icons
.wp-table--configuration-modal--trigger .wp-table--configuration-modal--trigger
width: 60px width: 60px
@ -124,6 +127,7 @@ html:not(.-browser-mobile)
@extend .ellipsis @extend .ellipsis
display: inline-block display: inline-block
vertical-align: middle vertical-align: middle
width: 100%
.wp-table--cell-td.-editing & .wp-table--cell-td.-editing &
display: block display: block
width: initial !important width: initial !important

@ -54,10 +54,20 @@
.custom-option .custom-option
@include text-shortener @include text-shortener
white-space: normal white-space: normal
&:not(.-multiple-lines) &:not(.-multiple-lines)
display: inline display: inline
white-space: nowrap white-space: nowrap
// Leave space for the badge
&:not(:only-child)
max-width: 90%
display: inline-block
vertical-align: middle
line-height: 32px
&:first-of-type
padding-right: 5px
&.split-time-field &.split-time-field
white-space: nowrap white-space: nowrap

@ -75,7 +75,7 @@ export class WidgetCustomTextComponent extends AbstractWidgetComponent implement
} }
public get inplaceEditClasses() { public get inplaceEditClasses() {
let classes = 'inplace-editing--container inline-edit--display-field inline-edit--display-field -editable'; let classes = 'inplace-editing--container inline-edit--display-field -editable';
if (this.textEmpty) { if (this.textEmpty) {
classes += ' -placeholder'; classes += ' -placeholder';

Loading…
Cancel
Save