From a7cb23fbfde914443f322c603b6c81dd7acd1dc0 Mon Sep 17 00:00:00 2001 From: Wendy Yuchen Sun Date: Tue, 24 Apr 2018 21:50:30 +0800 Subject: [PATCH] Always show type column in alert table --- app/assets/javascripts/components/alerts/alert.jsx | 2 +- app/assets/javascripts/components/alerts/alerts_list.jsx | 1 - app/assets/stylesheets/modules/_tables.styl | 4 ++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/components/alerts/alert.jsx b/app/assets/javascripts/components/alerts/alert.jsx index de636e9e4d..ce33912484 100644 --- a/app/assets/javascripts/components/alerts/alert.jsx +++ b/app/assets/javascripts/components/alerts/alert.jsx @@ -6,7 +6,7 @@ const Alert = ({ alert }) => { return ( {moment(alert.created_at).format('YYYY-MM-DD h:mm A')} - {alert.type} + {alert.type} {alert.course} {alert.user} {alert.article} diff --git a/app/assets/javascripts/components/alerts/alerts_list.jsx b/app/assets/javascripts/components/alerts/alerts_list.jsx index 1d5af87425..d2ac726fe2 100644 --- a/app/assets/javascripts/components/alerts/alerts_list.jsx +++ b/app/assets/javascripts/components/alerts/alerts_list.jsx @@ -15,7 +15,6 @@ const AlertsList = ({ alerts, sortBy }) => { }, type: { label: I18n.t('campaign.alert_type'), - desktop_only: true }, course: { label: I18n.t('campaign.course'), diff --git a/app/assets/stylesheets/modules/_tables.styl b/app/assets/stylesheets/modules/_tables.styl index c27c715c17..eb7bf9ab40 100644 --- a/app/assets/stylesheets/modules/_tables.styl +++ b/app/assets/stylesheets/modules/_tables.styl @@ -39,6 +39,10 @@ &:last-child border-right 1px solid #ddd + @media only screen and (max-width: 919px) + &.alert-type + border-left 1px solid #ddd + // Table cell with links .table-link-cell padding 0px 0px