diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-10-16 00:49:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-16 00:49:05 -0500 |
| commit | f72ad67a3967230afd63a9e2d84a2a69331c4787 (patch) | |
| tree | bf295c8f79ef63f4c858cdef7cc6295c31b25fbd /app | |
| parent | 22df18e902f43448066371e250ed944469b83d40 (diff) | |
| parent | 56094cb4bda18283533658aec61efb667a1ef0dd (diff) | |
Merge pull request #180 from STJrInuyasha/glitch-soc/avatar-unification
Avatar unification, mk.II
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/styles/about.scss | 8 | ||||
| -rw-r--r-- | app/javascript/styles/accounts.scss | 20 |
2 files changed, 11 insertions, 17 deletions
diff --git a/app/javascript/styles/about.scss b/app/javascript/styles/about.scss index a15afc32c..8c37310e8 100644 --- a/app/javascript/styles/about.scss +++ b/app/javascript/styles/about.scss @@ -424,16 +424,14 @@ text-align: center; .avatar { - width: 80px; - height: 80px; + @include avatar-size(80px); margin: 0 auto; margin-bottom: 15px; img { + @include avatar-radius(); + @include avatar-size(80px); display: block; - width: 80px; - height: 80px; - border-radius: 48px; } } diff --git a/app/javascript/styles/accounts.scss b/app/javascript/styles/accounts.scss index e2db9992d..b00dd8c1e 100644 --- a/app/javascript/styles/accounts.scss +++ b/app/javascript/styles/accounts.scss @@ -83,16 +83,15 @@ } .avatar { - width: 120px; + @include avatar-size(120px); margin: 0 auto; position: relative; z-index: 2; img { - width: 120px; - height: 120px; + @include avatar-radius(); + @include avatar-size(120px); display: block; - border-radius: 120px; box-shadow: 0 0 15px rgba($base-shadow-color, 0.2); } } @@ -408,14 +407,12 @@ } .avatar { - width: 80px; - height: 80px; + @include avatar-size(80px); img { display: block; - width: 80px; - height: 80px; - border-radius: 80px; + @include avatar-radius(); + @include avatar-size(80px); border: 2px solid $simple-background-color; background: $simple-background-color; } @@ -495,15 +492,14 @@ } & > div { + @include avatar-size(48px); float: left; margin-right: 10px; - width: 48px; - height: 48px; } .avatar { + @include avatar-radius(); display: block; - border-radius: 4px; } .display-name { |