From 82d31b908f9975eddf824e454eca9bf737896aaf Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Fri, 12 Jun 2015 16:09:53 +0800 Subject: [PATCH] More styling tweaks --- .../directives/panel_toggle.js.coffee | 2 +- .../stylesheets/admin/index_panels.css.scss | 24 ++++++++----------- .../_enterprise_user_index.html.haml | 2 +- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/app/assets/javascripts/admin/index_utils/directives/panel_toggle.js.coffee b/app/assets/javascripts/admin/index_utils/directives/panel_toggle.js.coffee index 3641e43870..df81328905 100644 --- a/app/assets/javascripts/admin/index_utils/directives/panel_toggle.js.coffee +++ b/app/assets/javascripts/admin/index_utils/directives/panel_toggle.js.coffee @@ -1,7 +1,7 @@ angular.module("admin.indexUtils").directive "panelToggle", -> restrict: "C" transclude: true - template: '
' + template: '
' require: "^panelToggleRow" scope: name: "@" diff --git a/app/assets/stylesheets/admin/index_panels.css.scss b/app/assets/stylesheets/admin/index_panels.css.scss index 735226fb35..87145fb462 100644 --- a/app/assets/stylesheets/admin/index_panels.css.scss +++ b/app/assets/stylesheets/admin/index_panels.css.scss @@ -9,11 +9,12 @@ tr.panel-toggle-row { position: relative; - i { + i.icon-chevron::before { font-size: 1.2rem; + content: "\f078"; } - &::before { + &.error::before { font-family: FontAwesome; font-weight: normal; font-style: normal; @@ -24,23 +25,14 @@ tr.panel-toggle-row { right: 5px; font-size: 2rem; -webkit-font-smoothing: antialiased; - } - - &.error::before { content: "\f071"; color: #da5354; } &.status { - i.status::before { - font-family: FontAwesome; - font-weight: normal; - font-style: normal; - display: inline-block; - text-decoration: inherit; + i.icon-status::before { font-size: 1.5rem; opacity: 0.5; - -webkit-font-smoothing: antialiased; } i.issue::before { @@ -66,7 +58,7 @@ tr.panel-toggle-row { color: #1b3c56; } - i.status::before { + i.icon-status::before { opacity: 1.0; } } @@ -91,9 +83,13 @@ tr.panel-toggle-row { color: #1b3c56; } - i.status::before { + i.icon-status::before { opacity: 1.0; } + + i.icon-chevron::before { + content: "\f077"; + } } } } diff --git a/app/views/admin/enterprises/_enterprise_user_index.html.haml b/app/views/admin/enterprises/_enterprise_user_index.html.haml index 543b912f23..5f4ad6cca9 100644 --- a/app/views/admin/enterprises/_enterprise_user_index.html.haml +++ b/app/views/admin/enterprises/_enterprise_user_index.html.haml @@ -51,7 +51,7 @@ %td.package.panel-toggle.text-center{ ng: { show: 'columns.package.visible', class: "{error: packageError}" }, name: "package" } %h5{ ng: { bind: "package" } } %td.status.panel-toggle.text-center{ ng: { show: 'columns.status.visible' }, name: "status" } - %i.status{ bo: { class: "status" } } + %i.icon-status{ bo: { class: "status" } } %td.manage{ ng: { show: 'columns.manage.visible' } } %a.button.fullwidth{ bo: { href: 'enterprise.edit_path' } } Manage