From 5615f19ba906f8b4061b971194ba5f956bf401ee Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 29 Feb 2016 13:52:31 +0100 Subject: [PATCH] Fixes some classes for foundation 6 --- app/assets/stylesheets/layout.scss | 13 +++++++++---- app/assets/stylesheets/participation.scss | 1 - app/views/devise/_omniauth_form.html.erb | 12 ++++++------ app/views/layouts/devise.html.erb | 2 +- app/views/pages/opendata.html.erb | 2 +- app/views/shared/_map.html.erb | 2 +- app/views/users/registrations/edit.html.erb | 2 +- 7 files changed, 19 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 12a21ef87..de2477930 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -368,7 +368,6 @@ header { } .subnavigation { - padding-bottom: $line-height; @media (min-width: $small-breakpoint) { background: white; @@ -1056,11 +1055,19 @@ table { // 13. Social // - - - - - - - - - - - - - - - - - - - - - - - - - +.button.button-twitter, +.button.button-facebook, +.button.button-google { + height: $line-height*2; + line-height: $line-height*2; + padding: 0; + position: relative; +} + .button.button-twitter { background: #45B0E3; &:before { - background: #40A2D1; content: "f"; font-family: "icons" !important; font-size: rem-calc(24); @@ -1100,7 +1107,6 @@ table { background: #3B5998; &:before { - background: #354F88; content: "A"; font-family: "icons" !important; font-size: rem-calc(24); @@ -1140,7 +1146,6 @@ table { background: #DE4C34; &:before { - background: #CE3E26; content: "B"; font-family: "icons" !important; font-size: rem-calc(24); diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index eefd996e8..5b6117a61 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -856,7 +856,6 @@ color: $warning-color; font-size: $small-font-size; line-height: rem-calc(24); - padding-top: rem-calc(6); a { color: $warning-color; diff --git a/app/views/devise/_omniauth_form.html.erb b/app/views/devise/_omniauth_form.html.erb index 3167cc1d6..52ca029be 100644 --- a/app/views/devise/_omniauth_form.html.erb +++ b/app/views/devise/_omniauth_form.html.erb @@ -3,30 +3,30 @@ <% if current_page?(new_user_session_path) %> <% if feature? :twitter_login %> - <%= link_to t("omniauth.twitter.sign_in"), user_omniauth_authorize_path(:twitter), class: "button-twitter button radius expand" %> + <%= link_to t("omniauth.twitter.sign_in"), user_omniauth_authorize_path(:twitter), class: "button-twitter button expanded" %> <% end %> <% if feature? :facebook_login %> - <%= link_to t("omniauth.facebook.sign_in"), user_omniauth_authorize_path(:facebook), class: "button-facebook button radius expand" %> + <%= link_to t("omniauth.facebook.sign_in"), user_omniauth_authorize_path(:facebook), class: "button-facebook button expanded" %> <% end %> <% if feature? :google_login %> - <%= link_to t("omniauth.google_oauth2.sign_in"), user_omniauth_authorize_path(:google_oauth2), class: "button-google button radius expand" %> + <%= link_to t("omniauth.google_oauth2.sign_in"), user_omniauth_authorize_path(:google_oauth2), class: "button-google button expanded" %> <% end %>
<% elsif current_page?(new_user_registration_path) %> <% if feature? :twitter_login %> - <%= link_to t("omniauth.twitter.sign_up"), user_omniauth_authorize_path(:twitter), class: "button-twitter button radius expand" %> + <%= link_to t("omniauth.twitter.sign_up"), user_omniauth_authorize_path(:twitter), class: "button-twitter button expanded" %> <% end %> <% if feature? :facebook_login %> - <%= link_to t("omniauth.facebook.sign_up"), user_omniauth_authorize_path(:facebook), class: "button-facebook button radius expand" %> + <%= link_to t("omniauth.facebook.sign_up"), user_omniauth_authorize_path(:facebook), class: "button-facebook button expanded" %> <% end %> <% if feature? :google_login %> - <%= link_to t("omniauth.google_oauth2.sign_up"), user_omniauth_authorize_path(:google_oauth2), class: "button-google button radius expand" %> + <%= link_to t("omniauth.google_oauth2.sign_up"), user_omniauth_authorize_path(:google_oauth2), class: "button-google button expanded" %> <% end %>
diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb index 4771762a0..73f446de2 100644 --- a/app/views/layouts/devise.html.erb +++ b/app/views/layouts/devise.html.erb @@ -17,7 +17,7 @@

<%= link_to root_path do %> - <%= image_tag('header_logo_madrid.png', class: 'show-for-medium-up float-left', size: '96x96', alt: t("layouts.header.logo")) %> + <%= image_tag('header_logo_madrid.png', class: 'show-for-medium float-left', size: '96x96', alt: t("layouts.header.logo")) %> <%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %> <% end %>

diff --git a/app/views/pages/opendata.html.erb b/app/views/pages/opendata.html.erb index edefb92cc..9c8094535 100644 --- a/app/views/pages/opendata.html.erb +++ b/app/views/pages/opendata.html.erb @@ -8,7 +8,7 @@ <%= link_to t("pages.opendata.go_old"), t("layouts.header.external_link_opendata_url"), target: "_blank", class: "button" %>
-
+
<%= image_tag("icon_home.png", size: "330x240", alt:"", role:"presentation") %>
diff --git a/app/views/shared/_map.html.erb b/app/views/shared/_map.html.erb index f7d409dba..8fad9e9ff 100644 --- a/app/views/shared/_map.html.erb +++ b/app/views/shared/_map.html.erb @@ -12,7 +12,7 @@ -
+
<%= image_tag("map.jpg", usemap: "#map") %>
diff --git a/app/views/users/registrations/edit.html.erb b/app/views/users/registrations/edit.html.erb index f034d0207..f4b5f7cf2 100644 --- a/app/views/users/registrations/edit.html.erb +++ b/app/views/users/registrations/edit.html.erb @@ -3,7 +3,7 @@ <%= t("devise_views.users.registrations.edit.back_link") %> <% end %> -

<%= t("devise_views.users.registrations.edit.edit") %>

+

<%= t("devise_views.users.registrations.edit.edit") %>

<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %> <%= devise_error_messages! %>