Skip to content

Commit

Permalink
Always show type column in alert table
Browse files Browse the repository at this point in the history
  • Loading branch information
wendyyuchensun committed Apr 25, 2018
1 parent 00daa26 commit a7cb23f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/assets/javascripts/components/alerts/alert.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const Alert = ({ alert }) => {
return (
<tr className="alert">
<td className="desktop-only-tc date">{moment(alert.created_at).format('YYYY-MM-DD h:mm A')}</td>
<td className="desktop-only-tc">{alert.type}</td>
<td className="alert-type">{alert.type}</td>
<td className="desktop-only-tc"><a target="_blank" href={`/courses/${alert.course_slug}`}>{alert.course}</a></td>
<td className="desktop-only-tc"><a target="_blank" href={`/users/${alert.user}`}>{alert.user}</a></td>
<td><a target="_blank" href={alert.article_url}>{alert.article}</a></td>
Expand Down
1 change: 0 additions & 1 deletion app/assets/javascripts/components/alerts/alerts_list.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ const AlertsList = ({ alerts, sortBy }) => {
},
type: {
label: I18n.t('campaign.alert_type'),
desktop_only: true
},
course: {
label: I18n.t('campaign.course'),
Expand Down
4 changes: 4 additions & 0 deletions app/assets/stylesheets/modules/_tables.styl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a7cb23f

Please sign in to comment.