From c07f226dd4e58a4e7fc8af4d04241a6767953fe6 Mon Sep 17 00:00:00 2001 From: Kevin Granger Date: Thu, 29 Aug 2013 16:17:40 +0200 Subject: [PATCH] // fix dashboard gfx --- admin-dev/themes/default/css/admin-theme.css | 20 +++++++++++------- admin-dev/themes/default/css/admin-theme.sass | 21 +++++++------------ .../dashboard/helpers/view/view.tpl | 6 ++++-- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css index cc9eefeee..8c99977da 100644 --- a/admin-dev/themes/default/css/admin-theme.css +++ b/admin-dev/themes/default/css/admin-theme.css @@ -7304,15 +7304,15 @@ tr.filter { .color4 .value { color: #95cc6b; } -.chart rect { +.data_chart rect { fill: white; } -.chart path { +.data_chart path { stroke: white; stroke-width: 2; fill: none; } -.chart line { +.data_chart line { stroke: black; } -.chart .area { +.data_chart .area { fill: rgba(255, 255, 255, 0.3); stroke-width: 0; } @@ -7566,16 +7566,16 @@ tr.filter { #dashboard #dash_trends header { margin-bottom: 0; } #dashboard #dash_trends #dash_trends_toolbar { - margin: 4px -16px; - border-bottom: 1px solid #dddddd; } + margin: 4px -16px; } #dashboard #dash_trends dl { margin: 0; text-align: center; background-color: white; padding: 10px; - border-left: 1px solid #dddddd; } + border-left: 1px solid #dddddd; + border-bottom: 1px solid #dddddd; } #dashboard #dash_trends dl:first-child { - border: none; } + border-left: none; } #dashboard #dash_trends dl.active { background-color: #eeeeee; } #dashboard #dash_trends dt { @@ -7584,6 +7584,8 @@ tr.filter { line-height: 1em; font-size: 1.1em; font-weight: 300; } +#dashboard #dash_trends svg { + height: 350px; } #dashboard #dash_products header { margin-bottom: 0; } #dashboard #dash_products nav { @@ -7600,3 +7602,5 @@ tr.filter { background-color: #1d7878; } #dashboard #dash_products nav ul li.active a { color: white; } +#dashboard #dash_activity svg { + height: 150px; } diff --git a/admin-dev/themes/default/css/admin-theme.sass b/admin-dev/themes/default/css/admin-theme.sass index d5334acce..dcedbcbe3 100755 --- a/admin-dev/themes/default/css/admin-theme.sass +++ b/admin-dev/themes/default/css/admin-theme.sass @@ -735,7 +735,6 @@ tr.filter width: 200px - // temp fix for latest bootstrap input[type="text"],input[type="search"],input[type="password"], textarea, select @extend .form-control @@ -794,7 +793,7 @@ fieldset > .row .value color: #95CC6B -.chart +.data_chart rect fill: white path @@ -917,7 +916,6 @@ fieldset > .row .btn-group text-align: left - .panel-heading-action @extend .pull-right margin-right: -5px @@ -969,7 +967,6 @@ fieldset > .row header.panel-heading color: #555 - .data_list @extend .list-group margin: 0 0 10px 0 @@ -1057,15 +1054,15 @@ fieldset > .row margin-bottom: 0 #dash_trends_toolbar margin: 4px -16px - border-bottom: 1px solid #ddd dl margin: 0 text-align: center background-color: white padding: 10px border-left: 1px solid #ddd + border-bottom: 1px solid #ddd &:first-child - border: none + border-left: none &.active background-color: #eee dt @@ -1075,6 +1072,8 @@ fieldset > .row font-size: 1.1em font-weight: 300 dd + svg + height: 350px #dash_products header @@ -1093,12 +1092,8 @@ fieldset > .row background-color: $brand-primary a color: white - - - - - - - + #dash_activity + svg + height: 150px diff --git a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl index de24e5508..3b6679f32 100644 --- a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl @@ -5,9 +5,11 @@
- + +-->