diff --git a/kfet/forms.py b/kfet/forms.py index 59a78174..95e97d56 100644 --- a/kfet/forms.py +++ b/kfet/forms.py @@ -539,11 +539,7 @@ class OrderArticleForm(forms.Form): self.category = kwargs['initial']['category'] self.category_name = kwargs['initial']['category__name'] self.box_capacity = kwargs['initial']['box_capacity'] - self.v_s1 = kwargs['initial']['v_s1'] - self.v_s2 = kwargs['initial']['v_s2'] - self.v_s3 = kwargs['initial']['v_s3'] - self.v_s4 = kwargs['initial']['v_s4'] - self.v_s5 = kwargs['initial']['v_s5'] + self.v_all = kwargs['initial']['v_all'] self.v_moy = kwargs['initial']['v_moy'] self.v_et = kwargs['initial']['v_et'] self.v_prev = kwargs['initial']['v_prev'] diff --git a/kfet/static/kfet/css/index.css b/kfet/static/kfet/css/index.css index 0502a5f0..0740655f 100644 --- a/kfet/static/kfet/css/index.css +++ b/kfet/static/kfet/css/index.css @@ -33,10 +33,8 @@ textarea { .table { margin-bottom:0; border-bottom:1px solid #ddd; -} - -.table { width:100%; + background-color: #FFF; } .table td { @@ -70,6 +68,11 @@ textarea { padding:8px 30px; } +.table-responsive { + border: 0; + margin-bottom: 0; +} + .btn { transition: background-color, color; transition-duration: 0.15s; diff --git a/kfet/static/kfet/css/nav.css b/kfet/static/kfet/css/nav.css index d791a188..5d858e40 100644 --- a/kfet/static/kfet/css/nav.css +++ b/kfet/static/kfet/css/nav.css @@ -51,6 +51,15 @@ box-shadow: inset 0 5px 5px -5px #000; } +@media (max-width: 767px) { + .navbar-nav > li:hover > a, + .navbar-nav > li > a:focus, + .nav .open > a:hover, + .nav .open > a:focus { + box-shadow: inset 0 5px 5px -5px #000, inset 0 -5px 5px -5px #000; + } +} + .navbar-nav .dropdown .dropdown-menu { padding: 0; border: 0; diff --git a/kfet/templates/kfet/account_create_special.html b/kfet/templates/kfet/account_create_special.html index 06f502d9..cecbcfdc 100644 --- a/kfet/templates/kfet/account_create_special.html +++ b/kfet/templates/kfet/account_create_special.html @@ -11,10 +11,9 @@ {% block content %} -{% include 'kfet/base_messages.html' %} -
+ {% include 'kfet/base_messages.html' %}