autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'hometown-dev' into unbranding

Browse Source
This commit is contained in:
Darius Kazemi
2019-09-23 20:56:21 -07:00
committed by GitHub
parent adfdc9b968 7bb2dbe395
commit 38e1afa724
7 changed files with 90 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/styles/macaron/diff.scss
View File

@ -1037,6 +1037,10 @@ a.status-card.compact:hover {
border-bottom: 1px solid lighten($purple, 8%);
}
.account__header__fields dl {
border-bottom: 1px solid lighten($purple, 8%);
}
@media screen and (max-width: 600px) {
.public-layout .public-account-header__bar {
background: $blue;

155
app/javascript/styles/mastodon/components.scss
View File

@ -324,12 +324,6 @@
color: $lighter-text-color;
font-weight: 500;
text-decoration: underline;
&:hover,
&:active,
&:focus {
text-decoration: none;
}
}
}
@ -712,80 +706,81 @@
height: 20px;
margin: -3px 0 0;
}
.status__content__text {
p,
pre,
blockquote {
margin-bottom: 20px;
white-space: pre-wrap;
p,
pre,
blockquote {
margin-bottom: 20px;
white-space: pre-wrap;
&:last-child {
margin-bottom: 2px;
&:last-child {
margin-bottom: 2px;
}
}
}
h1,
h2,
h3,
h4,
h5 {
margin-top: 20px;
margin-bottom: 20px;
}
h1,
h2 {
font-weight: 700;
font-size: 18px;
}
h2 {
font-size: 16px;
}
h3,
h4,
h5 {
font-weight: 500;
}
blockquote {
padding-left: 10px;
border-left: 3px solid $darker-text-color;
color: $darker-text-color;
white-space: normal;
p:last-child {
margin-bottom: 0;
h1,
h2,
h3,
h4,
h5 {
margin-top: 20px;
margin-bottom: 20px;
}
}
b,
strong {
font-weight: 700;
}
em,
i {
font-style: italic;
}
ul,
ol {
margin-left: 1em;
margin-bottom: 1em;
p {
margin: 0;
h1 {
font-weight: 700;
font-size: 22px;
}
}
ul {
list-style-type: disc;
}
h2 {
font-weight: 700;
font-size: 20px;
}
ol {
list-style-type: decimal;
h3,
h4,
h5 {
font-weight: 500;
}
blockquote {
padding-left: 10px;
border-left: 3px solid $darker-text-color;
color: $darker-text-color;
white-space: normal;
p:last-child {
margin-bottom: 0;
}
}
b,
strong {
font-weight: 700;
}
em,
i {
font-style: italic;
}
ul,
ol {
margin-left: 1em;
margin-bottom: 1em;
p {
margin: 0;
}
}
ul {
list-style-type: disc;
}
ol {
list-style-type: decimal;
}
}
a {
@ -801,13 +796,9 @@
}
&.mention {
&:hover {
text-decoration: none;
span {
text-decoration: underline;
}
}
}
.fa {
@ -1107,6 +1098,7 @@
.status__action-bar-dropdown {
height: 23.15px;
width: 23.15px;
margin-right: 18px;
}
.detailed-status__action-bar-dropdown {
@ -6039,3 +6031,14 @@ noscript {
height: 100px;
bottom: 0;
}
div.status__content,
div.status__content--with-action,
div.status__content--with-spoiler {
p {
span.show_more_button {
display: block;
margin: 0.25rem 0 0 0;
}
}
}