From 9230f848db0baab4153c65426099c806740aa6c5 Mon Sep 17 00:00:00 2001 From: icemate Date: Thu, 18 Feb 2016 11:58:06 +0200 Subject: [PATCH] tokar commit --- frontend/views/accounts/service.php | 24 ++++++++++++++---------- frontend/web/css/style.css | 15 +++++++++++++++ 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/frontend/views/accounts/service.php b/frontend/views/accounts/service.php index c30888d..6c2e22c 100755 --- a/frontend/views/accounts/service.php +++ b/frontend/views/accounts/service.php @@ -32,19 +32,23 @@ $form = ActiveForm::begin(); ?>
-
- field($user_info, 'salary_currency') - ->label(false) - ->dropDownList($currencies); ?> +
field($user_info, 'salary', [ - 'template' => "{label}
от{input}за час\n{hint}\n{error}", + 'template' => "{label}
от{input}\n{hint}\n{error}", 'options' => [ 'class' => 'form-inline' ], ]) - ->label('Стоимость работ') - ->textInput([ - 'class' => 'custom-input-2 custom-input-2-date', - 'type' => 'number', - ]); ?> + ->label('Стоимость работ') + ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number']); + ?> +
+
+ field($user_info, 'salary_currency', [ + 'template' => "{input}за час\n{hint}\n{error}", + ]) + ->label(false) + ->dropDownList(Currency::getCurrencyDropdown()); + ?>
diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css index 6d62c78..4efe1dd 100755 --- a/frontend/web/css/style.css +++ b/frontend/web/css/style.css @@ -6015,3 +6015,18 @@ a {color: #0072bc} vertical-align: baseline; } } +.input-blocks.admin-currency-first .custom-input-2.custom-input-2-date {width: 66px} +.input-blocks.admin-currency-first {width: 150px} +.input-blocks.admin-currency-second {} +.input-blocks.admin-currency-second select { + border-radius: 0; + line-height: normal; +} +.input-blocks.admin-currency-second select:focus{ + box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset; + border: 1px solid #dcdcdc; + +} +.input-blocks.admin-currency-second .has-success select { + border: 1px solid #dcdcdc; +} \ No newline at end of file -- libgit2 0.21.4