From 0d42da554e02d5fd9bcc57928b088e713a2df6df Mon Sep 17 00:00:00 2001 From: ultimatemember Date: Wed, 31 Dec 2014 00:20:26 +0200 Subject: [PATCH] Started work on dashboard --- admin/assets/css/um-admin-dashboard.css | 58 ++++++++++--------- .../ReduxFramework/ReduxCore/framework.php | 2 +- admin/templates/about.php | 2 +- admin/templates/dashboard.php | 13 ++--- core/um-chart.php | 14 ++--- 5 files changed, 47 insertions(+), 42 deletions(-) diff --git a/admin/assets/css/um-admin-dashboard.css b/admin/assets/css/um-admin-dashboard.css index 732c53bb..ae40fb47 100644 --- a/admin/assets/css/um-admin-dashboard.css +++ b/admin/assets/css/um-admin-dashboard.css @@ -4,13 +4,8 @@ .um-admin-dash-container { box-sizing: border-box; - border-radius: 3px; margin: 18px 20px 20px 2px !important; - background-color: #F5F5F5; - background-repeat: repeat-x; - background-image: -moz-linear-gradient(center top , #F2F2F2 0px, #F5F5F5 100%); - border: 1px solid #DEDEDE; - box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.04); + background: none !important; overflow: hidden; } @@ -21,9 +16,7 @@ .um-admin-dash-head { background: #3ba1da; - border-radius: 3px 3px 0 0; padding: 0 0 0 20px; - border-bottom: 3px solid #3ba1da; } .um-admin-dash-nav { @@ -38,7 +31,6 @@ } .um-admin-dash-main { - background: none repeat scroll 0% 0% #FCFCFC; margin-left: 201px; border-left: 1px solid #D8D8D8; padding: 10px 20px; @@ -46,11 +38,10 @@ } .um-admin-dash-foot { - background: none repeat scroll 0% 0% #EEE; - height: 60px; - border-radius: 0 0 3px 3px; - border-top: 1px solid #E7E7E7; - z-index: 9999; + border-radius: 0; + background: none !important; + padding: 10px 0; + border-top: 1px solid #D8D8D8; } /* @@ -91,20 +82,19 @@ .um-admin-dash-nav a { font-family: Open Sans; - font-size: 13px; + font-size: 14px; position: relative; display: block; padding: 10px 4px 10px 14px; - background: none repeat scroll 0px 0px transparent; border-width: 1px 0px; border-style: solid; border-bottom: 1px solid #E7E7E7; border-top: 0px none; - opacity: 0.7; - color: #555; font-weight: 700; text-decoration: none; transition: none 0s ease 0s; + background: transparent !important; + color: #555 !important; } .um-admin-dash-nav-title { @@ -112,16 +102,19 @@ } .um-admin-dash-nav a:hover { - color: #777; - opacity: 1; - background: none repeat scroll 0px 0px #e5e5e5; + background: #ddd !important; } -.um-admin-dash-nav a i{ +.um-admin-dash-nav a.active, +.um-admin-dash-nav a.active:hover { + color: #3ba1da !important; + background: transparent !important; +} + +.um-admin-dash-nav a i { vertical-align: middle; font-size: 1.35em; position: absolute; - color: #555; } /* @@ -148,9 +141,22 @@ */ .um-admin-dash-main h3{ - color: #888; font-weight: 500; - border-bottom: 1px solid #eee; padding: 0 0 10px 0; margin-bottom: 0 !important; -} \ No newline at end of file +} + +.um-admin-dash-share { + margin-top: 11px !important; + float: left; + line-height: 28px; + font-size: 15px; +} + +.um-admin-dash-share a { + margin: 0 15px 0 0 !important; + text-decoration: none !important; + color: #777 !important; + font-size: 22px !important; +} +.um-admin-dash-share a:hover {color: #3ba1da !important} \ No newline at end of file diff --git a/admin/core/lib/ReduxFramework/ReduxCore/framework.php b/admin/core/lib/ReduxFramework/ReduxCore/framework.php index 0e4360ab..1590db57 100644 --- a/admin/core/lib/ReduxFramework/ReduxCore/framework.php +++ b/admin/core/lib/ReduxFramework/ReduxCore/framework.php @@ -3721,7 +3721,7 @@ unset( $link['link'] ); } - echo ''; + echo ''; if ( isset( $link['icon'] ) && ! empty( $link['icon'] ) ) { echo ''; diff --git a/admin/templates/about.php b/admin/templates/about.php index e7fbc110..0c818542 100644 --- a/admin/templates/about.php +++ b/admin/templates/about.php @@ -76,7 +76,7 @@
- args['share_icons'] as $k => $arr ) { ?> + args['share_icons'] as $k => $arr ) { ?>
diff --git a/admin/templates/dashboard.php b/admin/templates/dashboard.php index ce6ef85a..f488097a 100644 --- a/admin/templates/dashboard.php +++ b/admin/templates/dashboard.php @@ -21,12 +21,7 @@ global $ultimatemember;
- Dashboard Overview - Analytics - New Users12 - User Reports4 - Quick Delete/Ban - Updates Available1 + Dashboard Overview
@@ -42,7 +37,11 @@ global $ultimatemember;
- +
+ + args['share_icons'] as $k => $arr ) { ?> + +
\ No newline at end of file diff --git a/core/um-chart.php b/core/um-chart.php index d543f057..f59d5267 100644 --- a/core/um-chart.php +++ b/core/um-chart.php @@ -19,9 +19,9 @@ class UM_Chart { 'y_label' => null, 'vertical_max_lines' => 6, 'colors' => '#3ba1da', - 'backgroundcolor' => '#fcfcfc', - 'basetextcolor' => '#999', - 'basebordercolor' => '#eee', + 'backgroundcolor' => 'transparent', + 'basetextcolor' => '#666', + 'basebordercolor' => '#bbb', 'days' => 30 ); @@ -103,12 +103,12 @@ class UM_Chart { baselineColor: '', gridlineColor: '', gridlines: {color: 'transparent', count: vgrid_count}, - textStyle: {color: '', fontSize: 11 }, + textStyle: {color: '', fontSize: 12 }, format: '#', viewWindow: {min: min_data, max: max_data + 10} }, hAxis:{ - textStyle: {color: '', fontSize: 11, italic: true }, + textStyle: {color: '', fontSize: 12, italic: true }, showTextEvery: hgrid_count, maxAlternation: 1, maxTextLines: 1 @@ -119,13 +119,13 @@ class UM_Chart { textStyle: {color: '', fontSize: 13} }, tooltip: { - textStyle: {color: '', fontSize: 11} + textStyle: {color: '', fontSize: 12} }, chartArea: { top:50,left:30,width: '95%', 'height' : ( vgrid_count * 50 ) - 100, backgroundColor: { stroke: '', - strokeWidth: 2 + strokeWidth: 1 } }, width: '100%',