diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-05-22 22:58:23 +0300 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-05-26 10:42:13 +0300 |
| commit | 733eec88e4c397c590165c7acd437c1889b38119 (patch) | |
| tree | d820e332fe97f54185a03ca2dd6cbd41e42832a8 /app/assets/stylesheets/framework/filters.scss | |
| parent | 8e2fefc6c44fc3c6140e5cbc4b56c58c90dc07f3 (diff) | |
Backport canEdit changes for conditional remove button
Backport Fix locked milestone in boards being remove-able.
See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1963
Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/2433
Conflicts:
app/assets/javascripts/boards/boards_bundle.js
app/assets/javascripts/boards/filtered_search_boards.js
app/assets/javascripts/filtered_search/filtered_search_manager.js
spec/features/boards/boards_spec.rb
Diffstat (limited to 'app/assets/stylesheets/framework/filters.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/filters.scss | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss index f0994e968c8..d191bbb226c 100644 --- a/app/assets/stylesheets/framework/filters.scss +++ b/app/assets/stylesheets/framework/filters.scss @@ -104,6 +104,22 @@ padding: 2px 7px; } + .name { + background-color: $filter-name-resting-color; + color: $filter-name-text-color; + border-radius: 2px 0 0 2px; + margin-right: 1px; + text-transform: capitalize; + } + + .value-container { + background-color: $white-normal; + color: $filter-value-text-color; + border-radius: 0 2px 2px 0; + margin-right: 5px; + padding-right: 8px; + } + .value { padding-right: 0; } @@ -111,7 +127,7 @@ .remove-token { display: inline-block; padding-left: 4px; - padding-right: 8px; + padding-right: 0; .fa-close { color: $gl-text-color-secondary; @@ -132,21 +148,6 @@ } } - .name { - background-color: $filter-name-resting-color; - color: $filter-name-text-color; - border-radius: 2px 0 0 2px; - margin-right: 1px; - text-transform: capitalize; - } - - .value-container { - background-color: $white-normal; - color: $filter-value-text-color; - border-radius: 0 2px 2px 0; - margin-right: 5px; - } - .selected { .name { background-color: $filter-name-selected-color; |