From 37085927c9a0dcbc0796ab8a1f13709245b8e34e Mon Sep 17 00:00:00 2001 From: Brian Guthrie Date: Sat, 17 Aug 2013 15:15:54 -0400 Subject: [PATCH] Charts get grid-system widths. --- app/assets/stylesheets/application.css.scss | 11 ++++++----- app/views/admin/dashboard/index.html.haml | 10 +++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index a2cea72f..1f232f70 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -33,11 +33,6 @@ input { margin-top: 20px } -iframe.chart { - border: none; - height: 180px; -} - #footer { font-size: 12px; text-align: center; @@ -200,3 +195,9 @@ i.icon-line:after { content: "―"; } padding: 6px 16px; > span { margin-left: 16px; &:first-child { margin-left: 0; } } } + +iframe.chart { + border: none; + height: 180px; + &[class*="span"] { margin-left: 0; } +} diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index 55bd1f6d..499f0c8e 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -59,7 +59,7 @@ %td.point= float_to_percentage @statistics.nps_24h.ups %td.point= float_to_percentage @statistics.nps_60m.ups - %iframe.chart{src: nps_chart} + %iframe.chart.span6{src: nps_chart} %div.span6 %table.table.table-condensed.bordered-table.table-striped @@ -91,7 +91,7 @@ %td.point= float_to_percentage @statistics.npfs_24h.ups %td.point= float_to_percentage @statistics.npfs_60m.ups - %iframe.chart{ src: facebook_actions_chart } + %iframe.chart.span6{ src: facebook_actions_chart } %div.row @@ -191,14 +191,14 @@ %div.span6 %h4 Unsubscribed - %iframe.chart{ src: unsubscribes_chart } + %iframe.chart.span6{ src: unsubscribes_chart } %h4 Sent - %iframe.chart{ src: emails_sent_chart } + %iframe.chart.span6{ src: emails_sent_chart } %div.span6 %h4 Facebook Referrals - %iframe.chart{ src: facebook_referrals_chart } + %iframe.chart.span6{ src: facebook_referrals_chart } - content_for :javascripts do