Skip to content
Extraits de code Groupes Projets
Valider 4710144b rédigé par Jonne Haß's avatar Jonne Haß
Parcourir les fichiers

Merge pull request #4293 from Team-D/feature/4274-error_message_vanishes_too_fast

fixes issue 4274 flash-messages stay longer
parents 7ea2888c 8ba60853
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
* Fix link to background image [#4289](https://github.com/diaspora/diaspora/pull/4289) * Fix link to background image [#4289](https://github.com/diaspora/diaspora/pull/4289)
* Fix Facebox icons 404s when called from Backbone * Fix Facebox icons 404s when called from Backbone
* Fix deleting a post from Facebook [#4290](https://github.com/diaspora/diaspora/pull/4290) * Fix deleting a post from Facebook [#4290](https://github.com/diaspora/diaspora/pull/4290)
* Display notices a little bit longer to help on sign up errors [#4274](https://github.com/diaspora/diaspora/issues/4274)
## Features ## Features
* Admin: add option to find users under 13 (COPPA) [#4252](https://github.com/diaspora/diaspora/pull/4252) * Admin: add option to find users under 13 (COPPA) [#4252](https://github.com/diaspora/diaspora/pull/4252)
......
...@@ -8,7 +8,9 @@ ...@@ -8,7 +8,9 @@
this.animateMessages = function() { this.animateMessages = function() {
var flashMessages = $("#flash_notice, #flash_error, #flash_alert"); var flashMessages = $("#flash_notice, #flash_error, #flash_alert");
flashMessages.addClass("expose") flashMessages.addClass("expose");
flashMessages.delay(8000);
flashMessages.fadeTo(200, 0.5);
}; };
this.render = function(result) { this.render = function(result) {
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
color: #666; color: #666;
&.expose { &.expose {
@include animation(expose, 5s) @include animation(expose, 10s)
} }
.message { .message {
...@@ -47,4 +47,4 @@ ...@@ -47,4 +47,4 @@
background-color: #CA410B; background-color: #CA410B;
border-color: darken(#CA410B, 10%); border-color: darken(#CA410B, 10%);
} }
} }
\ No newline at end of file
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter