From 0aecc9d34cab1b794fe62f214422916eed12468b Mon Sep 17 00:00:00 2001 From: evazion Date: Fri, 14 Sep 2018 10:08:13 -0500 Subject: [PATCH] css: fix `020_base.scss` getting imported twice. This import caused all in the rules in 020_base.scss to be included twice in the final stylesheet. --- app/javascript/src/styles/specific/api_keys.scss | 6 ------ app/views/maintenance/user/api_keys/view.html.erb | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/app/javascript/src/styles/specific/api_keys.scss b/app/javascript/src/styles/specific/api_keys.scss index 5f6db1e19..22de437f1 100644 --- a/app/javascript/src/styles/specific/api_keys.scss +++ b/app/javascript/src/styles/specific/api_keys.scss @@ -1,10 +1,4 @@ -@import "../base/020_base.scss"; - #c-maintenance-user-api-keys { - #api-key { - @extend code; - } - .button_to { display: inline-block; } diff --git a/app/views/maintenance/user/api_keys/view.html.erb b/app/views/maintenance/user/api_keys/view.html.erb index 82fcc650a..ad232458c 100644 --- a/app/views/maintenance/user/api_keys/view.html.erb +++ b/app/views/maintenance/user/api_keys/view.html.erb @@ -14,7 +14,7 @@ - <%= @api_key.key %> + <%= @api_key.key %> <%= compact_time @api_key.created_at %> <%= compact_time @api_key.updated_at %>