fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-16 23:22:01 +00:00
Code Issues Packages 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
parent 22df18e902 56094cb4bd
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;
.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;
}
}

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

@ -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 {