diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_record_actions.scss b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_record_actions.scss index 0733d0c31..8ddc1b009 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_record_actions.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_record_actions.scss @@ -41,6 +41,7 @@ ul.record_actions.sticky-form-buttons { // inside table exceptions table { + td ul.record_actions, ul.record_actions_small { li { @@ -53,3 +54,33 @@ table { padding: 0.5em; } } + +// inside alert exceptions +div.alert.alert-with-actions { + display: flex; + flex-direction: row; + + ul.record_actions { + display: flex; + flex-direction: column; + padding: 0; + margin: 0; + + li:nth-child(1n+2) { + margin-top: 0.5rem; + } + + li { + margin-right: 0; + } + } + + @media screen and (max-width: 1050px) { + flex-direction: column; + + ul.record_actions { + margin-top: 1rem; + text-align: center; + } + } +} diff --git a/src/Bundle/ChillMainBundle/Resources/public/scss/_alert-first-child.scss b/src/Bundle/ChillMainBundle/Resources/public/scss/_alert-first-child.scss deleted file mode 100644 index 9a089c8a7..000000000 --- a/src/Bundle/ChillMainBundle/Resources/public/scss/_alert-first-child.scss +++ /dev/null @@ -1,10 +0,0 @@ -/* - * when an alert is the first child of the page, with a banner, we do not want the alert to be merged with the banner - */ -div.container.content { - & > div { - div.alert:nth-child(2) { - margin-top: 1rem; - } - } -} diff --git a/src/Bundle/ChillMainBundle/Resources/public/scss/_alert-with-actions.scss b/src/Bundle/ChillMainBundle/Resources/public/scss/_alert-with-actions.scss deleted file mode 100644 index 0779ca7b3..000000000 --- a/src/Bundle/ChillMainBundle/Resources/public/scss/_alert-with-actions.scss +++ /dev/null @@ -1,29 +0,0 @@ - -div.alert.alert-with-actions { - display: flex; - flex-direction: row; - - ul.record_actions { - display: flex; - flex-direction: column; - padding: 0; - margin: 0; - - li:nth-child(1n+2) { - margin-top: 0.5rem; - } - - li { - margin-right: 0; - } - } - - @media screen and (max-width: 1050px) { - flex-direction: column; - - ul.record_actions { - margin-top: 1rem; - text-align: center; - } - } -} diff --git a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss index f73d722bb..7d291f784 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss @@ -8,10 +8,6 @@ @import '~ChillMainAssets/modules/bootstrap/bootstrap'; -@import 'alert-first-child'; -@import 'alert-with-actions'; - - /* * Specific rules */