diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json index 99a17c12..cd470d0d 100644 --- a/app/locales/taiga/locale-en.json +++ b/app/locales/taiga/locale-en.json @@ -755,7 +755,8 @@ }, "US_STATUS": { "ACTION_ADD_STATUS": "Add new status", - "IS_ARCHIVED_COLUMN": "Is archived?", + "IS_ARCHIVED_COLUMN": "Archived", + "IS_CLOSED_COLUMN": "Closed", "WIP_LIMIT_COLUMN": "WIP Limit", "PLACEHOLDER_WRITE_NAME": "Write a name for the new status" }, diff --git a/app/partials/includes/modules/admin/project-us-status.jade b/app/partials/includes/modules/admin/project-us-status.jade index 684e817d..62445f7a 100644 --- a/app/partials/includes/modules/admin/project-us-status.jade +++ b/app/partials/includes/modules/admin/project-us-status.jade @@ -11,7 +11,7 @@ section.project-us-status div.color-column(translate="COMMON.FIELDS.COLOR") div.status-name(translate="COMMON.FIELDS.NAME") div.status-slug(translate="COMMON.FIELDS.SLUG") - div.is-closed-column(translate="COMMON.FIELDS.IS_CLOSED") + div.is-closed-column(translate="ADMIN.US_STATUS.IS_CLOSED_COLUMN") div.is-archived-column(translate="ADMIN.US_STATUS.IS_ARCHIVED_COLUMN") div.status-wip-limit(translate="ADMIN.US_STATUS.WIP_LIMIT_COLUMN") div.options-column diff --git a/app/styles/dependencies/responsive.scss b/app/styles/dependencies/responsive.scss index 3d4f8457..b88606cb 100644 --- a/app/styles/dependencies/responsive.scss +++ b/app/styles/dependencies/responsive.scss @@ -1,6 +1,6 @@ @mixin breakpoint($point) { @if $point == desktop { - @media (min-width: 1200px) { @content ; } + @media (min-width: 1400px) { @content ; } } @else if $point == laptop { @media (max-width: 1280px) { @content ; } diff --git a/app/styles/modules/common/colors-table.scss b/app/styles/modules/common/colors-table.scss index fabf7df4..902fa371 100644 --- a/app/styles/modules/common/colors-table.scss +++ b/app/styles/modules/common/colors-table.scss @@ -79,9 +79,16 @@ flex-basis: 100px; } .status-slug { + display: none; flex-basis: 150px; flex-grow: 6; padding: 0 10px; + @include breakpoint(desktop) { + display: block; + } + span { + @include ellipsis(100%); + } } .options-column { max-width: 100px; @@ -94,13 +101,17 @@ text-align: center; } .is-closed-column { - max-width: 130px; + max-width: 100px; text-align: center; } .status-wip-limit { - max-width: 130px; + display: none; + max-width: 100px; padding: 0 0 0 10px; text-align: center; + @include breakpoint(desktop) { + display: block; + } } } @@ -163,4 +174,5 @@ visibility: hidden; } } + }