Skip to content
This repository
Browse code

stylings for main menu and login form

  • Loading branch information...
commit 3fa64d0bea29a5e21ad489c56a43d5099dbc15e6 1 parent 1b27937
Vitaly Tatarintsev authored
6 app/assets/stylesheets/app_bootstrap.css.scss
@@ -37,5 +37,11 @@ $baseLineHeight: 18px;
37 37 width: 70px;
38 38 }
39 39
  40 +form.top-login {
  41 + input[type=email], input[type=password] {
  42 + margin-top: 5px;
  43 + }
  44 +}
  45 +
40 46 @import "twitter/bootstrap";
41 47 @import "twitter/bootstrap-responsive";
9 app/views/shared/_top_nav_bar.html.haml
@@ -29,6 +29,9 @@
29 29 %li= link_to t("users.logout"), :destroy_user_session, method: :delete
30 30 - else
31 31 = form_for "user", url: user_session_path, html: {action: user_session, class: "form-inline pull-right top-login"} do |f|
32   - = f.email_field :email, placeholder: "email", class: "input-small"
33   - = f.password_field :password, placeholder: "Пароль", class: "input-small"
34   - = f.submit "Войти", class: "btn"
  32 + = f.email_field :email, placeholder: User.human_attribute_name(:email), class: "input-small"
  33 + = f.password_field :password, placeholder: User.human_attribute_name(:password), class: "input-small"
  34 + = f.submit t(:do_sign_in), class: "btn"
  35 + %ul.nav.pull-right
  36 + = link_to_nav t(:sign_up), new_user_registration_path
  37 + %li.divider-vertical
8 config/locales/models/user.ru.yml
... ... @@ -0,0 +1,8 @@
  1 +
  2 +ru:
  3 + activerecord:
  4 + attributes:
  5 + user:
  6 + email: Email
  7 + password: Пароль
  8 + password_confirmation: Подтверждение пароля
4 config/locales/ru.yml
@@ -95,4 +95,8 @@ ru:
95 95 create_page: Создать страницу
96 96 pages: Страницы
97 97 articles_title: Новости
  98 + sign_up: Регистрация
  99 + sign_in: Вход
  100 + do_sign_up: Зарегистрироваться
  101 + do_sign_in: Войти
98 102

0 comments on commit 3fa64d0

Please sign in to comment.
Something went wrong with that request. Please try again.