diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-19 03:32:31 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-19 03:32:31 -0700 |
| commit | 1a3ca6b14992e0333e1acd9e7248d2781c27f5a5 (patch) | |
| tree | 824ef124e22fc97b1cb0cdf9758225eeb47bbd14 | |
| parent | 0e387919c3827260434aed48e1f28ee02ce5e58d (diff) | |
| parent | 798f7db24faba28c33a2a67602a8b81ed4869d5d (diff) | |
| download | gitlab-ce-1a3ca6b14992e0333e1acd9e7248d2781c27f5a5.tar.gz | |
Merge pull request #4797 from mbajur/flashes-revived
Make flash messages fixed and sticked to bottom
| -rw-r--r-- | app/assets/javascripts/main.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/common.scss | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee index f22c7a28f35..011244a5868 100644 --- a/app/assets/javascripts/main.js.coffee +++ b/app/assets/javascripts/main.js.coffee @@ -89,7 +89,7 @@ $ -> if (flash = $(".flash-container")).length > 0 flash.click -> $(@).fadeOut() flash.show() - setTimeout (-> flash.fadeOut()), 9000 + setTimeout (-> flash.fadeOut()), 5000 # Disable form buttons while a form is submitting $('body').on 'ajax:complete, ajax:beforeSend, submit', 'form', (e) -> diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 6426ca6320d..d9669b5e79d 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -51,6 +51,10 @@ table a code { text-align: center; color: #fff; font-size: 14px; + position: fixed; + bottom: 0; + width: 100%; + opacity: 0.8; .flash-notice { background: #49C; |