From fe7de44275d67ec08b7bb304fe68bfd697592d00 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Tue, 23 Apr 2013 11:48:26 -0400 Subject: [PATCH] Put admins and moderators counts on the same line --- .../admin/templates/dashboard.js.handlebars | 16 ++++---------- app/assets/stylesheets/admin/admin_base.scss | 21 +++++++++---------- 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/app/assets/javascripts/admin/templates/dashboard.js.handlebars b/app/assets/javascripts/admin/templates/dashboard.js.handlebars index de952adb3f8..7eac87bddcf 100644 --- a/app/assets/javascripts/admin/templates/dashboard.js.handlebars +++ b/app/assets/javascripts/admin/templates/dashboard.js.handlebars @@ -97,18 +97,10 @@
- - - - - - - - - - - -
{{i18n admin.dashboard.admins}}{{admins}}
{{i18n admin.dashboard.moderators}}{{moderators}}
+ {{i18n admin.dashboard.admins}} + {{admins}} + {{i18n admin.dashboard.moderators}} + {{moderators}}
diff --git a/app/assets/stylesheets/admin/admin_base.scss b/app/assets/stylesheets/admin/admin_base.scss index 853b25f358f..bd7e3e6fb18 100644 --- a/app/assets/stylesheets/admin/admin_base.scss +++ b/app/assets/stylesheets/admin/admin_base.scss @@ -362,10 +362,12 @@ table { text-align: left; } thead { - tr:hover > td, - tr:hover > th { + tr:hover > td { background-color: $white; } + tr:hover > th { + background-color: #e4e4e4; + } } td.value { @@ -429,15 +431,12 @@ table { } &.totals { - width: 185px; - margin-top: 0px; - - table td { - border-top: none; - &.value { - text-align: left; - width: 55px; - } + margin-top: 12px; + padding-left: 5px; + .value { + font-weight: bold; + margin-left: 8px; + margin-right: 30px; } }