diff --git a/Resources/public/css/person.css b/Resources/public/css/person.css index e6557aad5..6e496aa9a 100644 --- a/Resources/public/css/person.css +++ b/Resources/public/css/person.css @@ -1,3 +1,47 @@ +@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/custom\/config\/_colors\.scss}line{font-family:\0000318}} +.chill-blue { + color: #334d5c; } + +@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/custom\/config\/_colors\.scss}line{font-family:\0000318}} +.chill-green { + color: #43b29d; } + +@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/custom\/config\/_colors\.scss}line{font-family:\0000318}} +.chill-green-dark { + color: #328474; } + +@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/custom\/config\/_colors\.scss}line{font-family:\0000318}} +.chill-yellow { + color: #eec84a; } + +@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/custom\/config\/_colors\.scss}line{font-family:\0000318}} +.chill-orange { + color: #e2793d; } + +@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/custom\/config\/_colors\.scss}line{font-family:\0000318}} +.chill-red { + color: #df4949; } + +@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/custom\/config\/_colors\.scss}line{font-family:\0000318}} +.chill-gray { + color: #ececec; } + +@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/custom\/config\/_colors\.scss}line{font-family:\0000318}} +.chill-beige { + color: #cabb9f; } + +@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/custom\/config\/_colors\.scss}line{font-family:\0000318}} +.chill-pink { + color: #dd506d; } + +@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/custom\/config\/_colors\.scss}line{font-family:\0000318}} +.chill-dark-gray { + color: #333333; } + +@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/custom\/config\/_colors\.scss}line{font-family:\0000318}} +.chill-light-gray { + color: #b2b2b2; } + @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/person\/Resources\/public\/sass\/person\.scss}line{font-family:\000034}} div#header-person-name { background: none repeat scroll 0 0 #328474; @@ -12,4 +56,18 @@ div#header-person-details { padding-top: 1em; padding-bottom: 1em; } +@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/person\/Resources\/public\/sass\/person\.scss}line{font-family:\0000319}} +figure.person-details h2 { + font-family: 'open_sansbold'; + margin-bottom: 0.3em; } +@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/person\/Resources\/public\/sass\/person\.scss}line{font-family:\0000324}} +figure.person-details dl { + margin-top: 0.3em; } +@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/person\/Resources\/public\/sass\/person\.scss}line{font-family:\0000328}} +figure.person-details dt { + font-family: 'open_sansbold'; } +@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/person\/Resources\/public\/sass\/person\.scss}line{font-family:\0000332}} +figure.person-details dl { + margin-left: 0; } + /*# sourceMappingURL=person.css.map */ diff --git a/Resources/public/css/person.css.map b/Resources/public/css/person.css.map index 01f7c3c9f..c1dc18e28 100644 --- a/Resources/public/css/person.css.map +++ b/Resources/public/css/person.css.map @@ -1,7 +1,7 @@ { "version": 3, -"mappings": ";AAGA,sBAAuB;EACnB,UAAU,EAAE,8BAAwC;EACpD,KAAK,EAAE,IAAI;EACX,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,GAAG;;;AAGvB,yBAA0B;EACtB,UAAU,EAAE,8BAAmC;EAC/C,KAAK,EAAE,IAAI;EACX,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,GAAG", -"sources": ["../sass/person.scss"], +"mappings": ";AAiBE,WAA+B;EAC7B,KAAK,EAJI,OAAO;;;AAGlB,YAA+B;EAC7B,KAAK,EAJY,OAAO;;;AAG1B,iBAA+B;EAC7B,KAAK,EAJoB,OAAO;;;AAGlC,aAA+B;EAC7B,KAAK,EAJ4B,OAAO;;;AAG1C,aAA+B;EAC7B,KAAK,EAJoC,OAAO;;;AAGlD,UAA+B;EAC7B,KAAK,EAJ4C,OAAO;;;AAG1D,WAA+B;EAC7B,KAAK,EAJoD,OAAO;;;AAGlE,YAA+B;EAC7B,KAAK,EAJ4D,OAAO;;;AAG1E,WAA+B;EAC7B,KAAK,EAJoE,OAAO;;;AAGlF,gBAA+B;EAC7B,KAAK,EAJ4E,OAAO;;;AAG1F,iBAA+B;EAC7B,KAAK,EAJoF,OAAO;;;ACXpG,sBAAuB;EACnB,UAAU,EAAE,8BAAwC;EACpD,KAAK,EAAE,IAAI;EACX,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,GAAG;;;AAGvB,yBAA0B;EACtB,UAAU,EAAE,8BAAmC;EAC/C,KAAK,EAAE,IAAI;EACX,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,GAAG;;;AAItB,wBAAG;EACF,WAAW,EAAE,eAAe;EAC5B,aAAa,EAAE,KAAK;;AAGrB,wBAAG;EACF,UAAU,EAAE,KAAK;;AAGlB,wBAAG;EACF,WAAW,EAAE,eAAe;;AAG7B,wBAAG;EACF,WAAW,EAAE,CAAC", +"sources": ["../../../../main/Resources/public/sass/custom/config/_colors.scss","../sass/person.scss"], "names": [], "file": "person.css" } diff --git a/Resources/public/sass/person.scss b/Resources/public/sass/person.scss index 8b4f15e8e..7507992c6 100644 --- a/Resources/public/sass/person.scss +++ b/Resources/public/sass/person.scss @@ -13,4 +13,23 @@ div#header-person-details { color: #FFF; padding-top: 1em; padding-bottom: 1em; +} + +figure.person-details { + h2 { + font-family: 'open_sansbold'; + margin-bottom: 0.3em; + } + + dl { + margin-top: 0.3em; + } + + dt { + font-family: 'open_sansbold'; + } + + dl { + margin-left: 0; + } } \ No newline at end of file diff --git a/Resources/views/Person/view.html.twig b/Resources/views/Person/view.html.twig index e0f817321..d7fdf05b4 100644 --- a/Resources/views/Person/view.html.twig +++ b/Resources/views/Person/view.html.twig @@ -39,26 +39,26 @@ This view should receive those arguments: {{ include(edit_tmp_name, edit_tmp_args) }} {% endif %} -
-

{{ 'General information'|trans }}

+
+

{{ 'General information'|trans|upper }}

-
{{ 'First name'|trans }}
+
{{ 'First name'|trans }}
{{ person.firstName }}
-
{{ 'Last name'|trans }}
+
{{ 'Last name'|trans }}
{{ person.lastName }}
-
{{ 'Gender'|trans }}
+
{{ 'Gender'|trans }}
{{ ( person.gender|default('Not given'))|trans }}
-
-

{{ 'Birth information'|trans }}

+
+

{{ 'Birth information'|trans|upper }}

-
{{ 'Date of birth'|trans }}
+
{{ 'Date of birth'|trans }}
{%- if person.birthdate is not null -%} {{ person.birthdate|localizeddate('long', 'none') }} @@ -68,7 +68,7 @@ This view should receive those arguments:
-
{{ 'Place of birth'|trans }}
+
{{ 'Place of birth'|trans }}
{{ person.placeOfBirth }}
{% spaceless %} @@ -88,11 +88,11 @@ This view should receive those arguments: {{ include(edit_tmp_name, edit_tmp_args) }} {% endif %} -
-

{{ 'Administrative information'|trans }}

+
+

{{ 'Administrative information'|trans|upper }}

-
{{ 'Nationality'|trans }}
+
{{ 'Nationality'|trans }}
{% if person.nationality is not null %} {{ person.nationality.name|localize_translatable_string }} @@ -102,7 +102,7 @@ This view should receive those arguments:
-
{{'Spoken languages'|trans}}
+
{{'Spoken languages'|trans}}
{% if person.spokenLanguages|length == 0 %} {{ 'Unknown spoken languages'|trans }} @@ -114,7 +114,7 @@ This view should receive those arguments:
-
{{'Marital status'|trans}}
+
{{'Marital status'|trans}}
{% if person.maritalStatus is not null %} {{ person.maritalStatus.name|localize_translatable_string }} @@ -129,15 +129,15 @@ This view should receive those arguments: {{ include(edit_tmp_name, edit_tmp_args) }} {% endif %} -
-

{{ 'Contact information'|trans }}

+
+

{{ 'Contact information'|trans|upper }}

-
{{ 'Email'|trans }}
+
{{ 'Email'|trans }}
{{ person.email}} 
-
{{ 'Phonenumber'|trans }}
+
{{ 'Phonenumber'|trans }}
{{ person.phonenumber}} 
@@ -148,7 +148,7 @@ This view should receive those arguments: {% endif %} {% if cFGroup %} -
+
{% for customField in cFGroup.customFields %} {% if customField.type == 'title' %} {{ chill_custom_field_widget(person.cFData , customField) }} diff --git a/Resources/views/menu.html.twig b/Resources/views/menu.html.twig index 003d02a32..234beca3b 100644 --- a/Resources/views/menu.html.twig +++ b/Resources/views/menu.html.twig @@ -21,7 +21,7 @@ active {% endif %} {% endspaceless %} "> - {{ route.label|trans }} + {{ route.label|trans|upper }} {% endfor %} \ No newline at end of file