From 098a2ea6205b85f34988f101a663e93cf73235b1 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Thu, 20 May 2021 18:42:40 +0200 Subject: [PATCH 01/12] improve AccompanyingCourse ux design --- .../Resources/public/scss/chillmain.scss | 13 ++- .../public/vuejs/AccompanyingCourse/App.vue | 88 ++++++++++--------- .../AccompanyingCourse/components/Banner.vue | 8 +- .../AccompanyingCourse/components/Comment.vue | 22 +++-- 4 files changed, 73 insertions(+), 58 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss index 6cf4d23f2..6aa0e1c8d 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss @@ -13,9 +13,9 @@ div#header-accompanying_course-name { background: none repeat scroll 0 0 #718596; color: #FFF; - padding-top: 1em; - padding-bottom: 1em; - + h1 { + margin: 0.4em 0; + } span { a { color: white; @@ -54,3 +54,10 @@ div.subheader { color: grey; margin-right: 1em; } + +table { + ul.record_actions { + margin: 0; + padding: 0.5em; + } +} diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue index 7f9b66326..e14c9d7d7 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue @@ -44,51 +44,53 @@ export default { diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue index 1a85e4bb7..e81ac647a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue @@ -20,9 +20,11 @@
- - {{ $t('course.step.draft') }} - + + + {{ $t('course.step.draft') }} + +
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue index c3e83a548..835d245d8 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue @@ -8,17 +8,19 @@
-
- créé par {{ initialComment.creator.text }} - le {{ $d(initialComment.createdAt.datetime, 'long') }} -
- modifié par {{ initialComment.updatedBy.text }} - le {{ $d(initialComment.updatedAt.datetime, 'long') }} -
-
-
+ + +
+ créé par {{ initialComment.creator.text }} + le {{ $d(initialComment.createdAt.datetime, 'long') }} +
+ modifié par {{ initialComment.updatedBy.text }} + le {{ $d(initialComment.updatedAt.datetime, 'long') }} +
+
+ +
  • @@ -38,6 +41,7 @@
+
From a88acd34fdcb9308f8abbbc8ea18eb986d722116 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Fri, 21 May 2021 11:41:36 +0200 Subject: [PATCH 02/12] design and translations --- .../Resources/public/vuejs/AccompanyingCourse/App.vue | 10 ++++++++-- .../vuejs/AccompanyingCourse/components/Comment.vue | 10 ++++------ .../vuejs/AccompanyingCourse/components/Requestor.vue | 5 ++++- .../public/vuejs/AccompanyingCourse/js/i18n.js | 9 +++++++-- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue index e14c9d7d7..a10c5b4ca 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue @@ -54,10 +54,16 @@ export default { position: relative; &:before { position: absolute; - content: "\f192"; + /* + content: "\f192"; //circle-dot + content: "\f1dd"; //paragraph + content: "\f292"; //hashtag + content: "\f069"; //asterisk + */ + content: "\f142"; //ellipsis-v font-family: "ForkAwesome"; color: #718596ab; - left: -28px; + left: -22px; top: 4px; } a[name^="section"] { diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue index 835d245d8..858d6d04e 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue @@ -13,12 +13,10 @@
- créé par {{ initialComment.creator.text }} - le {{ $d(initialComment.createdAt.datetime, 'long') }} -
- modifié par {{ initialComment.updatedBy.text }} - le {{ $d(initialComment.updatedAt.datetime, 'long') }} -
+ {{ $t('comment.created_by', [ + initialComment.creator.text, + $d(initialComment.createdAt.datetime, 'long') + ]) }}