From 40ca1e276ba705eeea1a37fc2da24704e3e58cca Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Fri, 26 Nov 2021 16:53:19 +0100 Subject: [PATCH] styles sheets cleaning --- .../Resources/public/chill/chillmain.scss | 27 ++++---- .../Resources/public/chill/scss/badge.scss | 11 ++-- .../Resources/public/chill/chillperson.scss | 65 ++++++++++--------- .../Resources/public/chill/scss/badge.scss | 54 ++++----------- 4 files changed, 70 insertions(+), 87 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss index 474f21981..e7f613bc8 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss @@ -205,9 +205,9 @@ footer.footer { } } - /* - * SPECIFIC RULES + * GENERIC MAIN STYLES + * miscellaneous */ /// titles @@ -283,7 +283,6 @@ div.metadata { } /// chill help tooltip - .chill-help-tooltip { &::before { content: '\f05a'; @@ -298,7 +297,6 @@ div.metadata { /// display definition list // with dt and dd on same line - dl.definition-inline { dd { display: inline; @@ -320,6 +318,19 @@ dl.definition-inline { font-style: italic; } +/// flash +div#flashMessages { + margin-top: 20px; + .flash-notice { + margin-top: 10px; + margin-bottom: 10px; + } +} + +/* + * SPECIFIC RULES + */ + //// still used ? // move from chillmain.css, converted to sass @@ -372,14 +383,6 @@ div#usefulbar { } } -div#flashMessages { - margin-top: 20px; - .flash-notice { - margin-top: 10px; - margin-bottom: 10px; - } -} - .personName { font-variant: small-caps; text-transform: capitalize; diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/badge.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/badge.scss index b17f17295..5a7c084a8 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/badge.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/badge.scss @@ -1,8 +1,5 @@ -/// -/// A specific list of badges used to manage suggestions (with add/remove link) -/// use bootstrap badge styles, cfr. src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_custom.scss -/// +/// mixin used in this sheet @mixin remove_link { cursor: pointer; &:before { @@ -14,6 +11,12 @@ } } +/* +* SUGGESTIONS LIST - A specific list of badges used to manage suggestions (with add/remove link) +* /!\ use bootstrap badge styles, +* cfr. src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_custom.scss +*/ + ul.list-suggest { list-style-type: none; padding-left: 0; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss index 6c9687ff9..f39f64eb2 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss @@ -95,7 +95,6 @@ div.person-view { * Header custom for Accompanying Course */ - div.banner { div#header-accompanying_course-name { background: none repeat scroll 0 0 $chill-accourse-context; @@ -117,6 +116,37 @@ div.banner { color: $white; padding-top: 1em; padding-bottom: 1em; + + /// AccompanyingCourse: HeaderSlider Carousel + button.carousel-control-prev, + button.carousel-control-next { + width: 8%; + opacity: inherit; + } + button.carousel-control-prev { + left: unset; + right: 0; + } + span.to-social-issues, + span.to-persons-associated { + display: inline-block; + border-radius: 15px; + width: 24px; + height: 24px; + box-shadow: 0 0 3px 1px grey; + opacity: 0.8; + &:hover { + opacity: 1; + } + } + span.to-social-issues { + background-color: #4bafe8; + border-left: 12px solid #32749a; + } + span.to-persons-associated { + background-color: #16d9b4; + border-right: 12px solid #ffffff; + } } } @@ -203,34 +233,11 @@ div.household-resume { } } -/// Horizontal list of persons (Accourse resume page) -div.accompanyingcourse-resume { - div.associated-persons { - font-size: 110%; - span.household { - display: inline-block; - border-radius: 8px; - border: 1px solid $white; - &:hover { - border: 1px solid $chill-beige; - i { - display: inline-block; - } - } - &.no-household:hover { - border: 1px solid $white; - } - i { - color: $chill-beige; - display: none; - } - padding: 0.3em; - margin-right: 2px; - } - } -} +/* +* GENERIC PERSON STYLES +* miscellaneous +*/ -/// abbr.referrer { // still used ? font-size: 70%; padding-right: 0.4em; @@ -246,4 +253,4 @@ abbr.referrer { // still used ? .created-updated { border: 1px solid black; padding: 10px; -} \ No newline at end of file +} diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss index beb3ceb56..820d70483 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss @@ -81,25 +81,23 @@ h2.badge-title { font-size: 70%; padding-left: 1rem; } - - &:hover { - background-color: $chill-ll-gray; - } } } -/// theses links apply on badge (or other styled elements) as parent tag. -// They don't have button, picto or simple text appearance +/// Theses links apply on badge as parent tag. +/// They don't look like button, picto or simple text links a.badge-link { color: unset; text-decoration: unset; & > h2.badge-title { &:hover { - box-shadow: 0 0 7px 0 $chill-gray; - opacity: 0.8; + //box-shadow: 0 0 7px 0 $chill-gray; + //opacity: 0.8; } - span.title_action:hover { - //background-color: ; + span.title_action { + &:hover { + background-color: $chill-ll-gray; + } } } } @@ -146,35 +144,7 @@ div.activity-list { } } -/// AccompanyingCourse: HeaderSlider Carousel -div#header-accompanying_course-details { - button.carousel-control-prev, - button.carousel-control-next { - width: 8%; - opacity: inherit; - } - button.carousel-control-prev { - left: unset; - right: 0; - } - span.to-social-issues, - span.to-persons-associated { - display: inline-block; - border-radius: 15px; - width: 24px; - height: 24px; - box-shadow: 0 0 3px 1px grey; - opacity: 0.8; - &:hover { - opacity: 1; - } - } - span.to-social-issues { - background-color: #4bafe8; - border-left: 12px solid #32749a; - } - span.to-persons-associated { - background-color: #16d9b4; - border-right: 12px solid #ffffff; - } -} +/* +*/ + +