diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-30 14:37:48 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-30 14:37:48 +0200 |
| commit | 67f59ebd50511bfba1ebdc73b6fd269f425ac6f0 (patch) | |
| tree | 635c708678523ca5149880c1bea6dd8fa73c0a0f /app/assets/javascripts/flash.js.coffee | |
| parent | 545b92af067832d560846b7ec7cb26caf3302275 (diff) | |
| parent | 1a68a0a6f55049b4ad42222b0dc667fe625a7604 (diff) | |
| download | gitlab-ce-67f59ebd50511bfba1ebdc73b6fd269f425ac6f0.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-validator
# Conflicts:
# spec/models/project_spec.rb
Diffstat (limited to 'app/assets/javascripts/flash.js.coffee')
| -rw-r--r-- | app/assets/javascripts/flash.js.coffee | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/app/assets/javascripts/flash.js.coffee b/app/assets/javascripts/flash.js.coffee index 4f73d215b85..b76d214790a 100644 --- a/app/assets/javascripts/flash.js.coffee +++ b/app/assets/javascripts/flash.js.coffee @@ -4,11 +4,19 @@ class @Flash @flash.html("") innerDiv = $('<div/>', - class: "flash-#{type}", - text: message + class: "flash-#{type}" ) innerDiv.appendTo(".flash-container") + textDiv = $("<div/>", + class: "flash-text", + text: message + ) + textDiv.appendTo(innerDiv) + + if @flash.parent().hasClass('content-wrapper') + textDiv.addClass('container-fluid container-limited') + @flash.click -> $(@).fadeOut() @flash.show() |