diff --git a/app/assets/images/auth_bg.jpg b/app/assets/images/auth_bg.jpg new file mode 100644 index 000000000..3dd6271a5 Binary files /dev/null and b/app/assets/images/auth_bg.jpg differ diff --git a/app/assets/images/logo_madrid_white.png b/app/assets/images/logo_madrid_white.png new file mode 100644 index 000000000..927514733 Binary files /dev/null and b/app/assets/images/logo_madrid_white.png differ diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss index de42fa1ce..d593314f8 100644 --- a/app/assets/stylesheets/debates.scss +++ b/app/assets/stylesheets/debates.scss @@ -611,14 +611,45 @@ header { // 08.1. Login // - - - - - - - - - - - - +.auth-page { + background: url('auth_bg.jpg'); + margin-top: $line-height; + + @media (min-width: 480px) { + margin-top: $line-height*2; + } + + h1 { + + a { + color: white; + font-family: 'Lato'; + font-size: rem-calc(20); + font-weight: lighter; + line-height: $line-height*4; + padding-left: rem-calc(6); + + span { + font-size: rem-calc(16); + font-weight: lighter; + vertical-align: top; + } + + @media (min-width: 480px) { + font-size: rem-calc(30); + span { + font-size: rem-calc(20); + } + } + } + } +} + .auth { - background: $background; - box-shadow: 0px -4px 5px $background; min-height: $line-height*20; .panel { background: white; - margin-top: $line-height*2; h1 { font-size: rem-calc(30); diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb index 065ea4383..8379bfeb4 100644 --- a/app/views/devise/confirmations/new.html.erb +++ b/app/views/devise/confirmations/new.html.erb @@ -1,16 +1,24 @@ -

<%= t("devise_views.confirmations.title") %>

+
+
+
+

<%= t("devise_views.confirmations.title") %>

-<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> - <%= devise_error_messages! %> + <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> + <%= devise_error_messages! %> -
- <%= f.label :email, t("devise_views.confirmations.email_label") %>
- <%= f.email_field :email, autofocus: true, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %> +
+
+ <%= f.label :email, t("devise_views.confirmations.email_label") %> + <%= f.email_field :email, autofocus: true, placeholder: t("devise_views.confirmations.email_label"), value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %> +
+ +
+ <%= f.submit(t("devise_views.confirmations.submit"), class: "button radius expand") %> +
+
+ <% end %> + + <%= render "devise/shared/links" %> +
- -
- <%= f.submit(t("devise_views.confirmations.submit"), class: "button radius") %> -
-<% end %> - -<%= render "devise/shared/links" %> +
\ No newline at end of file diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index 8a70d0362..b09e0435a 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -1,28 +1,22 @@ -
-
-
-
-

<%= t("devise_views.passwords.new.title") %>

+
+
+
+

<%= t("devise_views.passwords.new.title") %>

+ <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> + <%= devise_error_messages! %> +
+
+ <%= f.label :email, t("devise_views.passwords.new.email_label") %> + <%= f.email_field :email, autofocus: true, placeholder: t("devise_views.passwords.new.email_label") %> +
- <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> - <%= devise_error_messages! %> +
+ <%= f.submit t("devise_views.passwords.new.send_submit"), class: "button radius expand" %> +
+
+ <% end %> -
-
- <%= f.label :email, t("devise_views.passwords.new.email_label") %> - <%= f.email_field :email, autofocus: true, placeholder: t("devise_views.passwords.new.email_label") %> -
-
- -
-
- <%= f.submit t("devise_views.passwords.new.send_submit"), class: "button radius" %> -
-
- <% end %> - - <%= render "devise/shared/links" %> -
-
-
+ <%= render "devise/shared/links" %> +
+
\ No newline at end of file diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index fbe91ca68..1ff533073 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,42 +1,34 @@ -
-
-
-
-

<%= t("devise_views.sessions.new.title") %>

+
+
+
+

<%= t("devise_views.sessions.new.title") %>

- <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> -
-
- <%= f.label :email, t("devise_views.sessions.new.email_label") %> - <%= f.email_field :email, autofocus: true, placeholder: t("devise_views.sessions.new.email_label") %> -
-
+ <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> +
+
+ <%= f.label :email, t("devise_views.sessions.new.email_label") %> + <%= f.email_field :email, autofocus: true, placeholder: t("devise_views.sessions.new.email_label") %> +
-
-
- <%= f.label :password, t("devise_views.sessions.new.password_label") %> - <%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.sessions.new.password_label") %> -
-
+
+ <%= f.label :password, t("devise_views.sessions.new.password_label") %> + <%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.sessions.new.password_label") %> +
- <% if devise_mapping.rememberable? -%> -
-
- <%= f.check_box :remember_me %> - <%= f.label :remember_me, t("devise_views.sessions.new.remember_me") %> -
-
- <% end -%> - -
-
- <%= f.submit(t("devise_views.sessions.new.submit"), class: "button radius expand") %> -
-
- <% end %> - - <%= render "devise/shared/links" %> + <% if devise_mapping.rememberable? -%> +
+ <%= f.check_box :remember_me %> + <%= f.label :remember_me, t("devise_views.sessions.new.remember_me") %>
+ <% end -%> + +
+ <%= f.submit(t("devise_views.sessions.new.submit"), class: "button radius expand") %> +
+ <% end %> + + <%= render "devise/shared/links" %>
+
\ No newline at end of file diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb index e65fde2e7..fe73e5553 100644 --- a/app/views/layouts/devise.html.erb +++ b/app/views/layouts/devise.html.erb @@ -12,7 +12,7 @@ - + <% if notice %>

<%= notice %>

@@ -22,6 +22,17 @@

<%= alert %>

<% end %> +
+
+

+ <%= link_to root_path do %> + <%= image_tag('logo_madrid_white.png', class: 'left', size: '96x96') %> + <%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %> | <%= t("layouts.header.participation") %> + <% end %> +

+
+
+ <%= yield %>