mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-14 23:24:55 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #180 from STJrInuyasha/glitch-soc/avatar-unification

Browse Source 
Avatar unification, mk.II
This commit is contained in:
David Yip 2017-10-16 00:49:05 -05:00 committed by GitHub
commit f72ad67a39
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/styles/about.scss
View File

@ -424,16 +424,14 @@
text-align: center; text-align: center;
.avatar { .avatar {
width: 80px; @include avatar-size(80px);
height: 80px;
margin: 0 auto; margin: 0 auto;
margin-bottom: 15px; margin-bottom: 15px;
img { img {
@include avatar-radius();
@include avatar-size(80px);
display: block; display: block;
width: 80px;
height: 80px;
border-radius: 48px;
} }
} }

20
app/javascript/styles/accounts.scss
View File

@ -83,16 +83,15 @@
} }
.avatar { .avatar {
width: 120px; @include avatar-size(120px);
margin: 0 auto; margin: 0 auto;
position: relative; position: relative;
z-index: 2; z-index: 2;
img { img {
width: 120px; @include avatar-radius();
height: 120px; @include avatar-size(120px);
display: block; display: block;
border-radius: 120px;
box-shadow: 0 0 15px rgba($base-shadow-color, 0.2); box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
} }
} }
@ -408,14 +407,12 @@
} }
.avatar { .avatar {
width: 80px; @include avatar-size(80px);
height: 80px;
img { img {
display: block; display: block;
width: 80px; @include avatar-radius();
height: 80px; @include avatar-size(80px);
border-radius: 80px;
border: 2px solid $simple-background-color; border: 2px solid $simple-background-color;
background: $simple-background-color; background: $simple-background-color;
} }
@ -495,15 +492,14 @@
} }
& > div { & > div {
@include avatar-size(48px);
float: left; float: left;
margin-right: 10px; margin-right: 10px;
width: 48px;
height: 48px;
} }
.avatar { .avatar {
@include avatar-radius();
display: block; display: block;
border-radius: 4px;
} }
.display-name { .display-name {