nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Steffen van Bergerem 2017-08-25 01:51:47 +02:00
commit 95ac7d0123
No known key found for this signature in database
GPG key ID: 315C9787D548DC6B
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -13,6 +13,7 @@
* Remove Internet Explorer workarounds [#7557](https://github.com/diaspora/diaspora/pull/7557) * Remove Internet Explorer workarounds [#7557](https://github.com/diaspora/diaspora/pull/7557)
## Bug fixes ## Bug fixes
* Fix displaying posts with long labels [#7579](https://github.com/diaspora/diaspora/pull/7579)
## Features ## Features
* Ask for confirmation when leaving a submittable comment field [#7530](https://github.com/diaspora/diaspora/pull/7530) * Ask for confirmation when leaving a submittable comment field [#7530](https://github.com/diaspora/diaspora/pull/7530)

2
app/assets/stylesheets/poll.scss
View file

@ -18,6 +18,7 @@
box-shadow: 0 0 0; box-shadow: 0 0 0;
height: 10px; height: 10px;
margin-bottom: 5px; margin-bottom: 5px;
clear: both;
.bar { .bar {
background: $border-dark-grey none; background: $border-dark-grey none;
@ -46,6 +47,7 @@
font-weight: normal; font-weight: normal;
margin-bottom: 5px; margin-bottom: 5px;
vertical-align: middle; vertical-align: middle;
display: inline;
} }
[type=radio], [type=radio],