diff options
author | George Tsiolis <tsiolis.g@gmail.com> | 2018-10-19 12:56:12 +0300 |
---|---|---|
committer | George Tsiolis <tsiolis.g@gmail.com> | 2018-10-23 21:33:12 +0300 |
commit | 90a494eed2f1da8227a7e2668524fd19fa76a7ad (patch) | |
tree | ef8a06d6480f8ae2bb40d4bee56be5ae37c4e849 /app/assets/javascripts/flash.js | |
parent | d25a8ed076aea797ad71cbfaf895cfab190bfcfd (diff) | |
download | gitlab-ce-90a494eed2f1da8227a7e2668524fd19fa76a7ad.tar.gz |
Limit flash notice width on fixed and fluid layout
Diffstat (limited to 'app/assets/javascripts/flash.js')
-rw-r--r-- | app/assets/javascripts/flash.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/javascripts/flash.js b/app/assets/javascripts/flash.js index a29de9ae899..a6ab614df16 100644 --- a/app/assets/javascripts/flash.js +++ b/app/assets/javascripts/flash.js @@ -30,12 +30,12 @@ const createAction = config => ` </a> `; -const createFlashEl = (message, type, isInContentWrapper = false) => ` +const createFlashEl = (message, type, isFixedLayout = false) => ` <div class="flash-${type}" > <div - class="flash-text ${isInContentWrapper ? 'container-fluid container-limited' : ''}" + class="flash-text ${isFixedLayout ? 'container-fluid container-limited limit-container-width' : ''}" > ${_.escape(message)} </div> @@ -69,12 +69,13 @@ const createFlash = function createFlash( addBodyClass = false, ) { const flashContainer = parent.querySelector('.flash-container'); + const navigation = parent.querySelector('.content'); if (!flashContainer) return null; - const isInContentWrapper = flashContainer.parentNode.classList.contains('content-wrapper'); + const isFixedLayout = navigation ? navigation.parentNode.classList.contains('container-limited') : true; - flashContainer.innerHTML = createFlashEl(message, type, isInContentWrapper); + flashContainer.innerHTML = createFlashEl(message, type, isFixedLayout); const flashEl = flashContainer.querySelector(`.flash-${type}`); removeFlashClickListener(flashEl, fadeTransition); |