about summary refs log tree commit diff stats
path: root/app/views
diff options
context:
space:
mode:
Diffstat (limited to 'app/views')
-rw-r--r--app/views/layouts/application.html.haml2
-rw-r--r--app/views/layouts/userdata.html.haml14
-rw-r--r--app/views/users/sessions/new.html.haml6
3 files changed, 11 insertions, 11 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index ed3b9a2..2a9e2eb 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml
@@ -3,7 +3,7 @@
3 %head 3 %head
4 %title Thoughts 4 %title Thoughts
5 = csrf_meta_tags 5 = csrf_meta_tags
6 = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' 6 = stylesheet_link_tag 'main', media: 'all', 'data-turbolinks-track': 'reload'
7 = javascript_include_tag 'application', 'data-turbolinks-track': 'reload' 7 = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
8 %body#main-body 8 %body#main-body
9 - if flash[:alert] 9 - if flash[:alert]
diff --git a/app/views/layouts/userdata.html.haml b/app/views/layouts/userdata.html.haml index f6e3b57..29e47b2 100644 --- a/app/views/layouts/userdata.html.haml +++ b/app/views/layouts/userdata.html.haml
@@ -3,16 +3,16 @@
3 %head 3 %head
4 %title Thoughts 4 %title Thoughts
5 = csrf_meta_tags 5 = csrf_meta_tags
6 = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' 6 = stylesheet_link_tag 'userdata', media: 'all', 'data-turbolinks-track': 'reload'
7 = javascript_include_tag 'application', 'data-turbolinks-track': 'reload' 7 = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
8 %body#userdata-body 8 %body
9 #userdata-container 9 #container
10 - if flash[:alert] 10 - if flash[:alert]
11 #userdata-flash.userdata-flash-alert 11 #flash.flash-alert
12 %span.userdata-flash-tag ERROR: 12 %span.flash-tag ERROR:
13 = flash.alert 13 = flash.alert
14 - if flash[:notice] 14 - if flash[:notice]
15 #userdata-flash.userdata-flash-notice 15 #flash.flash-notice
16 %span.userdata-flash-tag NOTICE: 16 %span.flash-tag NOTICE:
17 = flash.notice 17 = flash.notice
18 = yield 18 = yield
diff --git a/app/views/users/sessions/new.html.haml b/app/views/users/sessions/new.html.haml index fbdf8be..f7c8de9 100644 --- a/app/views/users/sessions/new.html.haml +++ b/app/views/users/sessions/new.html.haml
@@ -1,4 +1,4 @@
1#userdata-form 1#principal
2 = form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| 2 = form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
3 .field 3 .field
4 = f.label :login 4 = f.label :login
@@ -11,5 +11,5 @@
11 = f.label :remember_me 11 = f.label :remember_me
12 .submit-field 12 .submit-field
13 = f.submit "Log in" 13 = f.submit "Log in"
14.userdata-link= link_to "Forgot your password?", new_password_path(resource_name) 14.navigation= link_to "Forgot your password?", new_password_path(resource_name)
15.userdata-link= link_to "← Back to thoughts", root_url 15.navigation= link_to "← Back to thoughts", root_url