From bccda153076e629d169696120930e37b58811604 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Thu, 8 Jul 2021 11:59:27 +0200 Subject: [PATCH] cleaning record_actions scss --- .../bootstrap/custom/_record_actions.scss | 75 +++++++++---------- .../Resources/public/scss/chillmain.scss | 8 -- 2 files changed, 36 insertions(+), 47 deletions(-) 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 ccbc5912a..0733d0c31 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 @@ -1,58 +1,55 @@ -// Symfony records actions -/*ul.record_actions { - padding-left: 0; -} -ul.record_actions li { - display: inline-block; -}*/ +ul.record_actions, +ul.record_actions_column { + display: flex; + justify-content: flex-end; -ul.record_actions, ul.record_actions_column { - display: flex; - justify-content: flex-end; - - &.record_actions--left { + &.record_actions--left { justify-content: flex-start; - } + } + padding: 0.5em 0; + flex-wrap: wrap-reverse; - padding: 0.5em 0; - flex-wrap: wrap-reverse; + li { + display: inline-block; + list-style-type: none; + margin-right: 1em; + order: 99; - li { - display: inline-block; - list-style-type: none; - margin-right: 1em; - order: 99; - - &:last-child { - margin-right: 0; - } - } - - - li.cancel { - order: 1; - margin-right: auto; + &:last-child { + margin-right: 0; } + } + li.cancel { + order: 1; + margin-right: auto; + } } ul.record_actions { - flex-direction: row; + flex-direction: row; } ul.record_actions_column { - flex-direction: column; + flex-direction: column; } ul.record_actions.sticky-form-buttons { - padding-left: 1em; - padding-right: 1em; + padding-left: 1em; + padding-right: 1em; } -// inside table, little space between elements -td ul.record_actions, +// inside table exceptions +table { + td ul.record_actions, ul.record_actions_small { - li { - margin-right: 0.2em; - } + li { + margin-right: 0.2em; + } + } + + ul.record_actions { + margin: 0; + padding: 0.5em; + } } diff --git a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss index 4c65e9af0..7053c26fc 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss @@ -31,14 +31,6 @@ margin-right: 1em; } -// reserre la hauteur des rangées de tableau (ul.record_actions prennait trop de place) -table { - ul.record_actions { - margin: 0; - padding: 0.5em; - } -} - // styles communs pour tous les bandeaux div.banner { .id-number {