diff --git a/zsite/static/imgs/logo_footer_en.svg b/zsite/static/imgs/logo_footer_en.svg new file mode 100644 index 0000000..d46c975 --- /dev/null +++ b/zsite/static/imgs/logo_footer_en.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/zsite/static/imgs/logo_footer_ru.svg b/zsite/static/imgs/logo_footer_ru.svg new file mode 100644 index 0000000..88ca0ef --- /dev/null +++ b/zsite/static/imgs/logo_footer_ru.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/zsite/static/less/main.less b/zsite/static/less/main.less index a3e0be4..4d5f425 100644 --- a/zsite/static/less/main.less +++ b/zsite/static/less/main.less @@ -2,14 +2,40 @@ @import 'grid.less'; -@import url(http://fonts.googleapis.com/css?family=PT+Sans:400,700,400italic,700italic); -@import url(http://fonts.googleapis.com/css?family=Roboto+Slab); +@import url(http://fonts.googleapis.com/css?family=PT+Sans:400,700,400italic,700italic|Roboto+Slab:700,400&subset=cyrillic-ext,latin); @font-family-sans-serif: "PT Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; @font-family-serif: Georgia, "Times New Roman", Times, serif; @font-family-monospace: 'Roboto Slab', Menlo, Monaco, Consolas, "Courier New", monospace; @font-family-base: @font-family-sans-serif; +@font-size-base: 14px; +@font-size-large: ceil((@font-size-base * 1.25)); // ~18px +@font-size-small: ceil((@font-size-base * 0.85)); // ~12px + +// @font-size-h1: floor((@font-size-base * 2.6)); // ~36px +// @font-size-h2: floor((@font-size-base * 2.15)); // ~30px +@font-size-h1: ceil((@font-size-base * 1.7));// ~24px +@font-size-h2: @font-size-h1; +@font-size-h3: ceil((@font-size-base * 1.55)); // ~22px +@font-size-h4: ceil((@font-size-base * 1.25)); // ~18px +@font-size-h5: @font-size-base; +@font-size-h6: ceil((@font-size-base * 0.85)); // ~12px + +//** Unit-less `line-height` for use in components like buttons. +@line-height-base: 1.428571429; // 20/14 +//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc. +@line-height-computed: floor((@font-size-base * @line-height-base)); // ~20px + +//** By default, this inherits from the ``. +@headings-font-family: inherit; +@headings-font-weight: 500; +@headings-line-height: 1.1; +@headings-color: inherit; + +h5 { + font-weight: 500; +} .wrapper { .make-row(); @@ -17,6 +43,7 @@ margin-top: 10px; margin-bottom: -10px; } + .header-logo { .make-lg-column(8); @@ -64,6 +91,7 @@ button { margin-bottom: 5px; + margin-right: -5px; } } @@ -85,16 +113,103 @@ left: 0; } -.menu-header { - font-family: 'Roboto Slab'; +.header-menu-font { + font-family: @font-family-monospace; } -.menu { - font-family: 'Roboto Slab'; +.header-menu { font-size: 16px; li { margin-top: 1px; margin-right: 35px; + font-weight: 400; + a { + text-decoration: underline; + } + } + + span.active { + font-weight: 700; + } +} + + +footer { + .make-row(); + + margin-top: 10px; + margin-bottom: 5px; + opacity: 0.5; + + font-size: 12px; + + .background-line-pattern { + opacity: 0.13; + } + + a { + color: #000000; + text-decoration: underline; + } + + li.active { + a { + text-decoration: none; + } + } + + .about { + .make-lg-column(2); + + margin-top: -10px; + + .copyright { + margin-top: 5px; + opacity: 0.7; + } + + ul { + margin-top: 16px; + + li { + line-height: 20px; + } + } + } + + .menu { + .make-lg-column(4); + + h5 { + margin-top: 6px; + margin-bottom: 18px; + } + + li { + line-height: 20px; + } + } + + .contacts { + .make-lg-column(2); + + margin-top: 39px; + + li { + margin-bottom: 10px; + } + } +} + +.sub-content { + .make-row(); + + .menu { + .make-lg-column(2); + } + + .content { + .make-lg-column(10); } } \ No newline at end of file diff --git a/zsite/templates/aldryn_people/person_detail.html b/zsite/templates/aldryn_people/person_detail.html new file mode 100644 index 0000000..c5dc573 --- /dev/null +++ b/zsite/templates/aldryn_people/person_detail.html @@ -0,0 +1,9 @@ +{% extends "base.html" %} + +{% block content %} +
+
+ {% include "aldryn_people/includes/people_item.html" with person=person %} +
+
+{% endblock content %} \ No newline at end of file diff --git a/zsite/templates/base.html b/zsite/templates/base.html index 076ea29..5ccd22b 100644 --- a/zsite/templates/base.html +++ b/zsite/templates/base.html @@ -19,11 +19,7 @@
@@ -44,13 +40,44 @@
-

{% trans 'Our Services' %}

+

{% trans 'Our Services' %}

-