Skip to content

Commit

Permalink
Merge pull request #3 from npm/adds-avatar-sizes
Browse files Browse the repository at this point in the history
Adds Avatar Sizes
  • Loading branch information
rockbot committed Feb 26, 2016
2 parents 35dcba5 + 429c267 commit 38f3e72
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 11 deletions.
23 changes: 19 additions & 4 deletions src/pivotal-ui/components/avatars/avatars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ Regular avatars are expected to by 100px by 100px.
*/
.avatar {
border: $avatar-border;
box-sizing: border-box;
}

Expand All @@ -52,10 +51,26 @@ Regular avatars are expected to by 100px by 100px.
}
}

/*doc
---
title: Avatar Sizes
name: avatar_01_sizes
parent: avatar
---
Avatars can be any size. In order to change to a custom size, change the `height` and `width`. The following are the typical sizes:
```html_example
<img alt="..." class="img-circle avatar" height="100" src="http://placehold.it/100x100" width="100">
<img alt="..." class="img-circle avatar" height="45" src="http://placehold.it/45x45" width="45">
<img alt="..." class="img-circle avatar" height="20" src="http://placehold.it/20x20" width="20">
```
*/

/*doc
---
title: Small Gravatar
name: avatar_01_gravatar_small
name: avatar_10_gravatar_small
parent: avatar
---
Expand All @@ -81,7 +96,7 @@ To use in a view, simply call
/*doc
---
title: Small with Envelope
name: avatar_02_gravatar_small_with_envelope
name: avatar_11_gravatar_small_with_envelope
parent: avatar
---
Expand Down Expand Up @@ -146,7 +161,7 @@ To use in a view, simply call
/*doc
---
title: Large Gravatar
name: avatar_03_gravatar_large
name: avatar_12_gravatar_large
parent: avatar
---
Expand Down
7 changes: 0 additions & 7 deletions src/pivotal-ui/components/pui-variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -354,13 +354,6 @@ $icon-font-path: "bootstrap/" !default;
$icon-font-name: "glyphicons-halflings-regular" !default;
$icon-font-svg-id: "glyphicons_halflingsregular" !default;


// Images
// -------------------------

$avatar-border: 4px solid $dark-2;


// Components
// -------------------------
// Based on 14px font-size and 1.428 line-height (~20px to start)
Expand Down

0 comments on commit 38f3e72

Please sign in to comment.