diff --git a/static/participation_landing/css/main.css b/static/participation_landing/css/main.css index ac4fc9aa..97b811c2 100755 --- a/static/participation_landing/css/main.css +++ b/static/participation_landing/css/main.css @@ -489,7 +489,7 @@ h1 .orange{ .not_end{ font-size: 24px; - font-weight: 700; + font-weight: 400; } .not_end a{ @@ -630,6 +630,7 @@ h1 .orange{ .review h5{ font-size: 22px; margin-bottom: 5px; + font-weight: 400; } .review i{ @@ -703,11 +704,6 @@ h1 .orange{ text-decoration: none; } -.articles li a:hover img{ - box-shadow: 0px 8px 18px rgba(255, 132, 0, 0.48), 8px 0px 18px rgba(255, 132, 0, 0.48); - transition: box-shadow .3s; -} - .articles li a:hover span{ text-decoration: none; color: #ff6600; @@ -740,8 +736,12 @@ footer h5{ padding: 50px 0px; } -.subscribe_form input{ +.subscribe_form .form_field{ display: inline-block; + position: relative; +} + +.subscribe_form input{ vertical-align: top; width: 395px; height: 45px; @@ -771,6 +771,16 @@ footer h5{ cursor: pointer; } +.subscribe_form .form_error{ + padding-top: 5px; + text-align: center; + font-size: 18px; + color: #f00; + position: absolute; + left: 0px; + right: 0px; +} + footer p{ font-size: 36px; font-weight: 400; @@ -814,15 +824,16 @@ footer p span{ background: -ms-linear-gradient(top, rgba(19,22,26,1) 0%, rgba(29,22,29,1) 100%); background: linear-gradient(to bottom, rgba(19,22,26,1) 0%, rgba(29,22,29,1) 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#13161a', endColorstr='#1d161d', GradientType=0 ); + font-family: 'Open Sans', sans-serif; } .modal h2 { - font: 33px 'DinProBlack', sans-serif; + font: bold 28px 'Open Sans', sans-serif; color: #fff; } .modal h3 { - font: 300 18px 'DinPro', sans-serif; + font: 300 18px 'Open Sans', sans-serif; color: #fff; padding: 10px 0px 20px; } @@ -830,7 +841,7 @@ footer p span{ .modal input { display: block; width: 310px; - font: 300 15px/43px 'DinPro', sans-serif; + font: 300 15px/43px 'Open Sans', sans-serif; padding: 0px 18px 0px; background: #eaeaea; border: 1px solid #dcdcdc; @@ -843,6 +854,12 @@ input.error { box-shadow: 0px 0px 2px 2px #f00; } +.modal .form_error{ + color: #f00; + position: relative; + top: -10px; +} + .modal button { display: block; width: 348px; diff --git a/static/participation_landing/js/main.js b/static/participation_landing/js/main.js index b6fea723..71832c6e 100755 --- a/static/participation_landing/js/main.js +++ b/static/participation_landing/js/main.js @@ -49,6 +49,7 @@ $(document).ready(function(){ type = $form.attr('method'); $form.find('.error').removeClass('error'); + $form.find('.form_error').remove(); $.ajax({ url: url, @@ -63,6 +64,8 @@ $(document).ready(function(){ if (data.errors) { $.each(data.errors, function(i, val) { $form.find('input[name="' + i + '"]').addClass('error') + .after('
' + val + '
'); + }); } } @@ -77,6 +80,7 @@ $(document).ready(function(){ type = $form.attr('method'); $form.find('.error').removeClass('error'); + $form.find('.form_error').remove(); $.ajax({ url: url, @@ -91,6 +95,7 @@ $(document).ready(function(){ if (data.errors) { $.each(data.errors, function(i, val) { $form.find('input[name="' + i + '"]').addClass('error') + .after('
' + val + '
'); }); } } diff --git a/templates/admin/base.html b/templates/admin/base.html index 33964661..ebebafe4 100644 --- a/templates/admin/base.html +++ b/templates/admin/base.html @@ -27,7 +27,7 @@ - + {# select2 #} @@ -37,7 +37,7 @@ - + {% block main_js_exlude %} {% endblock main_js_exlude %} @@ -55,6 +55,9 @@ #navigation{ margin-top: 10px; } + .dropdown-menu{ + margin-bottom: 20px; + } {% block styles %} {% endblock %} diff --git a/templates/admin/includes/admin_nav.html b/templates/admin/includes/admin_nav.html index 56ee272b..56cc65a4 100644 --- a/templates/admin/includes/admin_nav.html +++ b/templates/admin/includes/admin_nav.html @@ -1,6 +1,6 @@ {% load i18n %} -