From b7f9d1dcd8da2cdca501b0336a2d0d1c3b10a67b Mon Sep 17 00:00:00 2001 From: fefa4ka Date: Sun, 2 Aug 2015 23:09:00 +0300 Subject: [PATCH] fix --- app/settings.py | 2 +- zsite/static/less/people.less | 4 +++- zsite/static/less/theory.less | 17 ++++++++++++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/app/settings.py b/app/settings.py index edfdaae..1b8d6c6 100644 --- a/app/settings.py +++ b/app/settings.py @@ -109,7 +109,7 @@ PIPELINE_JS = { 'vendor/angular/angular.js', 'vendor/angular-bootstrap/ui-bootstrap.js', 'vendor/angular-bootstrap/ui-bootstrap-tpls.js', - # 'vendor/jquery/dist/jquery.js', + 'vendor/jquery/dist/jquery.js', ), 'output_filename': 'js/vendor.js', } diff --git a/zsite/static/less/people.less b/zsite/static/less/people.less index aed5823..fc4b591 100644 --- a/zsite/static/less/people.less +++ b/zsite/static/less/people.less @@ -15,16 +15,18 @@ padding-right: 20%; float: right; } + .plugin-people-feature { margin-top: 20px; .people-visual { float: left; margin-bottom: 10px; + margin-left: -120px; + } .people-description { - width: 80%; font-size: 15px; padding-top: 25px; diff --git a/zsite/static/less/theory.less b/zsite/static/less/theory.less index 2e064ce..d53dbb0 100644 --- a/zsite/static/less/theory.less +++ b/zsite/static/less/theory.less @@ -1,11 +1,13 @@ .theory { background: #FFF0D8; - padding: 5px 18px; + padding: 5px 15px; h5 { padding-left: 22px; font-weight: 700; + + margin-bottom: 5px; } ul { @@ -13,6 +15,19 @@ li { margin-bottom: 5px; + + text-indent: -22px; + margin-left: 22px; } } + + border-radius: 3px; +} + + +.theory-block { + .about-videos { + margin-top: 15px; + margin-left: 10px; + } } \ No newline at end of file