diff --git a/src/app/directives/letterAvatarDirective.js b/src/app/directives/letterAvatarDirective.js index c7394f98f4..97e4755f5e 100644 --- a/src/app/directives/letterAvatarDirective.js +++ b/src/app/directives/letterAvatarDirective.js @@ -80,15 +80,15 @@ angular data: attrs.data, textColor: attrs.textcolor || '#ffffff', bgColor: attrs.bgcolor, - height: attrs.height || 45, - width: attrs.width || 45, - fontsize: attrs.fontsize || 20, + height: attrs.avheight || 45, + width: attrs.avwidth || 45, + fontSize: attrs.fontsize || 20, fontWeight: attrs.fontweight || 300, fontFamily: attrs.fontfamily || 'Open Sans, HelveticaNeue-Light, Helvetica Neue Light, ' + 'Helvetica Neue, Helvetica, Arial, Lucida Grande, sans-serif', round: attrs.round || 'true', dynamic: attrs.dynamic || 'true', - class: attrs.class || '' + class: attrs.avclass || '' }; if (params.dynamic === 'true') { @@ -112,7 +112,7 @@ angular c = upperData.substr(0, params.charCount); } - var cobj = getCharText(c, params.textColor, params.fontFamily, params.fontWeight, params.fontsize); + var cobj = getCharText(c, params.textColor, params.fontFamily, params.fontWeight, params.fontSize); var color = params.bgColor ? params.bgColor : stringToColor(upperData); var svg = getSvg(params.width, params.height, color); svg.append(cobj); diff --git a/src/app/organization/views/organizationPeople.html b/src/app/organization/views/organizationPeople.html index 3f2709f6a8..8fb093016a 100644 --- a/src/app/organization/views/organizationPeople.html +++ b/src/app/organization/views/organizationPeople.html @@ -58,7 +58,7 @@ - + {{user.email}} diff --git a/src/app/organization/views/organizationSubvaultsUsers.html b/src/app/organization/views/organizationSubvaultsUsers.html index 5783298981..b916da5b85 100644 --- a/src/app/organization/views/organizationSubvaultsUsers.html +++ b/src/app/organization/views/organizationSubvaultsUsers.html @@ -20,7 +20,7 @@ - + {{user.email}} diff --git a/src/app/settings/views/settings.html b/src/app/settings/views/settings.html index c5cd8a97e9..e8595a809a 100644 --- a/src/app/settings/views/settings.html +++ b/src/app/settings/views/settings.html @@ -37,7 +37,7 @@
diff --git a/src/app/views/organizationLayout.html b/src/app/views/organizationLayout.html index 7d3a8d78e3..17a7e893df 100644 --- a/src/app/views/organizationLayout.html +++ b/src/app/views/organizationLayout.html @@ -22,7 +22,7 @@
- +

{{orgProfile.name}}

diff --git a/src/app/views/userLayout.html b/src/app/views/userLayout.html index fe0e0523ee..bc805c59fa 100644 --- a/src/app/views/userLayout.html +++ b/src/app/views/userLayout.html @@ -22,7 +22,7 @@
- +

{{name}}

@@ -86,12 +86,17 @@
  • ORGANIZATIONS
    • -
  • - - {{org.name}} - -
    • +
    + +
    diff --git a/src/less/vault.less b/src/less/vault.less index 03a2dc8356..1b61e2cb19 100644 --- a/src/less/vault.less +++ b/src/less/vault.less @@ -32,6 +32,10 @@ h1, h2, h3, h4, h5, h6, padding-right: 15px; } +.sidebar-menu li a { + padding-left: 12px; +} + .sidebar-form .form-group { margin-bottom: 0; @@ -40,6 +44,14 @@ h1, h2, h3, h4, h5, h6, } } +.sidebar .subsection { + padding: 10px; +} + +.sidebar-collapse .sidebar .list-inline li { + padding-right: 0; +} + form div.validation-errors ul { margin-bottom: 0; padding-left: 20px;