From 1fb650f48213117fb3ad3eedc6c041d7269adf05 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Fri, 30 Jun 2017 18:23:20 -0400 Subject: Split up stylesheets for each layout --- app/views/layouts/application.html.haml | 2 +- app/views/layouts/userdata.html.haml | 14 +++++++------- app/views/users/sessions/new.html.haml | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'app/views') 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 @@ %head %title Thoughts = csrf_meta_tags - = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' + = stylesheet_link_tag 'main', media: 'all', 'data-turbolinks-track': 'reload' = javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %body#main-body - 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 @@ %head %title Thoughts = csrf_meta_tags - = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' + = stylesheet_link_tag 'userdata', media: 'all', 'data-turbolinks-track': 'reload' = javascript_include_tag 'application', 'data-turbolinks-track': 'reload' - %body#userdata-body - #userdata-container + %body + #container - if flash[:alert] - #userdata-flash.userdata-flash-alert - %span.userdata-flash-tag ERROR: + #flash.flash-alert + %span.flash-tag ERROR: = flash.alert - if flash[:notice] - #userdata-flash.userdata-flash-notice - %span.userdata-flash-tag NOTICE: + #flash.flash-notice + %span.flash-tag NOTICE: = flash.notice = 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 @@ -#userdata-form +#principal = form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| .field = f.label :login @@ -11,5 +11,5 @@ = f.label :remember_me .submit-field = f.submit "Log in" -.userdata-link= link_to "Forgot your password?", new_password_path(resource_name) -.userdata-link= link_to "← Back to thoughts", root_url +.navigation= link_to "Forgot your password?", new_password_path(resource_name) +.navigation= link_to "← Back to thoughts", root_url -- cgit 1.4.1