bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into add-images-to-polls

Browse source
This commit is contained in:
Alex Gleason 2020-07-28 14:18:30 -05:00
commit 1329ca3578
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
11 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/soapbox/actions/compose.js
View file

Binary file not shown.

BIN
app/soapbox/features/compose/components/compose_form.js
View file

Binary file not shown.

BIN
app/soapbox/features/compose/containers/markdown_button_container.js Normal file
View file

Binary file not shown.

BIN
app/soapbox/features/compose/containers/sensitive_button_container.js
View file

Binary file not shown.

BIN
app/soapbox/reducers/__tests__/alerts-test.js
View file

Binary file not shown.

BIN
app/soapbox/reducers/__tests__/compose-test.js
View file

Binary file not shown.

BIN
app/soapbox/reducers/__tests__/notifications-test.js
View file

Binary file not shown.

BIN
app/soapbox/reducers/compose.js
View file

Binary file not shown.

4
app/styles/components/audio-player.scss
View file

@ -173,11 +173,11 @@
white-space: nowrap;
overlow: hidden;
text-overflow: ellipsis;
background: hsl( var(--brand-color_h), var(--brand-color_s), 20% );
background: hsl(var(--brand-color_h), var(--brand-color_s), 20%);
padding: 5px;
&__label {
color: white;
color: #ffffff;
}
button {

2
app/styles/components/columns.scss
View file

@ -260,7 +260,7 @@
position: absolute;
right: 0;
top: -49px;
@media screen and (max-width: $nav-breakpoint-2) {
top: -35px;
font-size: 14px;

35
app/styles/components/status.scss
View file

@ -1,3 +1,38 @@
.status__content {
p,
li {
strong {
font-weight: bold;
}
}
p,
li {
em {
font-style: italic;
}
}
ul,
ol,
blockquote {
margin-bottom: 20px;
margin-left: 15px;
}
ul {
list-style: disc inside none;
}
ol {
list-style: decimal inside none;
}
blockquote p {
font-style: italic;
}
}
.status__content--with-action {
cursor: pointer;
}