diff --git a/media/filer_public/12/0e/120e3b46-36bd-4ebb-830c-2f5a05f54e0d/img_5824.jpg b/media/filer_public/12/0e/120e3b46-36bd-4ebb-830c-2f5a05f54e0d/img_5824.jpg new file mode 100644 index 0000000..45164c4 Binary files /dev/null and b/media/filer_public/12/0e/120e3b46-36bd-4ebb-830c-2f5a05f54e0d/img_5824.jpg differ diff --git a/media/filer_public/1e/6b/1e6b07dc-78ea-4d87-8109-aa4aae1cf3c1/img_5825.jpg b/media/filer_public/1e/6b/1e6b07dc-78ea-4d87-8109-aa4aae1cf3c1/img_5825.jpg new file mode 100644 index 0000000..a867271 Binary files /dev/null and b/media/filer_public/1e/6b/1e6b07dc-78ea-4d87-8109-aa4aae1cf3c1/img_5825.jpg differ diff --git a/media/filer_public/9b/91/9b9177c3-b901-4d7d-ad69-265f17c0d1a9/unnamed.jpg b/media/filer_public/9b/91/9b9177c3-b901-4d7d-ad69-265f17c0d1a9/unnamed.jpg new file mode 100644 index 0000000..8f6a328 Binary files /dev/null and b/media/filer_public/9b/91/9b9177c3-b901-4d7d-ad69-265f17c0d1a9/unnamed.jpg differ diff --git a/media/filer_public/df/18/df18f1c1-7d43-4ec3-8770-d35bfc162970/img_5823.jpg b/media/filer_public/df/18/df18f1c1-7d43-4ec3-8770-d35bfc162970/img_5823.jpg new file mode 100644 index 0000000..cbcf274 Binary files /dev/null and b/media/filer_public/df/18/df18f1c1-7d43-4ec3-8770-d35bfc162970/img_5823.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/12/0e/120e3b46-36bd-4ebb-830c-2f5a05f54e0d/img_5824.jpg__16x16_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/12/0e/120e3b46-36bd-4ebb-830c-2f5a05f54e0d/img_5824.jpg__16x16_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..bdf1674 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/12/0e/120e3b46-36bd-4ebb-830c-2f5a05f54e0d/img_5824.jpg__16x16_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/12/0e/120e3b46-36bd-4ebb-830c-2f5a05f54e0d/img_5824.jpg__210x10000_q85_subsampling-2.jpg b/media/filer_public_thumbnails/filer_public/12/0e/120e3b46-36bd-4ebb-830c-2f5a05f54e0d/img_5824.jpg__210x10000_q85_subsampling-2.jpg new file mode 100644 index 0000000..2f10c7f Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/12/0e/120e3b46-36bd-4ebb-830c-2f5a05f54e0d/img_5824.jpg__210x10000_q85_subsampling-2.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/12/0e/120e3b46-36bd-4ebb-830c-2f5a05f54e0d/img_5824.jpg__300x225_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/12/0e/120e3b46-36bd-4ebb-830c-2f5a05f54e0d/img_5824.jpg__300x225_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..aa8adba Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/12/0e/120e3b46-36bd-4ebb-830c-2f5a05f54e0d/img_5824.jpg__300x225_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/12/0e/120e3b46-36bd-4ebb-830c-2f5a05f54e0d/img_5824.jpg__32x32_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/12/0e/120e3b46-36bd-4ebb-830c-2f5a05f54e0d/img_5824.jpg__32x32_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..f8718df Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/12/0e/120e3b46-36bd-4ebb-830c-2f5a05f54e0d/img_5824.jpg__32x32_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/12/0e/120e3b46-36bd-4ebb-830c-2f5a05f54e0d/img_5824.jpg__48x48_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/12/0e/120e3b46-36bd-4ebb-830c-2f5a05f54e0d/img_5824.jpg__48x48_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..e0ea8b0 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/12/0e/120e3b46-36bd-4ebb-830c-2f5a05f54e0d/img_5824.jpg__48x48_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/12/0e/120e3b46-36bd-4ebb-830c-2f5a05f54e0d/img_5824.jpg__64x64_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/12/0e/120e3b46-36bd-4ebb-830c-2f5a05f54e0d/img_5824.jpg__64x64_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..c09647d Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/12/0e/120e3b46-36bd-4ebb-830c-2f5a05f54e0d/img_5824.jpg__64x64_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/1e/6b/1e6b07dc-78ea-4d87-8109-aa4aae1cf3c1/img_5825.jpg__16x16_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/1e/6b/1e6b07dc-78ea-4d87-8109-aa4aae1cf3c1/img_5825.jpg__16x16_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..45da1e8 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/1e/6b/1e6b07dc-78ea-4d87-8109-aa4aae1cf3c1/img_5825.jpg__16x16_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/1e/6b/1e6b07dc-78ea-4d87-8109-aa4aae1cf3c1/img_5825.jpg__210x10000_q85_subsampling-2.jpg b/media/filer_public_thumbnails/filer_public/1e/6b/1e6b07dc-78ea-4d87-8109-aa4aae1cf3c1/img_5825.jpg__210x10000_q85_subsampling-2.jpg new file mode 100644 index 0000000..c5a0977 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/1e/6b/1e6b07dc-78ea-4d87-8109-aa4aae1cf3c1/img_5825.jpg__210x10000_q85_subsampling-2.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/1e/6b/1e6b07dc-78ea-4d87-8109-aa4aae1cf3c1/img_5825.jpg__32x32_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/1e/6b/1e6b07dc-78ea-4d87-8109-aa4aae1cf3c1/img_5825.jpg__32x32_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..fd9d2b8 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/1e/6b/1e6b07dc-78ea-4d87-8109-aa4aae1cf3c1/img_5825.jpg__32x32_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/1e/6b/1e6b07dc-78ea-4d87-8109-aa4aae1cf3c1/img_5825.jpg__48x48_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/1e/6b/1e6b07dc-78ea-4d87-8109-aa4aae1cf3c1/img_5825.jpg__48x48_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..28bb08f Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/1e/6b/1e6b07dc-78ea-4d87-8109-aa4aae1cf3c1/img_5825.jpg__48x48_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/1e/6b/1e6b07dc-78ea-4d87-8109-aa4aae1cf3c1/img_5825.jpg__64x64_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/1e/6b/1e6b07dc-78ea-4d87-8109-aa4aae1cf3c1/img_5825.jpg__64x64_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..0a3b032 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/1e/6b/1e6b07dc-78ea-4d87-8109-aa4aae1cf3c1/img_5825.jpg__64x64_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/9b/91/9b9177c3-b901-4d7d-ad69-265f17c0d1a9/unnamed.jpg__16x16_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/9b/91/9b9177c3-b901-4d7d-ad69-265f17c0d1a9/unnamed.jpg__16x16_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..e32bf01 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/9b/91/9b9177c3-b901-4d7d-ad69-265f17c0d1a9/unnamed.jpg__16x16_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/9b/91/9b9177c3-b901-4d7d-ad69-265f17c0d1a9/unnamed.jpg__210x10000_q85_subsampling-2.jpg b/media/filer_public_thumbnails/filer_public/9b/91/9b9177c3-b901-4d7d-ad69-265f17c0d1a9/unnamed.jpg__210x10000_q85_subsampling-2.jpg new file mode 100644 index 0000000..8f1e80e Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/9b/91/9b9177c3-b901-4d7d-ad69-265f17c0d1a9/unnamed.jpg__210x10000_q85_subsampling-2.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/9b/91/9b9177c3-b901-4d7d-ad69-265f17c0d1a9/unnamed.jpg__32x32_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/9b/91/9b9177c3-b901-4d7d-ad69-265f17c0d1a9/unnamed.jpg__32x32_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..3df911c Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/9b/91/9b9177c3-b901-4d7d-ad69-265f17c0d1a9/unnamed.jpg__32x32_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/9b/91/9b9177c3-b901-4d7d-ad69-265f17c0d1a9/unnamed.jpg__48x48_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/9b/91/9b9177c3-b901-4d7d-ad69-265f17c0d1a9/unnamed.jpg__48x48_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..eebd501 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/9b/91/9b9177c3-b901-4d7d-ad69-265f17c0d1a9/unnamed.jpg__48x48_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/9b/91/9b9177c3-b901-4d7d-ad69-265f17c0d1a9/unnamed.jpg__64x64_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/9b/91/9b9177c3-b901-4d7d-ad69-265f17c0d1a9/unnamed.jpg__64x64_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..ab5be9c Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/9b/91/9b9177c3-b901-4d7d-ad69-265f17c0d1a9/unnamed.jpg__64x64_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/df/18/df18f1c1-7d43-4ec3-8770-d35bfc162970/img_5823.jpg__16x16_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/df/18/df18f1c1-7d43-4ec3-8770-d35bfc162970/img_5823.jpg__16x16_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..05b2feb Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/df/18/df18f1c1-7d43-4ec3-8770-d35bfc162970/img_5823.jpg__16x16_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/df/18/df18f1c1-7d43-4ec3-8770-d35bfc162970/img_5823.jpg__32x32_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/df/18/df18f1c1-7d43-4ec3-8770-d35bfc162970/img_5823.jpg__32x32_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..70365d6 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/df/18/df18f1c1-7d43-4ec3-8770-d35bfc162970/img_5823.jpg__32x32_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/df/18/df18f1c1-7d43-4ec3-8770-d35bfc162970/img_5823.jpg__48x48_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/df/18/df18f1c1-7d43-4ec3-8770-d35bfc162970/img_5823.jpg__48x48_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..1876ef7 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/df/18/df18f1c1-7d43-4ec3-8770-d35bfc162970/img_5823.jpg__48x48_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/df/18/df18f1c1-7d43-4ec3-8770-d35bfc162970/img_5823.jpg__64x64_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/df/18/df18f1c1-7d43-4ec3-8770-d35bfc162970/img_5823.jpg__64x64_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..edb27a6 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/df/18/df18f1c1-7d43-4ec3-8770-d35bfc162970/img_5823.jpg__64x64_q85_crop_subsampling-2_upscale.jpg differ diff --git a/zsite/static/less/blog.less b/zsite/static/less/blog.less index 8376c0c..be56bc4 100644 --- a/zsite/static/less/blog.less +++ b/zsite/static/less/blog.less @@ -1,7 +1,11 @@ .blog-content { - img { + .img-right { margin-left: 20px; } + + .img-left { + margin-right: 20px; + } } .date { diff --git a/zsite/static/less/header.less b/zsite/static/less/header.less index 4a27076..29f3aff 100644 --- a/zsite/static/less/header.less +++ b/zsite/static/less/header.less @@ -110,14 +110,6 @@ -.header-menu.main { - li { - @media (min-width: 1200px) { - margin-right: 0; - width: 150px; - } - } -} .header-menu { font-size: 16px; @@ -139,7 +131,8 @@ } @media (min-width: 1200px) { - margin-right: 39px; + width: 150px; + margin: 0; } diff --git a/zsite/static/less/service.less b/zsite/static/less/service.less index 4f5250a..8d4c821 100644 --- a/zsite/static/less/service.less +++ b/zsite/static/less/service.less @@ -241,7 +241,7 @@ p.desc { font-size: 13px; - margin-bottom: 2px; + padding-bottom: 3px; } li { @@ -259,7 +259,7 @@ p.desc { font-size: 12px; - margin-bottom: 3px; + padding-bottom: 3px; } li { @@ -286,6 +286,10 @@ p.header { font-size: 16px; } + + p.desc { + padding: 3px 0 2px 0; + } } } diff --git a/zsite/templates/menu_header.html b/zsite/templates/menu_header.html index 5fd99cc..4b563c6 100644 --- a/zsite/templates/menu_header.html +++ b/zsite/templates/menu_header.html @@ -1,4 +1,4 @@ -{% load i18n menu_tags cache %} +{% load i18n menu_tags cms_tags cache %} {% if children|length > 1 %}