diff --git a/app/assets/stylesheets/theme/navbar.css.scss b/app/assets/stylesheets/theme/navbar.css.scss index ac261de..fd746ec 100644 --- a/app/assets/stylesheets/theme/navbar.css.scss +++ b/app/assets/stylesheets/theme/navbar.css.scss @@ -9,3 +9,16 @@ color: yellow; } } + +.navbar-vertical { + .navbar-collapse { + padding: 0; + } + .nav-stacked.navbar-nav { + float: none; + margin: 0; + > li { + float: none; + } + } +} diff --git a/app/views/users/confirmations/new.html.erb b/app/views/users/confirmations/new.html.erb index fd04796..ee7dbe9 100644 --- a/app/views/users/confirmations/new.html.erb +++ b/app/views/users/confirmations/new.html.erb @@ -1,20 +1,27 @@ -<%= render :partial => "users/shared/links" %> +
-
- - <%= simple_form_for(resource, - as: resource_name, - url: confirmation_path(resource_name), - method: :post - ) do |f| %> +
+ + <%= render 'users/shared/links' %> + +
+
+ +
+ <%= simple_form_for(resource, + as: resource_name, + url: confirmation_path(resource_name), + method: :post + ) do |f| %> - <%= devise_error_messages! %> + <%= devise_error_messages! %> - <%= f.input :email, required: true %> + <%= f.input :email, required: true %> - <%= f.submit "Resend confirmation instructions", class: 'btn btn-primary' %> - <% end %> + <%= f.submit "Resend confirmation instructions", class: 'btn btn-primary' %> + <% end %> +
\ No newline at end of file diff --git a/app/views/users/passwords/new.html.erb b/app/views/users/passwords/new.html.erb index fc8a71b..37a1fa4 100644 --- a/app/views/users/passwords/new.html.erb +++ b/app/views/users/passwords/new.html.erb @@ -1,20 +1,27 @@ -<%= render :partial => "users/shared/links" %> +
-
- - <%= simple_form_for(resource, - as: resource_name, - url: password_path(resource_name), - method: :post - ) do |f| %> +
+ + <%= render 'users/shared/links' %> + +
+
+ +
+ <%= simple_form_for(resource, + as: resource_name, + url: password_path(resource_name), + method: :post + ) do |f| %> - <%= devise_error_messages! %> + <%= devise_error_messages! %> - <%= f.input :email, required: true %> + <%= f.input :email, required: true %> - <%= f.submit "Send me reset password instructions", class: 'btn btn-primary' %> - <% end %> + <%= f.submit "Send reset password instructions", class: 'btn btn-primary' %> + <% end %> +
\ No newline at end of file diff --git a/app/views/users/registrations/new.html.erb b/app/views/users/registrations/new.html.erb index fe96e48..99acb07 100644 --- a/app/views/users/registrations/new.html.erb +++ b/app/views/users/registrations/new.html.erb @@ -1,9 +1,16 @@ -<%= render 'users/shared/links' %> +
-
+
- <%= render 'users/registrations/new' %> + <%= render 'users/shared/links' %> + +
+
+ +
+ <%= render 'users/registrations/new' %> +
diff --git a/app/views/users/sessions/new.html.erb b/app/views/users/sessions/new.html.erb index 7380043..3e2525a 100644 --- a/app/views/users/sessions/new.html.erb +++ b/app/views/users/sessions/new.html.erb @@ -1,36 +1,43 @@ -<%= render 'users/shared/links' %> +
-
+
+ + <%= render 'users/shared/links' %> + +
+
+ +
+

+ <%= link_to user_omniauth_authorize_path(:google_oauth2), + class: 'btn btn-block btn-social btn-google-plus', + 'data-no-turbolink' => true do %> + Sign in with Google + <% end %> +

+ +
Or use the form below
+ + <%= simple_form_for(resource, + as: resource_name, + url: session_path(resource_name) + ) do |f| %> + + <%= f.input :email, required: true %> + <%= f.input :password, required: true %> + <% if devise_mapping.rememberable? -%> + <%= f.input :remember_me, as: :boolean %> + <% end -%> + + <%= f.submit "Sign in", class: 'btn btn-primary' %> + + or <%= link_to "Sign up", new_registration_path(resource_name) %> + / <%= link_to 'Forgot password', new_password_path(resource_name) %> + -

- <%= link_to user_omniauth_authorize_path(:google_oauth2), - class: 'btn btn-block btn-social btn-google-plus', - 'data-no-turbolink' => true do %> - Sign in with Google <% end %> -

- -
Or use the form below
- - <%= simple_form_for(resource, - as: resource_name, - url: session_path(resource_name) - ) do |f| %> - - <%= f.input :email, required: true %> - <%= f.input :password, required: true %> - <% if devise_mapping.rememberable? -%> - <%= f.input :remember_me, as: :boolean %> - <% end -%> - - <%= f.submit "Sign in", class: 'btn btn-primary' %> - - or <%= link_to "Sign up", new_registration_path(resource_name) %> - / <%= link_to 'Forgot password', new_password_path(resource_name) %> - - - <% end %> +
\ No newline at end of file diff --git a/app/views/users/shared/_links.erb b/app/views/users/shared/_links.erb index 138c19a..06ae042 100644 --- a/app/views/users/shared/_links.erb +++ b/app/views/users/shared/_links.erb @@ -1,10 +1,22 @@ -
-<% semantic_navigation :devise_nav, html: { class: 'nav nav-tabs nav-justified' } do |n| %> - <%= n.item "Sign in", link: new_session_path(resource_name) %> - <%= n.item "Sign up", link: new_registration_path(resource_name) %> - <%= n.item "Forgot password", link: new_password_path(resource_name), - highlights_on: [{ controller: 'devise/passwords' }] %> - <%= n.item "Resend confirmation instructions", link: new_confirmation_path(resource_name) %> - <%= n.item "Resend unlock instructions", link: new_unlock_path(resource_name) %> -<% end %> -
+ diff --git a/app/views/users/unlocks/new.html.erb b/app/views/users/unlocks/new.html.erb index 3d77f9f..ecb19d9 100644 --- a/app/views/users/unlocks/new.html.erb +++ b/app/views/users/unlocks/new.html.erb @@ -1,20 +1,27 @@ -<%= render :partial => "users/shared/links" %> +
-
- - <%= simple_form_for(resource, - as: resource_name, - url: unlock_path(resource_name), - method: :post - ) do |f| %> +
+ + <%= render 'users/shared/links' %> + +
+
+ +
+ <%= simple_form_for(resource, + as: resource_name, + url: unlock_path(resource_name), + method: :post + ) do |f| %> - <%= devise_error_messages! %> + <%= devise_error_messages! %> - <%= f.input :email, required: true %> + <%= f.input :email, required: true %> - <%= f.submit "Resend unlock instructions", class: 'btn btn-primary' %> - <% end %> + <%= f.submit "Resend unlock instructions", class: 'btn btn-primary' %> + <% end %> +
\ No newline at end of file