From f9d8c9715c241d0bf9a3bb735ea37630c2dd6cf5 Mon Sep 17 00:00:00 2001 From: Svante Date: Fri, 14 Jul 2017 15:21:05 +0200 Subject: [PATCH] Add bootstrap styling to sign in form Add class `.form-control` to inputs and remove additional width styling --- app/assets/stylesheets/osem-navbar.css.scss | 8 -------- app/views/layouts/_navigation.html.haml | 8 ++++---- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/app/assets/stylesheets/osem-navbar.css.scss b/app/assets/stylesheets/osem-navbar.css.scss index 385cf93d..ef05c0a9 100644 --- a/app/assets/stylesheets/osem-navbar.css.scss +++ b/app/assets/stylesheets/osem-navbar.css.scss @@ -20,14 +20,6 @@ color: black; background-color: #eeeeee; } - input[type=text], - input[type=password] { - text-align: center; - padding: 5px; - display: block; - margin: auto; - width: 255px; - } .btn-group { width: 100%; text-align: center; diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml index 48066cd7..6683ea23 100644 --- a/app/views/layouts/_navigation.html.haml +++ b/app/views/layouts/_navigation.html.haml @@ -60,13 +60,13 @@ .dropdown-menu - if ENV['OSEM_ICHAIN_ENABLED'] == 'true' = form_tag User.ichain_login_url do - = text_field_tag 'username', nil, id: 'user_ichain_email_dd', placeholder: 'Username' - = password_field_tag 'password', nil, id: 'user_ichain_password_dd', placeholder: 'Password' + = text_field_tag 'username', nil, id: 'user_ichain_email_dd', class: 'form-control', placeholder: 'Username' + = password_field_tag 'password', nil, id: 'user_ichain_password_dd', class: 'form-control', placeholder: 'Password' %button.btn.btn-success.btn-block Sign in - else = form_tag new_user_session_path do - = text_field_tag 'user[login]', nil, id: 'user_login_dd', placeholder: 'Username / E-Mail' - = password_field_tag 'user[password]', nil, id: 'user_password_dd', placeholder: 'Password' + = text_field_tag 'user[login]', nil, id: 'user_login_dd', class: 'form-control', placeholder: 'Username / E-Mail' + = password_field_tag 'user[password]', nil, id: 'user_password_dd', class: 'form-control', placeholder: 'Password' %p.text-right %small %label{for: 'user_remember_me'} Remember me