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

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Jonne Haß 2015-11-13 16:03:44 +01:00
commit f2091f3b73
2 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -94,7 +94,6 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
* Correctly skip setting sidekiq logfile on Heroku [#6500](https://github.com/diaspora/diaspora/pull/6500) * Correctly skip setting sidekiq logfile on Heroku [#6500](https://github.com/diaspora/diaspora/pull/6500)
* Fix notifications for interactions by non-contacts [#6498](https://github.com/diaspora/diaspora/pull/6498) * Fix notifications for interactions by non-contacts [#6498](https://github.com/diaspora/diaspora/pull/6498)
* Fix issue where the publisher was broken on profile pages [#6503](https://github.com/diaspora/diaspora/pull/6503) * Fix issue where the publisher was broken on profile pages [#6503](https://github.com/diaspora/diaspora/pull/6503)
* Limit flash message width on small devices [#6529](https://github.com/diaspora/diaspora/pull/6529)
## Features ## Features

7
app/assets/stylesheets/_flash_messages.scss
View file

@ -19,11 +19,4 @@
&.alert-succes { border: 1px solid darken($state-success-bg, 10%); } &.alert-succes { border: 1px solid darken($state-success-bg, 10%); }
&.alert-warning { border: 1px solid darken($state-warning-bg, 10%); } &.alert-warning { border: 1px solid darken($state-warning-bg, 10%); }
} }
@media (max-width: $grid-float-breakpoint-max) {
.flash-message {
max-width: 80%;
min-width: 80%;
}
}
} }