From 6bf08a9f3dd0b27b33cbce602002864debe0acf4 Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Fri, 17 Jan 2020 11:59:46 +0100 Subject: [PATCH 1/2] Update counter visability --- app/assets/stylesheets/repository_columns/list_type.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/repository_columns/list_type.scss b/app/assets/stylesheets/repository_columns/list_type.scss index c14341305..e41ed77d1 100644 --- a/app/assets/stylesheets/repository_columns/list_type.scss +++ b/app/assets/stylesheets/repository_columns/list_type.scss @@ -30,10 +30,10 @@ .limit-counter-container { @include font-small; bottom: 0; - color: $brand-danger; - display: none; + color: $color-silver-chalice; &.error-to-many-items { + color: $brand-danger; display: inline; } } From 58ed1d3f8a76d2d9c32fed3e65a13c08d7329abc Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Fri, 17 Jan 2020 12:14:50 +0100 Subject: [PATCH 2/2] Update default delimiter for new records --- .../manage_column_partials/_checklist.html.erb | 2 +- .../repository_columns/manage_column_partials/_list.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/repository_columns/manage_column_partials/_checklist.html.erb b/app/views/repository_columns/manage_column_partials/_checklist.html.erb index b0b8c1be0..cfa36aecf 100644 --- a/app/views/repository_columns/manage_column_partials/_checklist.html.erb +++ b/app/views/repository_columns/manage_column_partials/_checklist.html.erb @@ -1,6 +1,6 @@ <% delimiters = defined_delimiters_options - selected_delimiter = column.metadata['delimiter'] || 'return' + selected_delimiter = column.new_record? ? 'auto' : column.metadata['delimiter'] || 'return' selected_delimiter_char = Constants::REPOSITORY_LIST_ITEMS_DELIMITERS_MAP[selected_delimiter.to_sym] %> diff --git a/app/views/repository_columns/manage_column_partials/_list.html.erb b/app/views/repository_columns/manage_column_partials/_list.html.erb index 6a33f9cbe..58f05982e 100644 --- a/app/views/repository_columns/manage_column_partials/_list.html.erb +++ b/app/views/repository_columns/manage_column_partials/_list.html.erb @@ -1,6 +1,6 @@ <% delimiters = defined_delimiters_options - selected_delimiter = column.metadata['delimiter'] || 'return' + selected_delimiter = column.new_record? ? 'auto' : column.metadata['delimiter'] || 'return' selected_delimiter_char = Constants::REPOSITORY_LIST_ITEMS_DELIMITERS_MAP[selected_delimiter.to_sym] %>