tykayn
/
mastodon
mirror of https://framagit.org/tykayn/mastodon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #413 from ThibG/glitch-soc/fixes/fix-account-card-style 

Update accounts SCSS for public pages
This commit is contained in:
beatrix 2018-04-04 11:36:41 -04:00 committed by GitHub
parent 1f5bdd8445 d0e792e231
commit 4ab58c3292
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 47 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
app/javascript/flavours/glitch/styles/accounts.scss
View File

@ -100,32 +100,6 @@
} }
} }
.controls {
position: absolute;
top: 15px;
left: 15px;
z-index: 2;
.icon-button {
color: rgba($white, 0.8);
text-decoration: none;
font-size: 13px;
line-height: 13px;
font-weight: 500;
.fa {
font-weight: 400;
margin-right: 5px;
}
&:hover,
&:active,
&:focus {
color: $white;
}
}
}
.roles { .roles {
margin-bottom: 15px; margin-bottom: 15px;
padding: 0 15px; padding: 0 15px;
@ -230,6 +204,40 @@
} }
} }
.card,
.account-grid-card {
.controls {
position: absolute;
top: 15px;
left: 15px;
z-index: 2;
.icon-button {
color: rgba($white, 0.8);
text-decoration: none;
font-size: 13px;
line-height: 13px;
font-weight: 500;
.fa {
font-weight: 400;
margin-right: 5px;
}
&:hover,
&:active,
&:focus {
color: $white;
}
}
}
}
.account-grid-card .controls {
left: auto;
right: 15px;
}
.pagination { .pagination {
padding: 30px 0; padding: 30px 0;
text-align: center; text-align: center;
@ -237,8 +245,8 @@
a, a,
.current, .current,
.next, .newer,
.prev, .older,
.page, .page,
.gap { .gap {
font-size: 14px; font-size: 14px;
@ -261,13 +269,13 @@
cursor: default; cursor: default;
} }
.prev, .older,
.next { .newer {
text-transform: uppercase; text-transform: uppercase;
color: $ui-secondary-color; color: $ui-secondary-color;
} }
.prev { .older {
float: left; float: left;
padding-left: 0; padding-left: 0;
@ -277,7 +285,7 @@
} }
} }
.next { .newer {
float: right; float: right;
padding-right: 0; padding-right: 0;
@ -299,8 +307,8 @@
display: none; display: none;
} }
.next, .newer,
.prev { .older {
display: inline-block; display: inline-block;
} }
} }
@ -418,13 +426,14 @@
font-weight: 400; font-weight: 400;
} }
.note { .account__header__content {
padding: 10px 15px; padding: 10px 15px;
padding-top: 15px; padding-top: 15px;
box-sizing: border-box;
color: lighten($ui-base-color, 26%); color: lighten($ui-base-color, 26%);
word-wrap: break-word; word-wrap: break-word;
min-height: 80px; overflow: hidden;
text-overflow: ellipsis;
height: 5.5em;
} }
} }
} }
@ -438,6 +447,7 @@
text-align: center; text-align: center;
padding: 60px 0; padding: 60px 0;
padding-top: 55px; padding-top: 55px;
margin: 0 auto;
cursor: default; cursor: default;
} }