Merge pull request #492 from ThibG/glitch-soc/fixes/port-scss

Port SCSS changes from upstream
This commit is contained in:
ThibG 2018-05-21 16:29:05 +02:00 committed by GitHub
commit 98ecadbf99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 70 additions and 13 deletions

View file

@ -326,6 +326,15 @@
z-index: 2; z-index: 2;
position: relative; position: relative;
&.empty img {
position: absolute;
opacity: 0.2;
height: 200px;
left: 0;
bottom: 0;
pointer-events: none;
}
@media screen and (max-width: 740px) { @media screen and (max-width: 740px) {
border-radius: 0; border-radius: 0;
box-shadow: none; box-shadow: none;
@ -445,8 +454,8 @@
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
text-align: center; text-align: center;
padding: 60px 0; padding: 130px 0;
padding-top: 55px; padding-top: 125px;
margin: 0 auto; margin: 0 auto;
cursor: default; cursor: default;
} }

View file

@ -274,6 +274,22 @@
} }
} }
.flavour-screen {
display: block;
margin: 10px auto;
max-width: 100%;
}
.flavour-description {
display: block;
font-size: 16px;
margin: 10px 0;
& > p {
margin: 10px 0;
}
}
.report-accounts { .report-accounts {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
@ -484,19 +500,12 @@
} }
a.name-tag, a.name-tag,
.name-tag { .name-tag,
display: flex; a.inline-name-tag,
align-items: center; .inline-name-tag {
text-decoration: none; text-decoration: none;
color: $secondary-text-color; color: $secondary-text-color;
.avatar {
display: block;
margin: 0;
margin-right: 5px;
border-radius: 50%;
}
.username { .username {
font-weight: 500; font-weight: 500;
} }
@ -514,6 +523,26 @@ a.name-tag,
} }
} }
a.name-tag,
.name-tag {
display: flex;
align-items: center;
.avatar {
display: block;
margin: 0;
margin-right: 5px;
border-radius: 50%;
}
&.suspended {
.avatar {
filter: grayscale(100%);
opacity: 0.8;
}
}
}
.speech-bubble { .speech-bubble {
margin-bottom: 20px; margin-bottom: 20px;
border-left: 4px solid $ui-highlight-color; border-left: 4px solid $ui-highlight-color;

View file

@ -4,7 +4,7 @@
font-size: 12px; font-size: 12px;
color: $darker-text-color; color: $darker-text-color;
.domain { .footer__domain {
font-weight: 500; font-weight: 500;
a { a {
@ -26,5 +26,13 @@
text-decoration: none; text-decoration: none;
} }
} }
img {
margin: 0 4px;
position: relative;
bottom: -1px;
height: 18px;
vertical-align: top;
}
} }
} }

View file

@ -1,3 +1,9 @@
@keyframes Swag {
0% { background-position: 0% 0%; }
50% { background-position: 100% 0%; }
100% { background-position: 200% 0%; }
}
.table { .table {
width: 100%; width: 100%;
max-width: 100%; max-width: 100%;
@ -187,6 +193,11 @@ a.table-action-link {
strong { strong {
font-weight: 700; font-weight: 700;
background: linear-gradient(to right, orange , yellow, green, cyan, blue, violet,orange , yellow, green, cyan, blue, violet);
background-size: 200% 100%;
background-clip: text;
color: transparent;
animation: Swag 2s linear 0s infinite;
} }
} }
} }