From d6fabb78ca20e8d9cf185cd5ec763bced5bd63d6 Mon Sep 17 00:00:00 2001 From: fefa4ka Date: Wed, 15 Jul 2015 01:26:49 +0300 Subject: [PATCH] wabalabadaba --- zsite/locale/ru/LC_MESSAGES/django.mo | Bin 1599 -> 1600 bytes zsite/locale/ru/LC_MESSAGES/django.po | 2 +- zsite/static/less/header.less | 4 ++- zsite/static/less/main.less | 5 ++-- zsite/static/less/mainpage.less | 27 ++++++++++++++++++ zsite/static/less/people.less | 27 ++++++++++++++++++ .../plugins/feature/people_list.html | 2 +- 7 files changed, 61 insertions(+), 6 deletions(-) create mode 100644 zsite/static/less/mainpage.less diff --git a/zsite/locale/ru/LC_MESSAGES/django.mo b/zsite/locale/ru/LC_MESSAGES/django.mo index a2a29f85f0d7fff5f4d0a99e67616f44b2761b6c..11c5aeef58a2474dedbec022a022c4b088f0545e 100644 GIT binary patch delta 196 zcmdnbbAV?;OT8!q1A_w-0|Oh74g=E6Kspvk>jUXTAiaf=fng$$<^uBFSQr>&fpj2{ zmIu=LK$-_g_XBBNAUy|2s{`p%Q1MSdS_#Pi52Qi%D6vBHTL5W(AU}+iL5;x!$VdYU w7z63`K$;UsKL*ku2fYQ--az`xWKBkCM!w0ejOL6ClWQ5TGZt?SVS3FB03GZYF8}}l delta 194 zcmXZWArC=e7{&4P-0RxdI||9n2uv_RxK+8EO;K*UK~a4JQ)Ii_8+`|bPW1_Nm14U2 z8|n9)vz_fZyOYZ|>zbr-AQdsi5HlR&9FHdDSSBY0sfjae;SwEgaezDQ;pN{yu|s}i t9ox}wA7hoAM(S$9v7i{?9!q$`??Vrq;>-7~Ve*N^R`Dyl9@5|*egNj&7pDLK diff --git a/zsite/locale/ru/LC_MESSAGES/django.po b/zsite/locale/ru/LC_MESSAGES/django.po index 89295cd..7d050b4 100644 --- a/zsite/locale/ru/LC_MESSAGES/django.po +++ b/zsite/locale/ru/LC_MESSAGES/django.po @@ -32,7 +32,7 @@ msgid "our" msgstr "наш" #: zsite/templates/aldryn_people/plugins/feature/people_list.html:30 -msgid "answer your question" +msgid "answer your questions" msgstr "доступно обо всём расскажет" #: zsite/templates/aldryn_people/plugins/feature/people_list.html:33 diff --git a/zsite/static/less/header.less b/zsite/static/less/header.less index b94b68a..bd510ae 100644 --- a/zsite/static/less/header.less +++ b/zsite/static/less/header.less @@ -59,7 +59,8 @@ } h3 { - margin: 0; + margin-top: 0; + margin-bottom: 2px; } button { @@ -141,6 +142,7 @@ } li { + vertical-align: top; width: 13.9%; } diff --git a/zsite/static/less/main.less b/zsite/static/less/main.less index ae779d2..bfb62fa 100644 --- a/zsite/static/less/main.less +++ b/zsite/static/less/main.less @@ -8,6 +8,8 @@ @import 'sub_content.less'; +@import 'mainpage.less'; + @import 'people.less'; @import 'about.less'; @@ -57,7 +59,4 @@ font-family: 'Roboto Slab'; font-weight: 500; - - padding-top: 3px; - } \ No newline at end of file diff --git a/zsite/static/less/mainpage.less b/zsite/static/less/mainpage.less new file mode 100644 index 0000000..1c9d3ae --- /dev/null +++ b/zsite/static/less/mainpage.less @@ -0,0 +1,27 @@ +.main-departments { + .make-row(); + + .department { + .make-xs-column(6); + .make-sm-column(3); + + ul { + li { + margin-bottom: 2px; + } + } + } + + .main-department-exp { + h5 { + font-size: 15px; + } + h5, p { + margin: 0; + } + big { + font-size: 18px; + color: #417505; + } + } +} \ No newline at end of file diff --git a/zsite/static/less/people.less b/zsite/static/less/people.less index 2dbd387..f78b915 100644 --- a/zsite/static/less/people.less +++ b/zsite/static/less/people.less @@ -9,4 +9,31 @@ vertical-align: top; } +} + +.people-link { + padding-right: 20%; + float: right; +} +.plugin-people-feature { + margin-top: 20px; + + .people-visual { + float: left; + margin-bottom: 10px; + } + + .people-description { + width: 80%; + font-size: 16px; + + padding-top: 25px; + padding-left: 140px; + } + + .people-controls { + width: 80%; + text-align: right; + margin-bottom: 5px; + } } \ No newline at end of file diff --git a/zsite/templates/aldryn_people/plugins/feature/people_list.html b/zsite/templates/aldryn_people/plugins/feature/people_list.html index 08146cc..5f98dd5 100644 --- a/zsite/templates/aldryn_people/plugins/feature/people_list.html +++ b/zsite/templates/aldryn_people/plugins/feature/people_list.html @@ -27,7 +27,7 @@ {{ person.name }}
-

{{ person.name }}, {% trans 'our' %} {{ person.function|lower }}, {% trans 'answer your question' %}

+

{{ person.name }}, {% trans 'our' %} {{ person.function|lower }}, {% trans 'answer your questions' %}

{% trans 'Free Consultation' %}