chinwag/chinwagsocial
chinwag/chinwagsocial
2
0
Fork 0
Code Issues Pull requests Releases 14 Wiki Activity

Merge tag 'v2.5.0rc2' into HEAD

Browse source
This commit is contained in:
Mike Barnes 2018-09-02 09:01:33 +10:00
commit 4401b3a148
105 changed files with 1947 additions and 453 deletions
Download patch file Download diff file Expand all files Collapse all files

46
app/javascript/styles/mastodon/components.scss
View file

@ -2279,28 +2279,6 @@ a.account__display-name {
.getting-started {
color: $dark-text-color;
p {
color: $dark-text-color;
font-size: 13px;
margin-bottom: 20px;
a {
color: $dark-text-color;
text-decoration: underline;
}
}
a {
text-decoration: none;
color: $darker-text-color;
&:hover,
&:focus,
&:active {
text-decoration: underline;
}
}
&__footer {
flex: 0 0 auto;
padding: 10px;
@ -2313,6 +2291,28 @@ a.account__display-name {
ul li {
display: inline;
}
p {
color: $dark-text-color;
font-size: 13px;
margin-bottom: 20px;
a {
color: $dark-text-color;
text-decoration: underline;
}
}
a {
text-decoration: none;
color: $darker-text-color;
&:hover,
&:focus,
&:active {
text-decoration: underline;
}
}
}
&__trends {
@ -5367,7 +5367,7 @@ noscript {
dt,
dd {
box-sizing: border-box;
padding: 14px 20px;
padding: 14px 5px;
text-align: center;
max-height: 48px;
overflow: hidden;

21
app/javascript/styles/mastodon/containers.scss
View file

@ -345,6 +345,23 @@
margin-bottom: 10px;
box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
&.inactive {
opacity: 0.5;
.public-account-header__image,
.avatar {
filter: grayscale(100%);
}
.logo-button {
background-color: $secondary-text-color;
svg path:last-child {
fill: $secondary-text-color;
}
}
}
&__image {
border-radius: 4px 4px 0 0;
overflow: hidden;
@ -582,6 +599,10 @@
border-bottom: 4px solid $highlight-text-color;
opacity: 1;
}
&.inactive::after {
border-bottom-color: $secondary-text-color;
}
}
&:hover {