From 853d1f4cfafb07f672d56e24b3c96a6b7c0c96b3 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Wed, 29 Mar 2017 18:05:56 -0400 Subject: [PATCH] status label --- src/app/organization/organizationPeopleController.js | 7 +++++-- src/app/organization/views/organizationPeople.html | 4 ++-- src/less/vault.less | 4 ++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/app/organization/organizationPeopleController.js b/src/app/organization/organizationPeopleController.js index 6f7085dac0..f57bc58ac5 100644 --- a/src/app/organization/organizationPeopleController.js +++ b/src/app/organization/organizationPeopleController.js @@ -100,22 +100,25 @@ user.typeName = 'Admin'; break; case 2: + /* falls through */ default: user.typeName = 'User'; - break; } switch (user.status) { case 0: user.statusName = 'Invited'; + user.statusClass = { 'label-default': true }; break; case 1: user.statusName = 'Accepted'; + user.statusClass = { 'label-warning': true }; break; case 2: + /* falls through */ default: user.statusName = 'Confirmed'; - break; + user.statusClass = { 'label-success': true }; } users.push(user); diff --git a/src/app/organization/views/organizationPeople.html b/src/app/organization/views/organizationPeople.html index 040e67b1f4..032834447e 100644 --- a/src/app/organization/views/organizationPeople.html +++ b/src/app/organization/views/organizationPeople.html @@ -68,8 +68,8 @@ {{user.typeName}} - - {{user.statusName}} + + {{user.statusName}} diff --git a/src/less/vault.less b/src/less/vault.less index 00007a12dd..df80a44106 100644 --- a/src/less/vault.less +++ b/src/less/vault.less @@ -177,6 +177,10 @@ form .btn .loading-icon { vertical-align: middle !important; } +.table td .label { + font-size: 100%; +} + /* Callouts */ .callout.callout-default {