diff --git a/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss b/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss index 4bb1204a4..bd67b58ca 100644 --- a/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss +++ b/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss @@ -1,4 +1,4 @@ -@import '~ChillMainAssets/modules/bootstrap/bootstrap'; +@import '~ChillMainAssets/module/bootstrap/bootstrap'; //@import '~ChillMainSass/custom/mixins/entity'; //.chill-entity.chill-entity__activity-reason { @@ -71,7 +71,7 @@ div.flex-table.list-records { &:nth-child(2) { flex-grow: 0; flex-shrink: 1; flex-basis: 70%; } - + &:only-child { flex-grow: 0; flex-shrink: 0; flex-basis: 100%; & > div.concerned-groups { @@ -80,11 +80,11 @@ div.flex-table.list-records { flex-direction: column; // TODO pas fini div.group { flex-grow: 1; flex-shrink: 0; flex-basis: 30%; - h4 {} + h4 {} ul.list-content { - li { + li { display: inline; - } + } } } } diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss index 7d291f784..ed432a7e4 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss @@ -6,7 +6,7 @@ * when possible, try to use bootstrap html class */ -@import '~ChillMainAssets/modules/bootstrap/bootstrap'; +@import '~ChillMainAssets/module/bootstrap/bootstrap'; /* * Specific rules @@ -20,12 +20,12 @@ // styles communs pour tous les bandeaux div.banner { .id-number { - font-weight: lighter; + font-weight: lighter; font-size: 50%; &:before { content: '(n°'; } &:after { content: ')'; } } - a.phone, + a.phone, a.email { color: white; } @@ -69,14 +69,14 @@ div.flex-table { } div.item-bloc { // We use box-shadow instead of border - // to avoid to manage border double-width + // to avoid to manage border double-width // when blocs are resized for small screen ! // Then we can simulate border-collapse: collapse (table) - box-shadow: - 1px 0 0 0 var(--bs-dark), - 0 1px 0 0 var(--bs-dark), + box-shadow: + 1px 0 0 0 var(--bs-dark), + 0 1px 0 0 var(--bs-dark), 1px 1px 0 0 var(--bs-dark), /* fix the corner */ - 1px 0 0 0 var(--bs-dark) inset, + 1px 0 0 0 var(--bs-dark) inset, 0 1px 0 0 var(--bs-dark) inset; } } diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/css/pikaday.css b/src/Bundle/ChillMainBundle/Resources/public/chill/css/pikaday.css deleted file mode 100644 index 495802417..000000000 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/css/pikaday.css +++ /dev/null @@ -1,173 +0,0 @@ -@charset "UTF-8"; - -/*! - * Pikaday - * Copyright © 2014 David Bushell | BSD & MIT license | http://dbushell.com/ - */ - -.pika-single { - z-index: 9999; - display: block; - position: relative; - width: 240px; - padding: 8px; - color: #333; - background: #fff; - border: 1px solid #ccc; - border-bottom-color: #bbb; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -} - -.pika-single.is-hidden { - display: none; -} - -.pika-single.is-bound { - position: absolute; - box-shadow: 0 5px 15px -5px rgba(0,0,0,.5); -} - -.pika-title { - position: relative; - text-align: center; -} - -.pika-label { - display: inline-block; - *display: inline; - position: relative; - z-index: 9999; - overflow: hidden; - margin: 0; - padding: 5px 3px; - font-size: 14px; - line-height: 20px; - font-weight: bold; - background-color: #fff; -} -.pika-title select { - cursor: pointer; - position: absolute; - z-index: 9998; - margin: 0; - left: 0; - top: 5px; - filter: alpha(opacity=0); - opacity: 0; -} - -.pika-prev, -.pika-next { - display: block; - cursor: pointer; - position: relative; - outline: none; - border: 0; - padding: 0; - width: 20px; - height: 30px; - /* hide text using text-indent trick, using width value (it's enough) */ - text-indent: 20px; - white-space: nowrap; - overflow: hidden; - background-color: transparent; - background-position: center center; - background-repeat: no-repeat; - background-size: 75% 75%; - opacity: .5; - *position: absolute; - *top: 0; -} - -.pika-prev:hover, -.pika-next:hover { - opacity: 1; -} - -.pika-prev, -.is-rtl .pika-next { - float: left; - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAeCAYAAAAsEj5rAAAAUklEQVR42u3VMQoAIBADQf8Pgj+OD9hG2CtONJB2ymQkKe0HbwAP0xucDiQWARITIDEBEnMgMQ8S8+AqBIl6kKgHiXqQqAeJepBo/z38J/U0uAHlaBkBl9I4GwAAAABJRU5ErkJggg=='); - *left: 0; -} - -.pika-next, -.is-rtl .pika-prev { - float: right; - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAeCAYAAAAsEj5rAAAAU0lEQVR42u3VOwoAMAgE0dwfAnNjU26bYkBCFGwfiL9VVWoO+BJ4Gf3gtsEKKoFBNTCoCAYVwaAiGNQGMUHMkjGbgjk2mIONuXo0nC8XnCf1JXgArVIZAQh5TKYAAAAASUVORK5CYII='); - *right: 0; -} - -.pika-prev.is-disabled, -.pika-next.is-disabled { - cursor: default; - opacity: .2; -} - -.pika-select { - display: inline-block; - *display: inline; -} - -.pika-table { - width: 100%; - border-collapse: collapse; - border-spacing: 0; - border: 0; -} - -.pika-table th, -.pika-table td { - width: 14.285714285714286%; - padding: 0; -} - -.pika-table th { - color: #999; - font-size: 12px; - line-height: 25px; - font-weight: bold; - text-align: center; -} - -.pika-button { - cursor: pointer; - display: block; - outline: none; - border: 0; - margin: 0; - width: 100%; - padding: 5px; - color: #666; - font-size: 12px; - line-height: 15px; - text-align: right; - background: #f5f5f5; -} - -.is-today .pika-button { - color: #33aaff; - font-weight: bold; -} - -.is-selected .pika-button { - color: #fff; - font-weight: bold; - background: #33aaff; - box-shadow: inset 0 1px 3px #178fe5; - border-radius: 3px; -} - -.is-disabled .pika-button { - pointer-events: none; - cursor: default; - color: #999; - opacity: .3; -} - -.pika-button:hover { - color: #fff !important; - background: #ff8000 !important; - box-shadow: none !important; - border-radius: 3px !important; -} diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/index.js b/src/Bundle/ChillMainBundle/Resources/public/chill/index.js index 6ced5dea2..cf7365631 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/index.js +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/index.js @@ -21,13 +21,11 @@ require('select2-bootstrap-theme/dist/select2-bootstrap.css'); require('./chillmain.scss'); require('./css/chillmain.css'); -/// still used ? -//require('./css/pickaday.css'); -//require('./js/date.js'); - import { chill } from './js/chill.js'; global.chill = chill; +require('./js/date.js'); + /// Load fonts require('./fonts/OpenSans/OpenSans.scss') diff --git a/src/Bundle/ChillMainBundle/Resources/public/page/login/login.scss b/src/Bundle/ChillMainBundle/Resources/public/page/login/login.scss index a451171b3..6cd15d577 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/page/login/login.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/page/login/login.scss @@ -1,4 +1,4 @@ -@import './../../fonts/OpenSans/OpenSans'; +@import 'ChillMainAssets/chill/fonts/OpenSans/OpenSans'; html, body { height: 100%; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss index 775789b48..9de18369a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss @@ -1,4 +1,4 @@ -@import '~ChillMainAssets/modules/bootstrap/bootstrap'; +@import '~ChillMainAssets/module/bootstrap/bootstrap'; /* * PERSON CONTEXT @@ -104,7 +104,7 @@ div#header-accompanying_course-details { * HOUSEHOLD CONTEXT * Header custom for Household */ - + div#header-household-name { background: none repeat scroll 0 0 #929d69; //#b97a7a; color: #FFF; @@ -138,11 +138,11 @@ div.address-timeline.grid { display: grid; grid-template-rows: auto auto auto; grid-template-columns: auto 120px auto; - + @media only screen and (max-width: 750px) { grid-template-columns: auto 1em auto; } - + div.top { grid-column: 2; text-align: center; @@ -153,7 +153,7 @@ div.address-timeline.grid { grid-column: 1; text-align: right; } - div.col-b, + div.col-b, div.date { grid-column: 2; position: relative; @@ -184,23 +184,23 @@ div.address-timeline.grid { border: 1px dashed #00000045; &.row1 { // current address border: 1px solid #000; - } + } div.address { font-variant: small-caps; } - } + } div.date { text-align: center; background-color: lightgrey; padding: 0.5em; border-radius: 0.3em; } - + div.span2 { grid-row: span 3; } div.span3 { grid-row: span 5; } div.span4 { grid-row: span 7; } div.span5 { grid-row: span 9; } - + ul.record_actions { margin: 0; } diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/household_edit_metadata/index.js b/src/Bundle/ChillPersonBundle/Resources/public/page/household_edit_metadata/index.js index 511ccf90f..003786c93 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/page/household_edit_metadata/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/page/household_edit_metadata/index.js @@ -1,4 +1,4 @@ -import { ShowHide } from 'ShowHide/show_hide.js'; +import { ShowHide } from 'ShowHide'; let k = document.getElementById('waitingForBirthContainer'), diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/person/index.js b/src/Bundle/ChillPersonBundle/Resources/public/page/person/index.js index da40dddc7..d641e3b36 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/page/person/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/page/person/index.js @@ -1,4 +1,4 @@ -import { ShowHide } from 'ShowHide/show_hide.js'; +import { ShowHide } from 'ShowHide'; const maritalStatus = document.getElementById("maritalStatus"); const maritalStatusDate = document.getElementById("maritalStatusDate"); diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue index 636acb658..134b35353 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue @@ -7,13 +7,13 @@

{{ $t('pick_social_issue_linked_with_action') }}

- +
{{ si.title.fr }}
-

{{ $t('pick_an_action') }}

+

{{ $t('pick_an_action') }}

+ >
@@ -86,7 +86,7 @@ #awc_create_form { display: grid; - grid-template-areas: + grid-template-areas: "picking picking" "start_date end_date" "confirm confirm" @@ -123,7 +123,7 @@